From a0e53bbc7a63cf885a22f081955c2e3f479fbf5e Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Mon, 17 May 2021 20:00:54 +0900 Subject: [PATCH 01/34] https://github.com/OpenTouryoProject/OpenTouryo/issues/396 --- .../ASPNETWebService/ASPNETWebService/Web.config | 2 +- .../Infrastructure/ServiceInterface/WCFService/App.config | 2 +- root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config | 2 +- .../CS/Samples/2CS_sample/2CSClientWPF_sample/app.config | 2 +- .../CS/Samples/2CS_sample/2CSClientWin_sample/app.config | 2 +- .../CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config | 2 +- .../programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config | 2 +- .../CS/Samples/Bat_sample/SimpleBatch_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWPF_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWin_sample/app.config | 2 +- .../CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config | 2 +- .../WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config | 2 +- .../ASPNETWebService/ASPNETWebService/Web.config | 2 +- .../Infrastructure/ServiceInterface/WCFService/App.config | 2 +- .../VB/Samples/2CS_sample/2CSClientWPF_sample/app.config | 2 +- .../VB/Samples/2CS_sample/2CSClientWin_sample/app.config | 2 +- .../VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config | 2 +- .../programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config | 2 +- .../VB/Samples/Bat_sample/SimpleBatch_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWPF_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWin_sample/app.config | 2 +- .../VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config | 2 +- .../WebApp_sample/WebForms_Sample/WebForms_Sample/web.config | 2 +- .../ASPNETWebService/ASPNETWebService/Web.config | 2 +- .../Infrastructure/ServiceInterface/WCFService/App.config | 2 +- root_VS2017/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config | 2 +- .../CS/Samples/2CS_sample/2CSClientWPF_sample/app.config | 2 +- .../CS/Samples/2CS_sample/2CSClientWin_sample/app.config | 2 +- .../CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config | 2 +- .../programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config | 2 +- .../CS/Samples/Bat_sample/SimpleBatch_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWPF_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWin_sample/app.config | 2 +- .../CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config | 2 +- .../WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config | 2 +- .../Backend/MVC_Sample/MVC_Sample/appsettings.json | 2 +- .../Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json | 2 +- .../Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json | 2 +- .../Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json | 2 +- .../Legacy/Bat_sample/SimpleBatch_sample/appsettings.json | 2 +- .../ASPNETWebService/ASPNETWebService/Web.config | 2 +- .../Infrastructure/ServiceInterface/WCFService/App.config | 2 +- .../VB/Samples/2CS_sample/2CSClientWPF_sample/app.config | 2 +- .../VB/Samples/2CS_sample/2CSClientWin_sample/app.config | 2 +- .../VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config | 2 +- .../programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config | 2 +- .../VB/Samples/Bat_sample/SimpleBatch_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWPF_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWin_sample/app.config | 2 +- .../VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config | 2 +- .../WebApp_sample/WebForms_Sample/WebForms_Sample/web.config | 2 +- .../ASPNETWebService/ASPNETWebService/Web.config | 2 +- .../ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json | 2 +- .../Infrastructure/ServiceInterface/WCFService/App.config | 2 +- root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config | 2 +- .../programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json | 2 +- .../CS/Samples/2CS_sample/2CSClientWPF_sample/app.config | 2 +- .../CS/Samples/2CS_sample/2CSClientWin_sample/app.config | 2 +- .../CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config | 2 +- .../programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config | 2 +- .../CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config | 2 +- .../CS/Samples/Bat_sample/SimpleBatch_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWPF_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWin_sample/app.config | 2 +- .../CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config | 2 +- .../WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config | 2 +- .../Backend/MVC_Sample/MVC_Sample/appsettings.json | 2 +- .../Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json | 2 +- .../Legacy/2CS_sample/2CSClientWin_sample/appsettings.json | 2 +- .../Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json | 2 +- .../Legacy/2CS_sample/TimeStamp_sample/appsettings.json | 2 +- .../Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json | 2 +- .../Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json | 2 +- .../Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json | 2 +- .../Legacy/Bat_sample/SimpleBatch_sample/appsettings.json | 2 +- .../WSClient_sample/WSClientWPF_sample/appsettings.json | 2 +- .../WSClient_sample/WSClientWin_sample/appsettings.json | 2 +- .../ASPNETWebService/ASPNETWebService/Web.config | 2 +- .../Infrastructure/ServiceInterface/WCFService/App.config | 2 +- .../VB/Samples/2CS_sample/2CSClientWPF_sample/app.config | 2 +- .../VB/Samples/2CS_sample/2CSClientWin_sample/app.config | 2 +- .../VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config | 2 +- .../programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config | 2 +- .../VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config | 2 +- .../VB/Samples/Bat_sample/SimpleBatch_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWPF_sample/app.config | 2 +- .../WS_sample/WSClient_sample/WSClientWin_sample/app.config | 2 +- .../VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config | 2 +- .../WebApp_sample/WebForms_Sample/WebForms_Sample/web.config | 2 +- 105 files changed, 105 insertions(+), 105 deletions(-) diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 797ebe6bd..a2bc5a24c 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -16,7 +16,7 @@ - + diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 5a573f741..3430a8bc5 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -42,7 +42,7 @@ - + diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config b/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config index 85d9f462c..09d11ce58 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config +++ b/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config @@ -4,7 +4,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config index 2e1564550..4f3aa738d 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config index f7b5dbeb2..c2fcd88bd 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index bc4d130f6..a8622b97c 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config index 77bb0678e..a46cd99ee 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config index 1ecc40783..6306e27b8 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 424c150c2..7ce5ee118 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 4e8a58e89..85757be57 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config index f87867ac7..68ae34b1f 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index a3b4f1db5..b0b57716f 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index ff7de67d9..6891eff5e 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -78,7 +78,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index c5a15b167..065d0cf87 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -12,7 +12,7 @@ - + diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config b/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config index cf84579c4..ea44717c3 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config +++ b/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config @@ -14,7 +14,7 @@ - + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 898f5422a..4dcd089ef 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -16,7 +16,7 @@ - + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 8f11d58d9..28387b186 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -41,7 +41,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config index bf1ddced5..4ed8df9af 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config index 5acb4fc35..f08c308ca 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index 4267704f1..635cd04c1 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config index 6d1635664..e143d016f 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config index e85299ce6..34ea09e91 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 4fbcec7b1..2717f7840 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 63623a353..2a4b84d98 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config index 1b5c24aa2..b90c83aa9 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index a3b4f1db5..b0b57716f 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index e7db09881..60433d9de 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -80,7 +80,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index 487b69d1e..a3babfe9e 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -12,7 +12,7 @@ - + diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config b/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config index 5f4c231f5..48ef5af20 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config +++ b/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config @@ -14,7 +14,7 @@ - + diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index e80be9b6f..eca6f5b28 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -16,7 +16,7 @@ - + diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index a020cad00..2818dd0ad 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -38,7 +38,7 @@ - + diff --git a/root_VS2017/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config b/root_VS2017/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config index c861a2376..c70041f49 100644 --- a/root_VS2017/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config +++ b/root_VS2017/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config @@ -4,7 +4,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config index 5a57acd2c..043cb08b7 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config index eeb937792..bbb20eb62 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index 5c174c5f5..6aec46c06 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config index bf2e3ab9b..9a32d9c6f 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config index a41abd03d..06d84e6fe 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config index fb7ac6155..695444ebd 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 37f30ba7e..b10a6c20f 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config index 09e78165a..54b942c9b 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index a3b4f1db5..b0b57716f 100644 --- a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index ff7de67d9..6891eff5e 100644 --- a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -78,7 +78,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index 87d26cfab..92332c7c9 100644 --- a/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -12,7 +12,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config b/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config index 9c7970e22..c15174bac 100644 --- a/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config +++ b/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config @@ -14,7 +14,7 @@ - + diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json index 633e0e40b..d2c87d4ae 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json @@ -1,7 +1,7 @@ { // connectionStrings section "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json index 8cb408d65..7b45ef3f3 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json index 8cb408d65..7b45ef3f3 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json index 8cb408d65..7b45ef3f3 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json index 86ed07765..fd03c3516 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index d2c8fd6b1..0b9dbb09d 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -16,7 +16,7 @@ - + diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 8f11d58d9..28387b186 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -41,7 +41,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config index cd1bce2bf..9d50ec72e 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config index 7e386505a..e9bb82ef2 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index 600114c62..e923d5238 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config index fa1882806..1ea664dcb 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config index a57a4991a..71340f3f2 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 0e5ee7d8b..585e5eb28 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config index cf524d8b0..606477a5b 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config index 4449f03f3..151c6d559 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index 992ba6f20..3e478cc16 100644 --- a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index 9bf7c735d..f7a7623e5 100644 --- a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -80,7 +80,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index da2bae9a6..8051470c0 100644 --- a/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -12,7 +12,7 @@ - + diff --git a/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config b/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config index ac992cc64..a1ae958c4 100644 --- a/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config +++ b/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config @@ -14,7 +14,7 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 29d8487d3..3e35fbeee 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -16,7 +16,7 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json index c4fddfd02..a7b8b8eb6 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json @@ -25,7 +25,7 @@ // connectionStrings section "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 137a5188f..75d9fd5df 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -42,7 +42,7 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config b/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config index c861a2376..c70041f49 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config +++ b/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config @@ -4,7 +4,7 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json b/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json index 92e55d6d8..075cdb0d0 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json +++ b/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json @@ -5,7 +5,7 @@ // ★入力項目（初期化） // 接続文字列 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config index 5a57acd2c..043cb08b7 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config index eeb937792..bbb20eb62 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index 5c174c5f5..6aec46c06 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config index bf2e3ab9b..9a32d9c6f 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config index a41abd03d..06d84e6fe 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config index fb7ac6155..695444ebd 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 37f30ba7e..b10a6c20f 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config index 09e78165a..54b942c9b 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index a3b4f1db5..b0b57716f 100644 --- a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index ff7de67d9..6891eff5e 100644 --- a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -78,7 +78,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index 2c6d43466..2208533a7 100644 --- a/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -12,7 +12,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config b/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config index 578f1ea43..f3bb15552 100644 --- a/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config +++ b/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config @@ -14,7 +14,7 @@ - + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json index 633e0e40b..d2c87d4ae 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json @@ -1,7 +1,7 @@ { // connectionStrings section "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json index df0f1a607..d3b3a507b 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json @@ -3,7 +3,7 @@ // connectionStrings section "connectionStrings": { // SQL Server / SQL Client用 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", // Multi-DB / ODCB.NET用 "ConnectionString_ODBC": "Dsn=odbc_test1", // Oracle / ODP.NET用 diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json index b8e4882b0..2736ab173 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json @@ -3,7 +3,7 @@ // connectionStrings section "connectionStrings": { // SQL Server / SQL Client用 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", // Multi-DB / ODCB.NET用 "ConnectionString_ODBC": "Dsn=odbc_test1", // Oracle / ODP.NET用 diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json index 75817e64f..26498532e 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json @@ -3,7 +3,7 @@ // connectionStrings section "connectionStrings": { // SQL Server / SQL Client用 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;" + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;" }, // appSettings section diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json index 689fe465f..40e6439f7 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json @@ -3,7 +3,7 @@ // connectionStrings section "connectionStrings": { // SQL Server / SQL Client用 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;" + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;" }, // appSettings section diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json index 8cb408d65..7b45ef3f3 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json index 8cb408d65..7b45ef3f3 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json index 8cb408d65..7b45ef3f3 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json index 86ed07765..fd03c3516 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json @@ -1,6 +1,6 @@ { "connectionStrings": { - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", "ConnectionString_ODBC": "Dsn=odbc_test1", "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json index 335da6f14..7cd9e470c 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json @@ -59,7 +59,7 @@ // connectionStrings section "connectionStrings": { // SQL Server / SQL Client用 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", // Multi-DB / ODCB.NET用 "ConnectionString_ODBC": "Dsn=odbc_test1", // Oracle / ODP.NET用 diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json index 0e4d3fb02..d7e4626a9 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json @@ -74,7 +74,7 @@ // connectionStrings section "connectionStrings": { // SQL Server / SQL Client用 - "ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;", + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", // Multi-DB / ODCB.NET用 "ConnectionString_ODBC": "Dsn=odbc_test1", // Oracle / ODP.NET用 diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 5c883e211..1b62d618f 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -16,7 +16,7 @@ - + diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 71f5f4b7d..78bf358d6 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -41,7 +41,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config index cd1bce2bf..9d50ec72e 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config index 7e386505a..e9bb82ef2 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index 600114c62..e923d5238 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config index fa1882806..1ea664dcb 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config index a57a4991a..71340f3f2 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 0e5ee7d8b..585e5eb28 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config index cf524d8b0..606477a5b 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config index 4449f03f3..151c6d559 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index 11b2f867d..9c1ed8fe4 100644 --- a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index e7c318497..94a50f035 100644 --- a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -80,7 +80,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index fa1d18cff..69df54cdc 100644 --- a/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -12,7 +12,7 @@ - + diff --git a/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config b/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config index aed0f59bb..e2984968f 100644 --- a/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config +++ b/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config @@ -14,7 +14,7 @@ - + From 6bbc7b2edf4c2c798a4009a09eec6e7a36921c31 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Tue, 18 May 2021 18:19:27 +0900 Subject: [PATCH 02/34] https://github.com/OpenTouryoProject/OpenTouryo/issues/395 --- .../Controllers/FxController.cs | 20 +++++++++++++++++-- .../Controllers/FxController.cs | 18 ++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs index 1b71fcf72..1ade4c420 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs @@ -30,6 +30,7 @@ //* 日時 更新者 内容 //* ---------- ---------------- ------------------------------------------------- //* 2017/08/18 西野 大介 新規作成 +//* 2021/05/18 西野 大介 ASP.NET WebAPI（JSON）の例外処理の問題を修正 //********************************************************************************** using System; @@ -326,6 +327,11 @@ public async Task> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI([FromBody] Dict } catch (Exception ex) { + // エラー情報を設定する。 + wsErrorInfo.ErrorType = FxEnum.ErrorType.ElseException; + //wsErrorInfo.ErrorMessageID = fxEx.messageID; + wsErrorInfo.ErrorMessage = ex.Message; + // ログ出力用の情報を保存 errorType = FxEnum.ErrorType.ElseException.ToString(); // 2009/09/15-この行 errorMessageID = "－"; @@ -330,7 +336,10 @@ public async Task> DotNETOnlineWebAPI([FromBody] Dict errorToString = ex.ToString(); - throw; // SoapExceptionになって伝播 + //throw; // SoapExceptionになって伝播しない + + // エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo); } finally { @@ -359,7 +368,14 @@ public async Task> DotNETOnlineWebAPI([FromBody] Dict returnDic.Add("Return", CustomEncode.ToBase64String(ret)); returnDic.Add("ContextObject", CustomEncode.ToBase64String(contextObject)); + if (returnValueObject != null) + { returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)); + } + else + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(BinarySerialize.ObjectToBytes(""))); + } return returnDic; } From 2009be2a98b6454f7e7737a102dc1d4da9b726d1 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Sun, 23 May 2021 19:09:36 +0900 Subject: [PATCH 03/34] https://github.com/OpenTouryoProject/OpenTouryo/issues/400 --- .../Business/Presentation/MyBaseController.cs | 13 ++++++++++--- .../Business/Presentation/MyBaseMVController.cs | 6 +++++- .../Business/Presentation/MyBaseMVControllerCore.cs | 9 ++++----- .../Business/Presentation/MyBaseController.vb | 12 ++++++++---- .../Business/Presentation/MyBaseMVController.vb | 8 ++++---- .../Business/Presentation/MyBaseController.cs | 13 ++++++++++--- .../Business/Presentation/MyBaseMVController.cs | 6 +++++- .../Business/Presentation/MyBaseMVControllerCore.cs | 9 ++++----- .../Business/Presentation/MyBaseController.vb | 12 ++++++++---- .../Business/Presentation/MyBaseMVController.vb | 8 ++++---- .../Business/Presentation/MyBaseController.cs | 13 ++++++++++--- .../Business/Presentation/MyBaseMVController.cs | 6 +++++- .../Business/Presentation/MyBaseMVControllerCore.cs | 9 ++++----- .../Business/Presentation/MyBaseController.vb | 12 ++++++++---- .../Business/Presentation/MyBaseMVController.vb | 8 ++++---- 15 files changed, 93 insertions(+), 51 deletions(-) diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs index 820d85912..ed7d9b8fe 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs +++ b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs @@ -57,6 +57,7 @@ //* 2017/02/28 西野 大介 TransferErrorScreen2のErrorMessage生成処理の見直し。 //* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -383,9 +384,15 @@ private void CacheControlWithSwitch() // http://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers // Using ASP.NET: - Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1. - Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. - Response.AppendHeader("Expires", "0"); // Proxies. + // Cache-Control + this.Response.Headers.Remove("Cache-Control"); + this.Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1. + // Pragma + this.Response.Headers.Remove("Pragma"); + this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + // Expires + this.Response.Headers.Remove("Expires"); + this.Response.AppendHeader("Expires", "0"); // Proxies. } else if (noCache.ToUpper() == FxLiteral.OFF) diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs index 0c8799a1f..44d864dce 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs +++ b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs @@ -45,6 +45,7 @@ //* 2017/02/28 西野 大介 TransferErrorScreenメソッドを追加した。 //* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -609,9 +610,12 @@ private void CacheControlWithSwitch() // Using ASP.NET-MVC: this.Response.Cache.SetCacheability(HttpCacheability.NoCache); // HTTP 1.1. this.Response.Cache.AppendCacheExtension("no-store, must-revalidate"); + // Pragma + this.Response.Headers.Remove("Pragma"); this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + // Expires + this.Response.Headers.Remove("Expires"); this.Response.AppendHeader("Expires", "0"); // Proxies. - } else if (noCache.ToUpper() == FxLiteral.OFF) { diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs index 69c71e9a1..a35534586 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs +++ b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs @@ -30,6 +30,7 @@ //* 2018/04/19 西野 大介 新規作成 //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 //* 2018/08/08 西野 大介 MyMVCCoreFilterAttributeをFilterAttributeとして設定 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -291,14 +292,12 @@ private void CacheControlWithSwitch() // https://www.ipa.go.jp/security/awareness/vendor/programmingv2/contents/405.html // Using ASP.NET-MVC: - //this.Response.Cache.SetCacheability(HttpCacheability.NoCache); // HTTP 1.1. - //this.Response.Cache.AppendCacheExtension("no-store, must-revalidate"); + MyHttpContext.Current.Response.Headers.Remove("Cache-Control"); MyHttpContext.Current.Response.Headers.Add("Cache-Control", new StringValues(new string[] { "no-cache", "no-store", "must-revalidate" })); - - //this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + MyHttpContext.Current.Response.Headers.Remove("Pragma"); MyHttpContext.Current.Response.Headers.Add("Pragma", new StringValues("no-cache")); - //this.Response.AppendHeader("Expires", "0"); // Proxies. + MyHttpContext.Current.Response.Headers.Remove("Expires"); MyHttpContext.Current.Response.Headers.Add("Expires", new StringValues("0")); } else if (noCache.ToUpper() == FxLiteral.OFF) diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb b/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb index 287385179..8a06fed8d 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb +++ b/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb @@ -57,6 +57,7 @@ '* 2016/03/03 Supragyan Modified default relative path of the sample application screens (merge) '* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） '* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +'* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 '********************************************************************************** Imports System.Web @@ -347,14 +348,17 @@ Namespace Touryo.Infrastructure.Business.Presentation ' http://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers ' Using ASP.NET: - Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate") + Me.Response.Headers.Remove("Cache-Control") + Me.Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate") ' HTTP 1.1. - Response.AppendHeader("Pragma", "no-cache") + Me.Response.Headers.Remove("Pragma") + Me.Response.AppendHeader("Pragma", "no-cache") ' HTTP 1.0. ' Proxies. - Response.AppendHeader("Expires", "0") - ' OFF + Me.Response.Headers.Remove("Expires") + Me.Response.AppendHeader("Expires", "0") ElseIf noCache.ToUpper() = FxLiteral.OFF Then + ' OFF Else ' パラメータ・エラー（書式不正） Throw New FrameworkException(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH1(0), [String].Format(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH1(1), MyLiteral.CACHE_CONTROL)) diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb b/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb index 7ce382720..5d177d4c1 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb +++ b/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb @@ -45,6 +45,7 @@ '* 2017/02/28 西野 大介 TransferErrorScreenメソッドを追加した。 '* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） '* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +'* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 '********************************************************************************** Imports System.Web @@ -576,14 +577,13 @@ Namespace Touryo.Infrastructure.Business.Presentation ' Using ASP.NET-MVC: Me.Response.Cache.SetCacheability(HttpCacheability.NoCache) - ' HTTP 1.1. Me.Response.Cache.AppendCacheExtension("no-store, must-revalidate") + Me.Response.Headers.Remove("Pragma") Me.Response.AppendHeader("Pragma", "no-cache") - ' HTTP 1.0. - ' Proxies. + Me.Response.Headers.Remove("Expires") Me.Response.AppendHeader("Expires", "0") - ' OFF ElseIf noCache.ToUpper() = FxLiteral.OFF Then + ' OFF Else ' パラメータ・エラー（書式不正） Throw New FrameworkException( diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs index 820d85912..ed7d9b8fe 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs @@ -57,6 +57,7 @@ //* 2017/02/28 西野 大介 TransferErrorScreen2のErrorMessage生成処理の見直し。 //* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -383,9 +384,15 @@ private void CacheControlWithSwitch() // http://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers // Using ASP.NET: - Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1. - Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. - Response.AppendHeader("Expires", "0"); // Proxies. + // Cache-Control + this.Response.Headers.Remove("Cache-Control"); + this.Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1. + // Pragma + this.Response.Headers.Remove("Pragma"); + this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + // Expires + this.Response.Headers.Remove("Expires"); + this.Response.AppendHeader("Expires", "0"); // Proxies. } else if (noCache.ToUpper() == FxLiteral.OFF) diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs index 0c8799a1f..44d864dce 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs @@ -45,6 +45,7 @@ //* 2017/02/28 西野 大介 TransferErrorScreenメソッドを追加した。 //* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -609,9 +610,12 @@ private void CacheControlWithSwitch() // Using ASP.NET-MVC: this.Response.Cache.SetCacheability(HttpCacheability.NoCache); // HTTP 1.1. this.Response.Cache.AppendCacheExtension("no-store, must-revalidate"); + // Pragma + this.Response.Headers.Remove("Pragma"); this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + // Expires + this.Response.Headers.Remove("Expires"); this.Response.AppendHeader("Expires", "0"); // Proxies. - } else if (noCache.ToUpper() == FxLiteral.OFF) { diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs index 69c71e9a1..a35534586 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs @@ -30,6 +30,7 @@ //* 2018/04/19 西野 大介 新規作成 //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 //* 2018/08/08 西野 大介 MyMVCCoreFilterAttributeをFilterAttributeとして設定 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -291,14 +292,12 @@ private void CacheControlWithSwitch() // https://www.ipa.go.jp/security/awareness/vendor/programmingv2/contents/405.html // Using ASP.NET-MVC: - //this.Response.Cache.SetCacheability(HttpCacheability.NoCache); // HTTP 1.1. - //this.Response.Cache.AppendCacheExtension("no-store, must-revalidate"); + MyHttpContext.Current.Response.Headers.Remove("Cache-Control"); MyHttpContext.Current.Response.Headers.Add("Cache-Control", new StringValues(new string[] { "no-cache", "no-store", "must-revalidate" })); - - //this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + MyHttpContext.Current.Response.Headers.Remove("Pragma"); MyHttpContext.Current.Response.Headers.Add("Pragma", new StringValues("no-cache")); - //this.Response.AppendHeader("Expires", "0"); // Proxies. + MyHttpContext.Current.Response.Headers.Remove("Expires"); MyHttpContext.Current.Response.Headers.Add("Expires", new StringValues("0")); } else if (noCache.ToUpper() == FxLiteral.OFF) diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb index 287385179..8a06fed8d 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb @@ -57,6 +57,7 @@ '* 2016/03/03 Supragyan Modified default relative path of the sample application screens (merge) '* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） '* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +'* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 '********************************************************************************** Imports System.Web @@ -347,14 +348,17 @@ Namespace Touryo.Infrastructure.Business.Presentation ' http://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers ' Using ASP.NET: - Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate") + Me.Response.Headers.Remove("Cache-Control") + Me.Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate") ' HTTP 1.1. - Response.AppendHeader("Pragma", "no-cache") + Me.Response.Headers.Remove("Pragma") + Me.Response.AppendHeader("Pragma", "no-cache") ' HTTP 1.0. ' Proxies. - Response.AppendHeader("Expires", "0") - ' OFF + Me.Response.Headers.Remove("Expires") + Me.Response.AppendHeader("Expires", "0") ElseIf noCache.ToUpper() = FxLiteral.OFF Then + ' OFF Else ' パラメータ・エラー（書式不正） Throw New FrameworkException(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH1(0), [String].Format(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH1(1), MyLiteral.CACHE_CONTROL)) diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb index 7ce382720..5d177d4c1 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb @@ -45,6 +45,7 @@ '* 2017/02/28 西野 大介 TransferErrorScreenメソッドを追加した。 '* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） '* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +'* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 '********************************************************************************** Imports System.Web @@ -576,14 +577,13 @@ Namespace Touryo.Infrastructure.Business.Presentation ' Using ASP.NET-MVC: Me.Response.Cache.SetCacheability(HttpCacheability.NoCache) - ' HTTP 1.1. Me.Response.Cache.AppendCacheExtension("no-store, must-revalidate") + Me.Response.Headers.Remove("Pragma") Me.Response.AppendHeader("Pragma", "no-cache") - ' HTTP 1.0. - ' Proxies. + Me.Response.Headers.Remove("Expires") Me.Response.AppendHeader("Expires", "0") - ' OFF ElseIf noCache.ToUpper() = FxLiteral.OFF Then + ' OFF Else ' パラメータ・エラー（書式不正） Throw New FrameworkException( diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs index 820d85912..ed7d9b8fe 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs @@ -57,6 +57,7 @@ //* 2017/02/28 西野 大介 TransferErrorScreen2のErrorMessage生成処理の見直し。 //* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -383,9 +384,15 @@ private void CacheControlWithSwitch() // http://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers // Using ASP.NET: - Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1. - Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. - Response.AppendHeader("Expires", "0"); // Proxies. + // Cache-Control + this.Response.Headers.Remove("Cache-Control"); + this.Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); // HTTP 1.1. + // Pragma + this.Response.Headers.Remove("Pragma"); + this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + // Expires + this.Response.Headers.Remove("Expires"); + this.Response.AppendHeader("Expires", "0"); // Proxies. } else if (noCache.ToUpper() == FxLiteral.OFF) diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs index 0c8799a1f..44d864dce 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs @@ -45,6 +45,7 @@ //* 2017/02/28 西野 大介 TransferErrorScreenメソッドを追加した。 //* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -609,9 +610,12 @@ private void CacheControlWithSwitch() // Using ASP.NET-MVC: this.Response.Cache.SetCacheability(HttpCacheability.NoCache); // HTTP 1.1. this.Response.Cache.AppendCacheExtension("no-store, must-revalidate"); + // Pragma + this.Response.Headers.Remove("Pragma"); this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + // Expires + this.Response.Headers.Remove("Expires"); this.Response.AppendHeader("Expires", "0"); // Proxies. - } else if (noCache.ToUpper() == FxLiteral.OFF) { diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs index 69c71e9a1..a35534586 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs @@ -30,6 +30,7 @@ //* 2018/04/19 西野 大介 新規作成 //* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 //* 2018/08/08 西野 大介 MyMVCCoreFilterAttributeをFilterAttributeとして設定 +//* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 //********************************************************************************** using System; @@ -291,14 +292,12 @@ private void CacheControlWithSwitch() // https://www.ipa.go.jp/security/awareness/vendor/programmingv2/contents/405.html // Using ASP.NET-MVC: - //this.Response.Cache.SetCacheability(HttpCacheability.NoCache); // HTTP 1.1. - //this.Response.Cache.AppendCacheExtension("no-store, must-revalidate"); + MyHttpContext.Current.Response.Headers.Remove("Cache-Control"); MyHttpContext.Current.Response.Headers.Add("Cache-Control", new StringValues(new string[] { "no-cache", "no-store", "must-revalidate" })); - - //this.Response.AppendHeader("Pragma", "no-cache"); // HTTP 1.0. + MyHttpContext.Current.Response.Headers.Remove("Pragma"); MyHttpContext.Current.Response.Headers.Add("Pragma", new StringValues("no-cache")); - //this.Response.AppendHeader("Expires", "0"); // Proxies. + MyHttpContext.Current.Response.Headers.Remove("Expires"); MyHttpContext.Current.Response.Headers.Add("Expires", new StringValues("0")); } else if (noCache.ToUpper() == FxLiteral.OFF) diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb index 287385179..8a06fed8d 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb @@ -57,6 +57,7 @@ '* 2016/03/03 Supragyan Modified default relative path of the sample application screens (merge) '* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） '* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +'* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 '********************************************************************************** Imports System.Web @@ -347,14 +348,17 @@ Namespace Touryo.Infrastructure.Business.Presentation ' http://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers ' Using ASP.NET: - Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate") + Me.Response.Headers.Remove("Cache-Control") + Me.Response.AppendHeader("Cache-Control", "no-cache, no-store, must-revalidate") ' HTTP 1.1. - Response.AppendHeader("Pragma", "no-cache") + Me.Response.Headers.Remove("Pragma") + Me.Response.AppendHeader("Pragma", "no-cache") ' HTTP 1.0. ' Proxies. - Response.AppendHeader("Expires", "0") - ' OFF + Me.Response.Headers.Remove("Expires") + Me.Response.AppendHeader("Expires", "0") ElseIf noCache.ToUpper() = FxLiteral.OFF Then + ' OFF Else ' パラメータ・エラー（書式不正） Throw New FrameworkException(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH1(0), [String].Format(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH1(1), MyLiteral.CACHE_CONTROL)) diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb index 7ce382720..5d177d4c1 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb @@ -45,6 +45,7 @@ '* 2017/02/28 西野 大介 TransferErrorScreenメソッドを追加した。 '* 2017/02/28 西野 大介 エラーログの見直し（その他の例外の場合、ex.ToString()を出力） '* 2018/07/19 西野 大介 復元後のユーザー情報をSessionに設定するコードを追加 +'* 2021/05/23 西野 大介 キャッシュ制御ヘッダの二重追加エラーの対応 '********************************************************************************** Imports System.Web @@ -576,14 +577,13 @@ Namespace Touryo.Infrastructure.Business.Presentation ' Using ASP.NET-MVC: Me.Response.Cache.SetCacheability(HttpCacheability.NoCache) - ' HTTP 1.1. Me.Response.Cache.AppendCacheExtension("no-store, must-revalidate") + Me.Response.Headers.Remove("Pragma") Me.Response.AppendHeader("Pragma", "no-cache") - ' HTTP 1.0. - ' Proxies. + Me.Response.Headers.Remove("Expires") Me.Response.AppendHeader("Expires", "0") - ' OFF ElseIf noCache.ToUpper() = FxLiteral.OFF Then + ' OFF Else ' パラメータ・エラー（書式不正） Throw New FrameworkException( From 56ca7131a68f0c6d346666a885dc5fdde5fdd7ad Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Tue, 25 May 2021 16:29:42 +0900 Subject: [PATCH 04/34] https://github.com/OpenTouryoProject/OpenTouryoTemplates/issues/108 -> https://github.com/OpenTouryoProject/OpenTouryo/issues/395 --- .../Controllers/FxController.cs | 20 +++++++++++++++++-- .../Controllers/FxController.vb | 18 ++++++++++++++--- .../Controllers/FxController.cs | 20 +++++++++++++++++-- .../Controllers/FxController.vb | 18 ++++++++++++++--- .../Controllers/FxController.vb | 18 ++++++++++++++--- 5 files changed, 81 insertions(+), 13 deletions(-) diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs index 1b71fcf72..1ade4c420 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs +++ b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs @@ -30,6 +30,7 @@ //* 日時 更新者 内容 //* ---------- ---------------- ------------------------------------------------- //* 2017/08/18 西野 大介 新規作成 +//* 2021/05/18 西野 大介 ASP.NET WebAPI（JSON）の例外処理の問題を修正 //********************************************************************************** using System; @@ -326,6 +327,11 @@ public async Task> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary> DotNETOnlineWebAPI(Dictionary Date: Tue, 25 May 2021 16:35:10 +0900 Subject: [PATCH 05/34] Now, I am fixing #108. https://github.com/OpenTouryoProject/OpenTouryo/issues/404 --- .../Backend/MVC_Sample/MVC_Sample/appsettings.json | 14 +++++++------- .../RerunnableBatch_sample/appsettings.json | 2 +- .../RerunnableBatch_sample2/appsettings.json | 2 +- .../RerunnableBatch_sample3/appsettings.json | 2 +- .../Bat_sample/SimpleBatch_sample/appsettings.json | 2 +- .../ASPNETWebServiceCore/appsettings.json | 14 +++++++------- .../Frameworks/Tools/DPQuery_Tool/appsettings.json | 4 ++-- .../Frameworks/Tools/DaoGen_Tool/appsettings.json | 4 ++-- .../Backend/MVC_Sample/MVC_Sample/appsettings.json | 14 +++++++------- .../2CSClientWPF_sample/appsettings.json | 2 +- .../2CSClientWin_sample/appsettings.json | 2 +- .../GenDaoAndBatUpd_sample/appsettings.json | 2 +- .../2CS_sample/TimeStamp_sample/appsettings.json | 2 +- .../RerunnableBatch_sample/appsettings.json | 2 +- .../RerunnableBatch_sample2/appsettings.json | 2 +- .../RerunnableBatch_sample3/appsettings.json | 2 +- .../Bat_sample/SimpleBatch_sample/appsettings.json | 2 +- .../WSClientWPF_sample/appsettings.json | 2 +- .../WSClientWin_sample/appsettings.json | 4 ++-- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json index d2c87d4ae..c68bb3c15 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json @@ -17,20 +17,20 @@ // 基盤画面パス" "FxErrorScreenPath": "/Error/Index", // 共有情報定義へのパス - "FxXMLSPDefinition": "C:\\root\\files\\resource\\XML\\SPDefinition.xml", + "FxXMLSPDefinition": "C:/root/files/resource/XML/SPDefinition.xml", // メッセージ定義へのパス - "FxXMLMSGDefinition": "C:\\root\\files\\resource\\XML\\MSGDefinition.xml", + "FxXMLMSGDefinition": "C:/root/files/resource/XML/MSGDefinition.xml", // トランザクション制御定義へのパス - "FxXMLTCDefinition": "C:\\root\\files\\resource\\XML\\TCDefinition.xml", + "FxXMLTCDefinition": "C:/root/files/resource/XML/TCDefinition.xml", // 名前解決定義へのパス - "FxXMLTMInProcessDefinition": "C:\\root\\files\\resource\\XML\\TMInProcessDefinition.xml", + "FxXMLTMInProcessDefinition": "C:/root/files/resource/XML/TMInProcessDefinition.xml", // フレームワークの使用するパラメータ - end // 共通部品の使用するパラメータ - start // Log4Netのコンフィグファイルへのパス - "FxLog4NetConfFile": "C:\\root\\files\\resource\\Log\\SampleLogConf.xml", + "FxLog4NetConfFile": "C:/root/files/resource/Log/SampleLogConf.xml", // 共通部品の使用するパラメータ - end // Ｄ層のパフォーマンスログ出力機能のon・off" "-->", "FxSqlTraceLog": "on", @@ -51,7 +51,7 @@ "SpRp_Isser": "https://ssoauth.opentouryo.com", "OAuth2AndOidcClientID": "f53469c17c5a432f86ce563b7805ab89", "OAuth2AndOidcSecret": "cKdwJb6mRKVIJpGxEWjIC94zquQltw_ECfO-55p21YM", - "SpRp_RsaCerFilePath": "C:\\root\\files\\resource\\X509\\SHA256RSA_Server.cer", + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", "JwkSetUri": "https://localhost:44300/MultiPurposeAuthSite/jwkcerts/", "SpRp_AuthRequestUri": "https://localhost:44300/MultiPurposeAuthSite/authorize", "SpRp_TokenRequestUri": "https://localhost:44300/MultiPurposeAuthSite/token", @@ -59,7 +59,7 @@ "SpRp_RedirectUri": "https://localhost:44334/Home/OAuth2AuthorizationCodeGrantClient", // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql" + "SqlTextFilePath": "C:/root/files/resource/Sql" // アプリケーションの使用するパラメータ - end } diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json index 7b45ef3f3..6acfed80c 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": ".\\Dao" + "SqlTextFilePath": "./Dao" } } \ No newline at end of file diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json index 7b45ef3f3..6acfed80c 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": ".\\Dao" + "SqlTextFilePath": "./Dao" } } \ No newline at end of file diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json index 7b45ef3f3..6acfed80c 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": ".\\Dao" + "SqlTextFilePath": "./Dao" } } \ No newline at end of file diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json index fd03c3516..748953abb 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql" + "SqlTextFilePath": "C:/root/files/resource/Sql" } } \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json index a7b8b8eb6..3a7af5d27 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json @@ -39,20 +39,20 @@ // フレームワークの使用するパラメータ - start // 共有情報定義へのパス - "FxXMLSPDefinition": "C:\\root\\files\\resource\\XML\\SPDefinition.xml", + "FxXMLSPDefinition": "C:/root/files/resource/XML/SPDefinition.xml", // メッセージ定義へのパス - "FxXMLMSGDefinition": "C:\\root\\files\\resource\\XML\\MSGDefinition.xml", + "FxXMLMSGDefinition": "C:/root/files/resource/XML/MSGDefinition.xml", // トランザクション制御定義へのパス - "FxXMLTCDefinition": "C:\\root\\files\\resource\\XML\\TCDefinition.xml", + "FxXMLTCDefinition": "C:/root/files/resource/XML/TCDefinition.xml", // 名前解決定義へのパス - "FxXMLTMInProcessDefinition": "C:\\root\\files\\resource\\XML\\TMInProcessDefinition.xml", + "FxXMLTMInProcessDefinition": "C:/root/files/resource/XML/TMInProcessDefinition.xml", // フレームワークの使用するパラメータ - end // 共通部品の使用するパラメータ - start // Log4Netのコンフィグファイルへのパス - "FxLog4NetConfFile": "C:\\root\\files\\resource\\Log\\SampleLogConfWebService.xml", + "FxLog4NetConfFile": "C:/root/files/resource/Log/SampleLogConfWebService.xml", // 共通部品の使用するパラメータ - end // Ｄ層のパフォーマンスログ出力機能のon・off" "-->", "FxSqlTraceLog": "on", @@ -76,10 +76,10 @@ "b6b393fe861b430eb4ee061006826b03", "f374a155909d486a9234693c34e94479" ], - "SpRp_RsaCerFilePath": "C:\\root\\files\\resource\\X509\\SHA256RSA_Server.cer", + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql" + "SqlTextFilePath": "C:/root/files/resource/Sql" // アプリケーションの使用するパラメータ - end } diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json b/root_VS2019/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json index 708c4634f..fda86d366 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json +++ b/root_VS2019/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json @@ -15,8 +15,8 @@ // 共通部品の使用するパラメータ - end // フォルダ - "InputFilesRoot": "C:\\", - "OutputFilesRoot": "C:\\", + "InputFilesRoot": "C:/", + "OutputFilesRoot": "C:/", // 利用者名 "FamilyName": "日立", diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json b/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json index 075cdb0d0..af4c4a6e3 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json +++ b/root_VS2019/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json @@ -12,8 +12,8 @@ "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;", // フォルダ - "InputFilesRoot": "C:\\", - "OutputFilesRoot": "C:\\", + "InputFilesRoot": "C:/", + "OutputFilesRoot": "C:/", // 利用者名 "FamilyName": "日立", diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json index d2c87d4ae..c68bb3c15 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json @@ -17,20 +17,20 @@ // 基盤画面パス" "FxErrorScreenPath": "/Error/Index", // 共有情報定義へのパス - "FxXMLSPDefinition": "C:\\root\\files\\resource\\XML\\SPDefinition.xml", + "FxXMLSPDefinition": "C:/root/files/resource/XML/SPDefinition.xml", // メッセージ定義へのパス - "FxXMLMSGDefinition": "C:\\root\\files\\resource\\XML\\MSGDefinition.xml", + "FxXMLMSGDefinition": "C:/root/files/resource/XML/MSGDefinition.xml", // トランザクション制御定義へのパス - "FxXMLTCDefinition": "C:\\root\\files\\resource\\XML\\TCDefinition.xml", + "FxXMLTCDefinition": "C:/root/files/resource/XML/TCDefinition.xml", // 名前解決定義へのパス - "FxXMLTMInProcessDefinition": "C:\\root\\files\\resource\\XML\\TMInProcessDefinition.xml", + "FxXMLTMInProcessDefinition": "C:/root/files/resource/XML/TMInProcessDefinition.xml", // フレームワークの使用するパラメータ - end // 共通部品の使用するパラメータ - start // Log4Netのコンフィグファイルへのパス - "FxLog4NetConfFile": "C:\\root\\files\\resource\\Log\\SampleLogConf.xml", + "FxLog4NetConfFile": "C:/root/files/resource/Log/SampleLogConf.xml", // 共通部品の使用するパラメータ - end // Ｄ層のパフォーマンスログ出力機能のon・off" "-->", "FxSqlTraceLog": "on", @@ -51,7 +51,7 @@ "SpRp_Isser": "https://ssoauth.opentouryo.com", "OAuth2AndOidcClientID": "f53469c17c5a432f86ce563b7805ab89", "OAuth2AndOidcSecret": "cKdwJb6mRKVIJpGxEWjIC94zquQltw_ECfO-55p21YM", - "SpRp_RsaCerFilePath": "C:\\root\\files\\resource\\X509\\SHA256RSA_Server.cer", + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", "JwkSetUri": "https://localhost:44300/MultiPurposeAuthSite/jwkcerts/", "SpRp_AuthRequestUri": "https://localhost:44300/MultiPurposeAuthSite/authorize", "SpRp_TokenRequestUri": "https://localhost:44300/MultiPurposeAuthSite/token", @@ -59,7 +59,7 @@ "SpRp_RedirectUri": "https://localhost:44334/Home/OAuth2AuthorizationCodeGrantClient", // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql" + "SqlTextFilePath": "C:/root/files/resource/Sql" // アプリケーションの使用するパラメータ - end } diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json index d3b3a507b..11f861805 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json @@ -51,7 +51,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql", + "SqlTextFilePath": "C:/root/files/resource/Sql", // コントロールのプレフィックス（追加分） "FxPrefixOfCheckBox": "cbx" // アプリケーションの使用するパラメータ - end diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json index 2736ab173..dab0064a6 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json @@ -51,7 +51,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql", + "SqlTextFilePath": "C:/root/files/resource/Sql", // コントロールのプレフィックス（追加分） "FxPrefixOfCheckBox": "cbx" // アプリケーションの使用するパラメータ - end diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json index 26498532e..368cc20d4 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json @@ -33,7 +33,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - //"SqlTextFilePath": ".\\Dao", + //"SqlTextFilePath": "./Dao", "SqlTextFilePath": "GenDaoAndBatUpd_sample.Dao" // アプリケーションの使用するパラメータ - end } diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json index 40e6439f7..26a898d0a 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json @@ -26,7 +26,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": ".\\Dao", + "SqlTextFilePath": "./Dao", // アプリケーションの使用するパラメータ - end } } \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json index 7b45ef3f3..6acfed80c 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": ".\\Dao" + "SqlTextFilePath": "./Dao" } } \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json index 7b45ef3f3..6acfed80c 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": ".\\Dao" + "SqlTextFilePath": "./Dao" } } \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json index 7b45ef3f3..6acfed80c 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": ".\\Dao" + "SqlTextFilePath": "./Dao" } } \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json index fd03c3516..748953abb 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json @@ -14,6 +14,6 @@ "FxSqlCacheSwitch": "off", "FxSqlEncoding": "utf-8", "FxSqlCommandTimeout": "30", - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql" + "SqlTextFilePath": "C:/root/files/resource/Sql" } } \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json index 7cd9e470c..dcee014fb 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json @@ -51,7 +51,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql", + "SqlTextFilePath": "C:/root/files/resource/Sql", // アプリケーションの使用するパラメータ - end }, diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json index d7e4626a9..7e3d73853 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json @@ -60,11 +60,11 @@ "SpRp_Isser": "https://ssoauth.opentouryo.com", "OAuth2AndOidcClientID": "b6b393fe861b430eb4ee061006826b03", "OAuth2AndOidcSecret": "p2RgAFKF-JaF0A9F1tyDXp4wMq-uQZYyvTBM8wr_v8g", - "SpRp_RsaCerFilePath": "C:\\root\\files\\resource\\X509\\SHA256RSA_Server.cer", + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", "JwkSetUri": "https://localhost:44300/MultiPurposeAuthSite/jwkcerts/", // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": "C:\\root\\files\\resource\\Sql", + "SqlTextFilePath": "C:/root/files/resource/Sql", // コントロールのプレフィックス（追加分） "FxPrefixOfCheckBox": "cbx" // アプリケーションの使用するパラメータ - end From 79142d96c27a91cc6d6166ceeaec07e87067c740 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Tue, 25 May 2021 16:56:26 +0900 Subject: [PATCH 06/34] Now, I am fixing #108. https://github.com/OpenTouryoProject/OpenTouryo/issues/407 --- .../files/resource/Log/SampleLogConf.xml | 262 +++++++++--------- .../files/resource/Log/SampleLogConf.xml | 262 +++++++++--------- .../files/resource/Log/SampleLogConf.xml | 262 +++++++++--------- 3 files changed, 393 insertions(+), 393 deletions(-) diff --git a/root_VS2015/files/resource/Log/SampleLogConf.xml b/root_VS2015/files/resource/Log/SampleLogConf.xml index 6b444eb91..f68b9bdd9 100644 --- a/root_VS2015/files/resource/Log/SampleLogConf.xml +++ b/root_VS2015/files/resource/Log/SampleLogConf.xml @@ -3,137 +3,137 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2017/files/resource/Log/SampleLogConf.xml b/root_VS2017/files/resource/Log/SampleLogConf.xml index 6b444eb91..f68b9bdd9 100644 --- a/root_VS2017/files/resource/Log/SampleLogConf.xml +++ b/root_VS2017/files/resource/Log/SampleLogConf.xml @@ -3,137 +3,137 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2019/files/resource/Log/SampleLogConf.xml b/root_VS2019/files/resource/Log/SampleLogConf.xml index 6b444eb91..f68b9bdd9 100644 --- a/root_VS2019/files/resource/Log/SampleLogConf.xml +++ b/root_VS2019/files/resource/Log/SampleLogConf.xml @@ -3,137 +3,137 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 983cc80e4654abfb3b3c89e37e89fd033042de46 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Tue, 25 May 2021 17:02:31 +0900 Subject: [PATCH 07/34] Now, I am fixing #108. https://github.com/OpenTouryoProject/OpenTouryo/issues/407 --- .../files/resource/Log/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../files/resource/Log/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../files/resource/Log/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../2CSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../TimeStamp_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SampleLogConf2CS.xml | 238 +++++++++--------- .../SimpleBatch_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWPF_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin2_sample/SampleLogConf2CS.xml | 238 +++++++++--------- .../WSClientWin_sample/SampleLogConf2CS.xml | 238 +++++++++--------- 87 files changed, 10353 insertions(+), 10353 deletions(-) diff --git a/root_VS2015/files/resource/Log/SampleLogConf2CS.xml b/root_VS2015/files/resource/Log/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/files/resource/Log/SampleLogConf2CS.xml +++ b/root_VS2015/files/resource/Log/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/files/resource/Log/SampleLogConf2CS.xml b/root_VS2017/files/resource/Log/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/files/resource/Log/SampleLogConf2CS.xml +++ b/root_VS2017/files/resource/Log/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2017/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/files/resource/Log/SampleLogConf2CS.xml b/root_VS2019/files/resource/Log/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/files/resource/Log/SampleLogConf2CS.xml +++ b/root_VS2019/files/resource/Log/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root_VS2019/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + From c1902e9e8f9e8713a310829c62f21cbdc8c2e158 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Tue, 25 May 2021 17:08:06 +0900 Subject: [PATCH 08/34] Now, I am fixing #108. https://github.com/OpenTouryoProject/OpenTouryo/issues/407 --- .../resource/Log/SampleLogConfWebService.xml | 314 +++++++++--------- .../resource/Log/SampleLogConfWebService.xml | 314 +++++++++--------- .../resource/Log/SampleLogConfWebService.xml | 314 +++++++++--------- 3 files changed, 471 insertions(+), 471 deletions(-) diff --git a/root_VS2015/files/resource/Log/SampleLogConfWebService.xml b/root_VS2015/files/resource/Log/SampleLogConfWebService.xml index cf358928a..ba9669807 100644 --- a/root_VS2015/files/resource/Log/SampleLogConfWebService.xml +++ b/root_VS2015/files/resource/Log/SampleLogConfWebService.xml @@ -3,163 +3,163 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2017/files/resource/Log/SampleLogConfWebService.xml b/root_VS2017/files/resource/Log/SampleLogConfWebService.xml index cf358928a..ba9669807 100644 --- a/root_VS2017/files/resource/Log/SampleLogConfWebService.xml +++ b/root_VS2017/files/resource/Log/SampleLogConfWebService.xml @@ -3,163 +3,163 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2019/files/resource/Log/SampleLogConfWebService.xml b/root_VS2019/files/resource/Log/SampleLogConfWebService.xml index cf358928a..ba9669807 100644 --- a/root_VS2019/files/resource/Log/SampleLogConfWebService.xml +++ b/root_VS2019/files/resource/Log/SampleLogConfWebService.xml @@ -3,163 +3,163 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6b853374dfa1ce8cb28ff21ae86da9fc3a0f2936 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Sat, 29 May 2021 01:48:31 +0900 Subject: [PATCH 09/34] Now, I am fixing #108. https://github.com/OpenTouryoProject/OpenTouryo/issues/409 --- .../MVC_Sample/Content/touryo/Style.css | 83 ------------------- .../MVC_Sample/Content/touryo/Style.css | 83 ------------------- .../MVC_Sample/Content/touryo/Style.css | 83 ------------------- .../MVC_Sample/wwwroot/css/touryo/Style.css | 83 ------------------- .../MVC_Sample/Content/touryo/Style.css | 83 ------------------- .../MVC_Sample/Content/touryo/Style.css | 83 ------------------- .../MVC_Sample/wwwroot/css/touryo/Style.css | 83 ------------------- .../MVC_Sample/Content/touryo/Style.css | 83 ------------------- 8 files changed, 664 deletions(-) diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root_VS2017/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root_VS2017/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root_VS2019/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root_VS2019/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -128,19 +128,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -194,15 +181,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -217,10 +195,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -229,60 +203,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} From 1dde0f1a145e691fb2e59c89c31c4697a19d7405 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Mon, 31 May 2021 02:42:18 +0900 Subject: [PATCH 10/34] Now, I am fixing #108. https://github.com/OpenTouryoProject/OpenTouryo/issues/409 --- .../WebForms_Sample/Content/touryo/Style.css | 83 ------------------- .../WebForms_Sample/Content/touryo/Style.css | 83 ------------------- .../WebForms_Sample/Content/touryo/Style.css | 83 ------------------- .../WebForms_Sample/Content/touryo/Style.css | 83 ------------------- .../WebForms_Sample/Content/touryo/Style.css | 83 ------------------- .../WebForms_Sample/Content/touryo/Style.css | 83 ------------------- 6 files changed, 498 deletions(-) diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css @@ -176,19 +176,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -242,15 +229,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -265,10 +243,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -277,60 +251,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css @@ -176,19 +176,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -242,15 +229,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -265,10 +243,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -277,60 +251,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root_VS2017/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css @@ -176,19 +176,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -242,15 +229,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -265,10 +243,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -277,60 +251,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root_VS2017/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css @@ -176,19 +176,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -242,15 +229,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -265,10 +243,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -277,60 +251,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root_VS2019/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css @@ -176,19 +176,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -242,15 +229,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -265,10 +243,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -277,60 +251,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} diff --git a/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root_VS2019/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css @@ -176,19 +176,6 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* - .collapsed{ - .arrow:before{ - font-family: FontAwesome; - content: "\f053"; - display: inline-block; - padding-left:10px; - padding-right: 10px; - vertical-align: middle; - float:right; - } - } -*/ } .nav-side-menu ul :not(collapsed) .arrow:before, .nav-side-menu li :not(collapsed) .arrow:before { @@ -242,15 +229,6 @@ text-decoration: none; color: #e1ffff; } -/*.nav-side-menu li a { - text-decoration: none; - color: #e1ffff; -} -.nav-side-menu li a i { - padding-left: 10px; - width: 20px; - padding-right: 20px; -}*/ .nav-side-menu li i { padding-left: 10px; width: 20px; @@ -265,10 +243,6 @@ -ms-transition: all 1s ease; transition: all 1s ease; } -/*body { - margin: 0px; - padding: 0px; -}*/ /* コンテンツの定義 */ #contents{ @@ -277,60 +251,3 @@ margin : 0; padding : 5px 0 50px 5px; } - -/* メディアクエリ */ -@media (max-width: 767px) { - .page-header{ - height: 60px; - } - #header-logo img { - width: 40px; - height: 40px; - } - #header-title{ - padding: 10px; - } - #header-button{ - padding-top: 10px; - } - #header-button button{ - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .nav-side-menu { - position: fixed; - width: 100%; - height: auto; - z-index: 100; - margin-bottom: 10px; - } - #body-bk { - padding-top: 110px; - } - .nav-side-menu .toggle-btn { - display: block; - cursor: pointer; - position: absolute; - right: 10px; - top: 10px; - z-index: 10 !important; - padding: 3px; - background-color: #ffffff; - color: #000; - width: 40px; - text-align: center; - } - .brand { - text-align: left !important; - font-size: 22px; - padding-left: 20px; - line-height: 50px !important; - } -} -@media (min-width: 767px) { - .nav-side-menu .menu-list .menu-content { - display: block; - } -} From 62662b1a29f19bbc7949113a5a33460d8040e4b8 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 17 Jun 2021 09:58:41 +0900 Subject: [PATCH 11/34] Tweak. --- .../programs/CS/Samples/WS_sample/ASPNETWebService/README.md | 4 ++++ .../programs/CS/Samples/WS_sample/ASPNETWebService/README.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 root_VS2017/programs/CS/Samples/WS_sample/ASPNETWebService/README.md create mode 100644 root_VS2019/programs/CS/Samples/WS_sample/ASPNETWebService/README.md diff --git a/root_VS2017/programs/CS/Samples/WS_sample/ASPNETWebService/README.md b/root_VS2017/programs/CS/Samples/WS_sample/ASPNETWebService/README.md new file mode 100644 index 000000000..00c5ea578 --- /dev/null +++ b/root_VS2017/programs/CS/Samples/WS_sample/ASPNETWebService/README.md @@ -0,0 +1,4 @@ +Moved to the following repository. + +- OpenTouryoProject/ResourceServerTemplates +https://github.com/OpenTouryoProject/ResourceServerTemplates/tree/master/root/programs/ASPNETWebService \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/WS_sample/ASPNETWebService/README.md b/root_VS2019/programs/CS/Samples/WS_sample/ASPNETWebService/README.md new file mode 100644 index 000000000..00c5ea578 --- /dev/null +++ b/root_VS2019/programs/CS/Samples/WS_sample/ASPNETWebService/README.md @@ -0,0 +1,4 @@ +Moved to the following repository. + +- OpenTouryoProject/ResourceServerTemplates +https://github.com/OpenTouryoProject/ResourceServerTemplates/tree/master/root/programs/ASPNETWebService \ No newline at end of file From 5f4fce92e42abfde93787ed0c3ce67f76ce2a0cc Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 17 Jun 2021 21:18:14 +0900 Subject: [PATCH 12/34] https://github.com/OpenTouryoProject/OpenTouryo/issues/410 --- .../Backend/MVC_Sample/MVC_Sample/Startup.cs | 84 ++++--------------- .../Backend/MVC_Sample/MVC_Sample/Startup.cs | 3 +- 2 files changed, 16 insertions(+), 71 deletions(-) diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs index c735da5d2..2f02ce32b 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs @@ -62,14 +62,6 @@ public class Startup /// IConfiguration public Startup(IHostingEnvironment env, IConfiguration config) { - // 自前 - //IConfigurationBuilder builder = new ConfigurationBuilder() - // .SetBasePath(env.ContentRootPath) - // .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - // .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - // .AddEnvironmentVariables(); - //config = builder.Build(); - // メンバに設定 this.HostingEnvironment = env; this.Configuration = config; @@ -99,42 +91,21 @@ public Startup(IHostingEnvironment env, IConfiguration config) /// public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - // Development、Staging、Productionの - // 環境変数（ASPNETCORE_ENVIRONMENT）値を使用可能。 - //bool flg = this.HostingEnvironment.IsDevelopment(); - //flg = this.HostingEnvironment.IsStaging(); - //flg = this.HostingEnvironment.IsProduction(); - - #region Development or それ以外のモード - if (this.HostingEnvironment.IsDevelopment()) { - // Developmentモードの場合 - - // 開発用エラー画面 - app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); - - // 簡易ログ出力 - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - - // ブラウザー リンク - // 開発環境と 1-n ブラウザの間の通信チャネルを作成 - // https://blogs.msdn.microsoft.com/chack/2013/12/16/visual-studio-2013-1/ - app.UseBrowserLink(); + app.UseDeveloperExceptionPage(); } else { - // Developmentモードでない場合 - - // カスタム例外処理ページ - // MyMVCCoreFilterAttribute.OnExceptionで処理。 + app.UseExceptionHandler("/Home/Error"); } - #endregion + // HttpContextのマイグレーション用 + app._UseHttpContextAccessor(); - #region パイプラインに追加 + // /wwwroot（既定の）の + // 静的ファイルをパイプラインに追加 + app.UseStaticFiles(); // Cookieを使用する。 app.UseCookiePolicy(new CookiePolicyOptions() @@ -155,14 +126,11 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) HttpOnly = true, Name = "mvc_session", Path = "/", - SameSite= SameSiteMode.Strict, + SameSite = SameSiteMode.Strict, SecurePolicy = CookieSecurePolicy.SameAsRequest } }); - // HttpContextのマイグレーション用 - app._UseHttpContextAccessor(); - // MVCをパイプラインに追加（routesも設定） app.UseMvc(routes => { @@ -171,20 +139,11 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) template: "{controller=Home}/{action=Index}/{id?}"); }); - // UseCorsでAllowAllOriginsを指定。 - //app.UseCors("AllowAllOrigins"); - - // /wwwroot（既定の）の - // 静的ファイルをパイプラインに追加 - app.UseStaticFiles(); - // Identity //app.UseAuthentication(); // Identityではなく、CookieAuthentication app.UseAuthentication(); - - #endregion } /// @@ -205,31 +164,18 @@ public void ConfigureServices(IServiceCollection services) // 構成情報から、AppConfiguration SectionをAppConfiguration Classへバインドするようなケース。 //services.Configure(Configuration.GetSection("AppConfiguration")); - #region Development or それ以外のモード - - if (this.HostingEnvironment.IsDevelopment()) - { - // Developmentモードの場合 - - // Sessionのモード - services.AddDistributedMemoryCache(); // 開発用 - } - else - { - // Developmentモードでない場合 - - // Sessionのモード - //services.AddDistributedSqlServerCache(); - //services.AddDistributedRedisCache(); - } + // HttpContextのマイグレーション用 + services._AddHttpContextAccessor(); - #endregion + // Sessionのモード + services.AddDistributedMemoryCache(); // 開発用 + //services.AddDistributedSqlServerCache(); + //services.AddDistributedRedisCache(); // Sessionを使用する。 services.AddSession(); - // HttpContextのマイグレーション用 - services._AddHttpContextAccessor(); + #region Add Frameworks diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs index a83f23ead..ed128c91a 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs @@ -92,13 +92,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) // The default HSTS value is 30 days. // You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); + //app.UseHttpsRedirection(); } // HttpContextのマイグレーション用 app._UseHttpContextAccessor(); - app.UseHttpsRedirection(); - // /wwwroot（既定の）の // 静的ファイルをパイプラインに追加 app.UseStaticFiles(); From 7fd1b125e3f51c8a87d050f634aa8d8d01ba8ab7 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 17 Jun 2021 21:19:53 +0900 Subject: [PATCH 13/34] https://github.com/OpenTouryoProject/OpenTouryo/issues/411 --- .../MVC_Sample/Controllers/Crud2Controller.cs | 603 ++++++++++++++++++ .../MVC_Sample/Views/Crud2/Index.cshtml | 124 ++++ .../MVC_Sample/Views/Crud2/_ChartView.cshtml | 46 ++ .../Views/Crud2/_MessageView.cshtml | 24 + .../MVC_Sample/Controllers/Crud2Controller.cs | 603 ++++++++++++++++++ .../MVC_Sample/Views/Crud2/Index.cshtml | 124 ++++ .../MVC_Sample/Views/Crud2/_ChartView.cshtml | 46 ++ .../Views/Crud2/_MessageView.cshtml | 24 + 8 files changed, 1594 insertions(+) create mode 100644 root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs create mode 100644 root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml create mode 100644 root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml create mode 100644 root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs new file mode 100644 index 000000000..07fcb6a6f --- /dev/null +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs @@ -0,0 +1,603 @@ +//********************************************************************************** +//* サンプル アプリ・コントローラ +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Crud1Controller +//* クラス日本語名 ：Html.BeginForm用サンプル アプリ・コントローラ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Logic.Business; +using MVC_Sample.Logic.Common; +using MVC_Sample.Models.ViewModels; + +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading.Tasks; + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Microsoft.AspNetCore.Mvc; + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Dto; +using Touryo.Infrastructure.Public.Diagnostics; + +namespace MVC_Sample.Controllers +{ + /// + /// Html.BeginForm用サンプル アプリ・コントローラ + /// + [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)] + public class Crud2Controller : MyBaseMVControllerCore + { + /// + /// 画面の初期表示 + /// GET: /Crud2/ + /// + /// 初期表示状態の画面 (ViewResult) + [HttpGet] + public IActionResult Index(CrudViweModel model) + { + return View(model); + } + + /// + /// Shippers テーブルのレコード数をカウントする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectCount(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync(testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataTable として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DT(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataSet として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DS(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataReader として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DR(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を、動的 SQL を使用して取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DSQL(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = model.DdlOrderColumn; + testParameterValue.OrderSequence = model.DdlOrderSequence; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// ShipperId をキーにして Shippers テーブルのレコードを取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Select(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + ModelState.Clear(); // ErrorのClearをしないと何故か設定できない。 + + #region PocoToPocoのテストコード + + ShipperViweModel svm = null; + TestShipperViweModel tsvm = null; + + // テスト１ + svm = (ShipperViweModel)BinarySerialize.DeepClone(model.Shipper); + + if (testReturnValue.Obj2 != null) + { + PocoToPoco.Map( + (TestShipperViweModel)testReturnValue.Obj2, svm, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "ShipperID", "_ShipperID"}, + { "CompanyName", "_CompanyName"}, + { "Phone", "_Phone"} + }); + + Debug.WriteLine("svm:" + ObjectInspector.Inspect(svm)); + } + + // テスト２ + tsvm = PocoToPoco.Map( + (ShipperViweModel)testReturnValue.Obj, null, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "_ShipperID", "ShipperID"}, + { "_CompanyName", "CompanyName"}, + { "_Phone", "Phone"} + }); + Debug.WriteLine("tsvm:" + ObjectInspector.Inspect(tsvm)); + + #endregion + + model.Shipper = (ShipperViweModel)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを追加する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Insert(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件追加"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを更新する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Update(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件更新"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを削除する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Delete(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件削除"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Sleepを実行し二重送信防止機能をテストする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public ActionResult PreventDoubleSubmission(CrudViweModel model) + { + System.Threading.Thread.Sleep(5 * 1000); + + // メッセージを設定。 + + // 確認用のカウンタ + int? temp = HttpContext.Session.GetInt32("cnt"); + if (temp.HasValue) + { + HttpContext.Session.SetInt32("cnt", temp.Value + 1); + } + else + { + HttpContext.Session.SetInt32("cnt", 1); + } + temp = HttpContext.Session.GetInt32("cnt"); + + model.Message = "PreventDoubleSubmission:" + temp.Value.ToString(); + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// 画面遷移する + /// 画面遷移のためのRedirectResult + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult Transitions() + { + return Redirect(Url.Action("Index", "Crud1")); + } + + /// 分離レベルの設定 + private DbEnum.IsolationLevelEnum SelectIsolationLevel(string iso) + { + if (iso == "NC") + { + return DbEnum.IsolationLevelEnum.NotConnect; + } + else if (iso == "NT") + { + return DbEnum.IsolationLevelEnum.NoTransaction; + } + else if (iso == "RU") + { + return DbEnum.IsolationLevelEnum.ReadUncommitted; + } + else if (iso == "RC") + { + return DbEnum.IsolationLevelEnum.ReadCommitted; + } + else if (iso == "RR") + { + return DbEnum.IsolationLevelEnum.RepeatableRead; + } + else if (iso == "SZ") + { + return DbEnum.IsolationLevelEnum.Serializable; + } + else if (iso == "SS") + { + return DbEnum.IsolationLevelEnum.Snapshot; + } + else if (iso == "DF") + { + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + else + { + //throw new Exception("分離レベルの設定がおかしい"); + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + } + } +} \ No newline at end of file diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml new file mode 100644 index 000000000..9f38483fb --- /dev/null +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml @@ -0,0 +1,124 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Index + //* クラス日本語名 ：CRUDサンプル（Html.BeginForm） + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@{ + // ページタイトル + ViewBag.Title = "CRUDサンプル（Html.BeginForm）"; +} + +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +@* 本文レイアウト（RenderBodyに出力されます） *@ +@* Html.BeginFormは従来の全体方式、Ajax.BeginFormは部分更新方式（UpdateTargetIdの範囲を部分更新） *@ +@using (Html.BeginForm(null, null, FormMethod.Post, new { id = "form1", onsubmit = "Fx_OnSubmit();" })) +{ + @Html.AntiForgeryToken() + +
+
+
+ + @Html.DropDownListFor(model => model.DdlDap, Model.DdlDapItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode1, Model.DdlMode1Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode2, Model.DdlMode2Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlIso, Model.DdlIsoItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlExRollback, Model.DdlExRollbackItems, new { @class = "form-control" }) +
+
+
+
+ + @Html.TextBoxFor(model => model.Shipper.ShipperID, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.CompanyName, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.Phone, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderColumn, Model.DdlOrderColumnItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderSequence, Model.DdlOrderSequenceItems, new { @class = "form-control" }) +
+ 処理結果： +
@Html.Partial("_MessageView")
+
+
+
@Html.Partial("_ChartView")
+ +
+
+
+ + + + + +
+
+ + + + +
+
+ + + +
+} + +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml new file mode 100644 index 000000000..a94e07247 --- /dev/null +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml @@ -0,0 +1,46 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_ChartView + //* クラス日本語名 ：Chart部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@if (Model != null && Model.Shippers != null) +{ + + + + + + + + + + @foreach (ShipperViweModel svm in Model.Shippers) + { + + + + + + } + +
ShipperIdCompanyNamePhone
@svm.ShipperID@svm.CompanyName@svm.Phone
+} diff --git a/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml new file mode 100644 index 000000000..81b2a5671 --- /dev/null +++ b/root_VS2017/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml @@ -0,0 +1,24 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_MessageView + //* クラス日本語名 ：Message部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs new file mode 100644 index 000000000..07fcb6a6f --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs @@ -0,0 +1,603 @@ +//********************************************************************************** +//* サンプル アプリ・コントローラ +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Crud1Controller +//* クラス日本語名 ：Html.BeginForm用サンプル アプリ・コントローラ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Logic.Business; +using MVC_Sample.Logic.Common; +using MVC_Sample.Models.ViewModels; + +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading.Tasks; + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Microsoft.AspNetCore.Mvc; + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Dto; +using Touryo.Infrastructure.Public.Diagnostics; + +namespace MVC_Sample.Controllers +{ + /// + /// Html.BeginForm用サンプル アプリ・コントローラ + /// + [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)] + public class Crud2Controller : MyBaseMVControllerCore + { + /// + /// 画面の初期表示 + /// GET: /Crud2/ + /// + /// 初期表示状態の画面 (ViewResult) + [HttpGet] + public IActionResult Index(CrudViweModel model) + { + return View(model); + } + + /// + /// Shippers テーブルのレコード数をカウントする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectCount(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync(testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataTable として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DT(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataSet として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DS(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataReader として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DR(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を、動的 SQL を使用して取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DSQL(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = model.DdlOrderColumn; + testParameterValue.OrderSequence = model.DdlOrderSequence; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// ShipperId をキーにして Shippers テーブルのレコードを取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Select(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + ModelState.Clear(); // ErrorのClearをしないと何故か設定できない。 + + #region PocoToPocoのテストコード + + ShipperViweModel svm = null; + TestShipperViweModel tsvm = null; + + // テスト１ + svm = (ShipperViweModel)BinarySerialize.DeepClone(model.Shipper); + + if (testReturnValue.Obj2 != null) + { + PocoToPoco.Map( + (TestShipperViweModel)testReturnValue.Obj2, svm, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "ShipperID", "_ShipperID"}, + { "CompanyName", "_CompanyName"}, + { "Phone", "_Phone"} + }); + + Debug.WriteLine("svm:" + ObjectInspector.Inspect(svm)); + } + + // テスト２ + tsvm = PocoToPoco.Map( + (ShipperViweModel)testReturnValue.Obj, null, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "_ShipperID", "ShipperID"}, + { "_CompanyName", "CompanyName"}, + { "_Phone", "Phone"} + }); + Debug.WriteLine("tsvm:" + ObjectInspector.Inspect(tsvm)); + + #endregion + + model.Shipper = (ShipperViweModel)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを追加する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Insert(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件追加"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを更新する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Update(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件更新"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを削除する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Delete(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件削除"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Sleepを実行し二重送信防止機能をテストする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public ActionResult PreventDoubleSubmission(CrudViweModel model) + { + System.Threading.Thread.Sleep(5 * 1000); + + // メッセージを設定。 + + // 確認用のカウンタ + int? temp = HttpContext.Session.GetInt32("cnt"); + if (temp.HasValue) + { + HttpContext.Session.SetInt32("cnt", temp.Value + 1); + } + else + { + HttpContext.Session.SetInt32("cnt", 1); + } + temp = HttpContext.Session.GetInt32("cnt"); + + model.Message = "PreventDoubleSubmission:" + temp.Value.ToString(); + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// 画面遷移する + /// 画面遷移のためのRedirectResult + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult Transitions() + { + return Redirect(Url.Action("Index", "Crud1")); + } + + /// 分離レベルの設定 + private DbEnum.IsolationLevelEnum SelectIsolationLevel(string iso) + { + if (iso == "NC") + { + return DbEnum.IsolationLevelEnum.NotConnect; + } + else if (iso == "NT") + { + return DbEnum.IsolationLevelEnum.NoTransaction; + } + else if (iso == "RU") + { + return DbEnum.IsolationLevelEnum.ReadUncommitted; + } + else if (iso == "RC") + { + return DbEnum.IsolationLevelEnum.ReadCommitted; + } + else if (iso == "RR") + { + return DbEnum.IsolationLevelEnum.RepeatableRead; + } + else if (iso == "SZ") + { + return DbEnum.IsolationLevelEnum.Serializable; + } + else if (iso == "SS") + { + return DbEnum.IsolationLevelEnum.Snapshot; + } + else if (iso == "DF") + { + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + else + { + //throw new Exception("分離レベルの設定がおかしい"); + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + } + } +} \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml new file mode 100644 index 000000000..6cfae25bc --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml @@ -0,0 +1,124 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Index + //* クラス日本語名 ：CRUDサンプル（Html.BeginForm） + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@{ + // ページタイトル + ViewBag.Title = "CRUDサンプル（Html.BeginForm）"; +} + +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +@* 本文レイアウト（RenderBodyに出力されます） *@ +@* Html.BeginFormは従来の全体方式、Ajax.BeginFormは部分更新方式（UpdateTargetIdの範囲を部分更新） *@ +@using (Html.BeginForm(null, null, FormMethod.Post, new { id = "form1", onsubmit = "Fx_OnSubmit();" })) +{ + @Html.AntiForgeryToken() + +
+
+
+ + @Html.DropDownListFor(model => model.DdlDap, Model.DdlDapItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode1, Model.DdlMode1Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode2, Model.DdlMode2Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlIso, Model.DdlIsoItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlExRollback, Model.DdlExRollbackItems, new { @class = "form-control" }) +
+
+
+
+ + @Html.TextBoxFor(model => model.Shipper.ShipperID, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.CompanyName, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.Phone, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderColumn, Model.DdlOrderColumnItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderSequence, Model.DdlOrderSequenceItems, new { @class = "form-control" }) +
+ 処理結果： +
@await Html.PartialAsync("_MessageView")
+
+
+
@await Html.PartialAsync("_ChartView")
+ +
+
+
+ + + + + +
+
+ + + + +
+
+ + + +
+} + +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml new file mode 100644 index 000000000..a94e07247 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml @@ -0,0 +1,46 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_ChartView + //* クラス日本語名 ：Chart部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@if (Model != null && Model.Shippers != null) +{ + + + + + + + + + + @foreach (ShipperViweModel svm in Model.Shippers) + { + + + + + + } + +
ShipperIdCompanyNamePhone
@svm.ShipperID@svm.CompanyName@svm.Phone
+} diff --git a/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml new file mode 100644 index 000000000..81b2a5671 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml @@ -0,0 +1,24 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_MessageView + //* クラス日本語名 ：Message部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + From d0f602aafb458998b90344c81f931cb2d6ef8fed Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Wed, 30 Mar 2022 16:31:52 +0900 Subject: [PATCH 14/34] Now, I am fixing #110. --- root_VS2015/programs/CS/0_ExecAllBat.bat | 22 - .../Infrastructure/Business/app.config | 48 - .../ASPNETWebService/packages.config | 32 - .../ASPNETWebService/packages.config | 32 - .../GenDaoAndBatUpd_sample/app.config | 40 - .../RerunnableBatch_sample/app.config | 64 - .../RerunnableBatch_sample2/app.config | 64 - .../RerunnableBatch_sample3/app.config | 64 - .../Bat_sample/SimpleBatch_sample/app.config | 64 - .../My Project/Application.Designer.vb | 13 - .../My Project/Application.Designer.vb | 13 - .../My Project/Application.Designer.vb | 13 - .../My Project/Application.Designer.vb | 13 - {root_VS2015 => root_VS2022}/README.md | 128 +- {root_VS2015 => root_VS2022}/Readme.ja.md | 125 +- .../Log/Examples of rolling of date+size.xml | 0 .../resource/Log/Log4NetConfigTemplate.xml | 0 .../files/resource/Log/SampleLogConf.xml | 0 .../files/resource/Log/SampleLogConf2CS.xml | 0 .../resource/Log/SampleLogConfMobile.xml | 0 .../resource/Log/SampleLogConfWebService.xml | 0 .../resource/Sql/DaoCategories_D1_Insert.xml | 0 .../resource/Sql/DaoCategories_D2_Select.xml | 0 .../resource/Sql/DaoCategories_D3_Update.xml | 0 .../resource/Sql/DaoCategories_D4_Delete.xml | 0 .../resource/Sql/DaoCategories_D5_SelCnt.xml | 0 .../resource/Sql/DaoCategories_S1_Insert.sql | 0 .../resource/Sql/DaoCategories_S2_Select.xml | 0 .../resource/Sql/DaoCategories_S3_Update.xml | 0 .../resource/Sql/DaoCategories_S4_Delete.xml | 0 .../resource/Sql/DaoProducts_D1_Insert.xml | 0 .../resource/Sql/DaoProducts_S1_Insert.sql | 0 .../resource/Sql/DaoProducts_S2_Select.xml | 0 .../resource/Sql/DaoProducts_S3_Update.xml | 0 .../resource/Sql/DaoProducts_S4_Delete.xml | 0 .../resource/Sql/DaoShippers_D1_Insert.xml | 0 .../resource/Sql/DaoShippers_D2_Select.xml | 0 .../resource/Sql/DaoShippers_D3_Update.xml | 0 .../resource/Sql/DaoShippers_D4_Delete.xml | 0 .../resource/Sql/DaoShippers_D5_SelCnt.xml | 0 .../resource/Sql/DaoShippers_S1_Insert.sql | 0 .../resource/Sql/DaoShippers_S2_Select.xml | 0 .../resource/Sql/DaoShippers_S3_Update.xml | 0 .../resource/Sql/DaoShippers_S4_Delete.xml | 0 .../resource/Sql/DaoSuppliers_D1_Insert.xml | 0 .../resource/Sql/DaoSuppliers_D2_Select.xml | 0 .../resource/Sql/DaoSuppliers_D3_Update.xml | 0 .../resource/Sql/DaoSuppliers_D4_Delete.xml | 0 .../resource/Sql/DaoSuppliers_D5_SelCnt.xml | 0 .../resource/Sql/DaoSuppliers_S1_Insert.sql | 0 .../resource/Sql/DaoSuppliers_S2_Select.xml | 0 .../resource/Sql/DaoSuppliers_S3_Update.xml | 0 .../resource/Sql/DaoSuppliers_S4_Delete.xml | 0 .../files/resource/Sql/ShipperCount.sql | 0 .../files/resource/Sql/ShipperCount.xml | 0 .../files/resource/Sql/ShipperDelete.sql | 0 .../files/resource/Sql/ShipperDelete.xml | 0 .../files/resource/Sql/ShipperInsert.sql | 0 .../files/resource/Sql/ShipperSelect.sql | 0 .../files/resource/Sql/ShipperSelect.xml | 0 .../files/resource/Sql/ShipperSelectOrder.sql | 0 .../files/resource/Sql/ShipperSelectOrder.xml | 0 .../files/resource/Sql/ShipperUpdate.sql | 0 .../files/resource/Sql/ShipperUpdate.xml | 0 .../files/resource/Sql/db2/ShipperCount.sql | 0 .../files/resource/Sql/db2/ShipperCount.xml | 0 .../files/resource/Sql/db2/ShipperDelete.sql | 0 .../files/resource/Sql/db2/ShipperDelete.xml | 0 .../files/resource/Sql/db2/ShipperInsert.sql | 0 .../files/resource/Sql/db2/ShipperSelect.sql | 0 .../files/resource/Sql/db2/ShipperSelect.xml | 0 .../resource/Sql/db2/ShipperSelectOrder.sql | 0 .../resource/Sql/db2/ShipperSelectOrder.xml | 0 .../files/resource/Sql/db2/ShipperUpdate.sql | 0 .../files/resource/Sql/db2/ShipperUpdate.xml | 0 .../files/resource/Sql/db2/TestTable.txt | 0 .../files/resource/Sql/hirdb/TestTable.txt | 0 .../files/resource/Sql/mysql/ShipperCount.sql | 0 .../files/resource/Sql/mysql/ShipperCount.xml | 0 .../resource/Sql/mysql/ShipperDelete.sql | 0 .../resource/Sql/mysql/ShipperDelete.xml | 0 .../resource/Sql/mysql/ShipperInsert.sql | 0 .../resource/Sql/mysql/ShipperSelect.sql | 0 .../resource/Sql/mysql/ShipperSelect.xml | 0 .../resource/Sql/mysql/ShipperSelectOrder.sql | 0 .../resource/Sql/mysql/ShipperSelectOrder.xml | 0 .../resource/Sql/mysql/ShipperUpdate.sql | 0 .../resource/Sql/mysql/ShipperUpdate.xml | 0 .../files/resource/Sql/mysql/TestTable.txt | 0 .../Sql/ole_odbc/Configuration steps ODBC.txt | 0 .../Sql/ole_odbc/DaoShippers_D1_Insert.xml | 0 .../Sql/ole_odbc/DaoShippers_D2_Select.xml | 0 .../Sql/ole_odbc/DaoShippers_D3_Update.xml | 0 .../Sql/ole_odbc/DaoShippers_D4_Delete.xml | 0 .../Sql/ole_odbc/DaoShippers_D5_SelCnt.xml | 0 .../Sql/ole_odbc/DaoShippers_S1_Insert.sql | 0 .../Sql/ole_odbc/DaoShippers_S2_Select.xml | 0 .../Sql/ole_odbc/DaoShippers_S3_Update.xml | 0 .../Sql/ole_odbc/DaoShippers_S4_Delete.xml | 0 .../resource/Sql/ole_odbc/ShipperCount.sql | 0 .../resource/Sql/ole_odbc/ShipperCount.xml | 0 .../resource/Sql/ole_odbc/ShipperDelete.sql | 0 .../resource/Sql/ole_odbc/ShipperDelete.xml | 0 .../resource/Sql/ole_odbc/ShipperInsert.sql | 0 .../resource/Sql/ole_odbc/ShipperSelect.sql | 0 .../resource/Sql/ole_odbc/ShipperSelect.xml | 0 .../Sql/ole_odbc/ShipperSelectOrder.sql | 0 .../Sql/ole_odbc/ShipperSelectOrder.xml | 0 .../resource/Sql/ole_odbc/ShipperUpdate.sql | 0 .../resource/Sql/ole_odbc/ShipperUpdate.xml | 0 .../AllTables.csv | 0 .../AllTables_DBTypeInfo.csv | 0 .../AllTables_DotNetTypeInfo.csv | 0 .../DTO/ORDERS2DataSet.xsd | 0 .../Automatic generation/DTO/ORDERS2Entity.cs | 0 .../Automatic generation/DTO/ORDERS2Entity.vb | 0 .../DTO/SHIPPERSDataSet.xsd | 0 .../DTO/SHIPPERSEntity.cs | 0 .../DTO/SHIPPERSEntity.vb | 0 .../Automatic generation/Dao/DaoORDERS2.cs | 0 .../Automatic generation/Dao/DaoORDERS2.vb | 0 .../Automatic generation/Dao/DaoSHIPPERS.cs | 0 .../Automatic generation/Dao/DaoSHIPPERS.vb | 0 .../SQL/DaoORDERS2_D1_Insert.xml | 0 .../SQL/DaoORDERS2_D2_Select.xml | 0 .../SQL/DaoORDERS2_D3_Update.xml | 0 .../SQL/DaoORDERS2_D4_Delete.xml | 0 .../SQL/DaoORDERS2_D5_SelCnt.xml | 0 .../SQL/DaoORDERS2_S1_Insert.sql | 0 .../SQL/DaoORDERS2_S2_Select.xml | 0 .../SQL/DaoORDERS2_S3_Update.xml | 0 .../SQL/DaoORDERS2_S4_Delete.xml | 0 .../SQL/DaoSHIPPERS_D1_Insert.xml | 0 .../SQL/DaoSHIPPERS_D1_Insert_org.xml | 0 .../SQL/DaoSHIPPERS_D2_Select.xml | 0 .../SQL/DaoSHIPPERS_D3_Update.xml | 0 .../SQL/DaoSHIPPERS_D4_Delete.xml | 0 .../SQL/DaoSHIPPERS_D5_SelCnt.xml | 0 .../SQL/DaoSHIPPERS_S1_Insert.sql | 0 .../SQL/DaoSHIPPERS_S1_Insert_org.sql | 0 .../SQL/DaoSHIPPERS_S2_Select.xml | 0 .../SQL/DaoSHIPPERS_S3_Update.xml | 0 .../SQL/DaoSHIPPERS_S4_Delete.xml | 0 .../files/resource/Sql/oracle/SCOTT.sql | 0 .../resource/Sql/oracle/ShipperCount.sql | 0 .../resource/Sql/oracle/ShipperCount.xml | 0 .../resource/Sql/oracle/ShipperDelete.sql | 0 .../resource/Sql/oracle/ShipperDelete.xml | 0 .../resource/Sql/oracle/ShipperInsert.sql | 0 .../resource/Sql/oracle/ShipperSelect.sql | 0 .../resource/Sql/oracle/ShipperSelect.xml | 0 .../Sql/oracle/ShipperSelectOrder.sql | 0 .../Sql/oracle/ShipperSelectOrder.xml | 0 .../resource/Sql/oracle/ShipperUpdate.sql | 0 .../resource/Sql/oracle/ShipperUpdate.xml | 0 .../files/resource/Sql/oracle/TestTable.txt | 0 .../resource/Sql/pstgrs/ShipperCount.sql | 0 .../resource/Sql/pstgrs/ShipperCount.xml | 0 .../resource/Sql/pstgrs/ShipperDelete.sql | 0 .../resource/Sql/pstgrs/ShipperDelete.xml | 0 .../resource/Sql/pstgrs/ShipperInsert.sql | 0 .../resource/Sql/pstgrs/ShipperSelect.sql | 0 .../resource/Sql/pstgrs/ShipperSelect.xml | 0 .../Sql/pstgrs/ShipperSelectOrder.sql | 0 .../Sql/pstgrs/ShipperSelectOrder.xml | 0 .../resource/Sql/pstgrs/ShipperUpdate.sql | 0 .../resource/Sql/pstgrs/ShipperUpdate.xml | 0 .../files/resource/Sql/pstgrs/TestTable.txt | 0 .../CreateTable/1.sql | 0 .../CreateTable/2.sql | 0 .../CreateTable/3.sql | 0 .../CreateTable/A.sql | 0 .../CreateTable/B.sql | 0 .../CreateTable/C.sql | 0 .../tstest_rand.csv | 0 .../tstest_rand_DBTypeInfo.csv | 0 .../tstest_rand_DotNetTypeInfo.csv | 0 .../tstest_timestamp.csv | 0 .../tstest_timestamp_DBTypeInfo.csv | 0 .../tstest_timestamp_DotNetTypeInfo.csv | 0 .../DTO/ts_test_table1DataSet.xsd | 0 .../DTO/ts_test_table1Entity.cs | 0 .../DTO/ts_test_table1Entity.vb | 0 .../DTO/ts_test_table2DataSet.xsd | 0 .../DTO/ts_test_table2Entity.cs | 0 .../DTO/ts_test_table2Entity.vb | 0 .../DTO/ts_test_table3DataSet.xsd | 0 .../DTO/ts_test_table3Entity.cs | 0 .../DTO/ts_test_table3Entity.vb | 0 .../DTO/ts_test_tableADataSet.xsd | 0 .../DTO/ts_test_tableAEntity.cs | 0 .../DTO/ts_test_tableAEntity.vb | 0 .../DTO/ts_test_tableBDataSet.xsd | 0 .../DTO/ts_test_tableBEntity.cs | 0 .../DTO/ts_test_tableBEntity.vb | 0 .../DTO/ts_test_tableCDataSet.xsd | 0 .../DTO/ts_test_tableCEntity.cs | 0 .../DTO/ts_test_tableCEntity.vb | 0 .../Dao/Daots_test_table1.cs | 0 .../Dao/Daots_test_table1.vb | 0 .../Dao/Daots_test_table2.cs | 0 .../Dao/Daots_test_table2.vb | 0 .../Dao/Daots_test_table3.cs | 0 .../Dao/Daots_test_table3.vb | 0 .../Dao/Daots_test_tableA.cs | 0 .../Dao/Daots_test_tableA.vb | 0 .../Dao/Daots_test_tableB.cs | 0 .../Dao/Daots_test_tableB.vb | 0 .../Dao/Daots_test_tableC.cs | 0 .../Dao/Daots_test_tableC.vb | 0 .../SQL/Daots_test_table1_D1_Insert.xml | 0 .../SQL/Daots_test_table1_D2_Select.xml | 0 .../SQL/Daots_test_table1_D3_Update.xml | 0 .../SQL/Daots_test_table1_D4_Delete.xml | 0 .../SQL/Daots_test_table1_D5_SelCnt.xml | 0 .../SQL/Daots_test_table1_S1_Insert.sql | 0 .../SQL/Daots_test_table1_S1_Insert_org.sql | 0 .../SQL/Daots_test_table1_S2_Select.xml | 0 .../SQL/Daots_test_table1_S3_Update.xml | 0 .../SQL/Daots_test_table1_S4_Delete.xml | 0 .../SQL/Daots_test_table2_D1_Insert.xml | 0 .../SQL/Daots_test_table2_D2_Select.xml | 0 .../SQL/Daots_test_table2_D3_Update.xml | 0 .../SQL/Daots_test_table2_D4_Delete.xml | 0 .../SQL/Daots_test_table2_D5_SelCnt.xml | 0 .../SQL/Daots_test_table2_S1_Insert.sql | 0 .../SQL/Daots_test_table2_S1_Insert_org.sql | 0 .../SQL/Daots_test_table2_S2_Select.xml | 0 .../SQL/Daots_test_table2_S3_Update.xml | 0 .../SQL/Daots_test_table2_S4_Delete.xml | 0 .../SQL/Daots_test_table3_D1_Insert.xml | 0 .../SQL/Daots_test_table3_D2_Select.xml | 0 .../SQL/Daots_test_table3_D3_Update.xml | 0 .../SQL/Daots_test_table3_D4_Delete.xml | 0 .../SQL/Daots_test_table3_D5_SelCnt.xml | 0 .../SQL/Daots_test_table3_S1_Insert.sql | 0 .../SQL/Daots_test_table3_S1_Insert_org.sql | 0 .../SQL/Daots_test_table3_S2_Select.xml | 0 .../SQL/Daots_test_table3_S3_Update.xml | 0 .../SQL/Daots_test_table3_S4_Delete.xml | 0 .../SQL/Daots_test_tableA_D1_Insert.xml | 0 .../SQL/Daots_test_tableA_D2_Select.xml | 0 .../SQL/Daots_test_tableA_D3_Update.xml | 0 .../SQL/Daots_test_tableA_D4_Delete.xml | 0 .../SQL/Daots_test_tableA_D5_SelCnt.xml | 0 .../SQL/Daots_test_tableA_S1_Insert.sql | 0 .../SQL/Daots_test_tableA_S1_Insert_org.sql | 0 .../SQL/Daots_test_tableA_S2_Select.xml | 0 .../SQL/Daots_test_tableA_S3_Update.xml | 0 .../SQL/Daots_test_tableA_S4_Delete.xml | 0 .../SQL/Daots_test_tableB_D1_Insert.xml | 0 .../SQL/Daots_test_tableB_D2_Select.xml | 0 .../SQL/Daots_test_tableB_D3_Update.xml | 0 .../SQL/Daots_test_tableB_D4_Delete.xml | 0 .../SQL/Daots_test_tableB_D5_SelCnt.xml | 0 .../SQL/Daots_test_tableB_S1_Insert.sql | 0 .../SQL/Daots_test_tableB_S1_Insert_org.sql | 0 .../SQL/Daots_test_tableB_S2_Select.xml | 0 .../SQL/Daots_test_tableB_S3_Update.xml | 0 .../SQL/Daots_test_tableB_S4_Delete.xml | 0 .../SQL/Daots_test_tableC_D1_Insert.xml | 0 .../SQL/Daots_test_tableC_D2_Select.xml | 0 .../SQL/Daots_test_tableC_D3_Update.xml | 0 .../SQL/Daots_test_tableC_D4_Delete.xml | 0 .../SQL/Daots_test_tableC_D5_SelCnt.xml | 0 .../SQL/Daots_test_tableC_S1_Insert.sql | 0 .../SQL/Daots_test_tableC_S1_Insert_org.sql | 0 .../SQL/Daots_test_tableC_S2_Select.xml | 0 .../SQL/Daots_test_tableC_S3_Update.xml | 0 .../SQL/Daots_test_tableC_S4_Delete.xml | 0 .../AllTables.csv | 0 .../AllTables_DBTypeInfo.csv | 0 .../AllTables_DotNetTypeInfo.csv | 0 .../DTO/CategoriesDataSet.xsd | 0 .../DTO/CategoriesEntity.cs | 0 .../DTO/CategoriesEntity.vb | 0 .../DTO/CustomersDataSet.xsd | 0 .../DTO/CustomersEntity.cs | 0 .../DTO/CustomersEntity.vb | 0 .../DTO/EmployeeTerritoriesDataSet.xsd | 0 .../DTO/EmployeeTerritoriesEntity.cs | 0 .../DTO/EmployeeTerritoriesEntity.vb | 0 .../DTO/EmployeesDataSet.xsd | 0 .../DTO/EmployeesEntity.cs | 0 .../DTO/EmployeesEntity.vb | 0 .../DTO/Order_DetailsDataSet.xsd | 0 .../DTO/Order_DetailsEntity.cs | 0 .../DTO/Order_DetailsEntity.vb | 0 .../DTO/Orders2DataSet.xsd | 0 .../Automatic generation/DTO/Orders2Entity.cs | 0 .../Automatic generation/DTO/Orders2Entity.vb | 0 .../DTO/OrdersDataSet.xsd | 0 .../Automatic generation/DTO/OrdersEntity.cs | 0 .../Automatic generation/DTO/OrdersEntity.vb | 0 .../DTO/ProductsDataSet.xsd | 0 .../DTO/ProductsEntity.cs | 0 .../DTO/ProductsEntity.vb | 0 .../DTO/RegionDataSet.xsd | 0 .../Automatic generation/DTO/RegionEntity.cs | 0 .../Automatic generation/DTO/RegionEntity.vb | 0 .../DTO/ShippersDataSet.xsd | 0 .../DTO/ShippersEntity.cs | 0 .../DTO/ShippersEntity.vb | 0 .../DTO/SuppliersDataSet.xsd | 0 .../DTO/SuppliersEntity.cs | 0 .../DTO/SuppliersEntity.vb | 0 .../DTO/TerritoriesDataSet.xsd | 0 .../DTO/TerritoriesEntity.cs | 0 .../DTO/TerritoriesEntity.vb | 0 .../Automatic generation/Dao/DaoCategories.cs | 0 .../Automatic generation/Dao/DaoCategories.vb | 0 .../Automatic generation/Dao/DaoCustomers.cs | 0 .../Automatic generation/Dao/DaoCustomers.vb | 0 .../Dao/DaoEmployeeTerritories.cs | 0 .../Dao/DaoEmployeeTerritories.vb | 0 .../Automatic generation/Dao/DaoEmployees.cs | 0 .../Automatic generation/Dao/DaoEmployees.vb | 0 .../Dao/DaoOrder_Details.cs | 0 .../Dao/DaoOrder_Details.vb | 0 .../Automatic generation/Dao/DaoOrders.cs | 0 .../Automatic generation/Dao/DaoOrders.vb | 0 .../Automatic generation/Dao/DaoOrders2.cs | 0 .../Automatic generation/Dao/DaoOrders2.vb | 0 .../Automatic generation/Dao/DaoProducts.cs | 0 .../Automatic generation/Dao/DaoProducts.vb | 0 .../Automatic generation/Dao/DaoRegion.cs | 0 .../Automatic generation/Dao/DaoRegion.vb | 0 .../Automatic generation/Dao/DaoShippers.cs | 0 .../Automatic generation/Dao/DaoShippers.vb | 0 .../Automatic generation/Dao/DaoSuppliers.cs | 0 .../Automatic generation/Dao/DaoSuppliers.vb | 0 .../Dao/DaoTerritories.cs | 0 .../Dao/DaoTerritories.vb | 0 .../SQL/DaoCategories_D1_Insert.xml | 0 .../SQL/DaoCategories_D2_Select.xml | 0 .../SQL/DaoCategories_D3_Update.xml | 0 .../SQL/DaoCategories_D4_Delete.xml | 0 .../SQL/DaoCategories_D5_SelCnt.xml | 0 .../SQL/DaoCategories_S1_Insert.sql | 0 .../SQL/DaoCategories_S2_Select.xml | 0 .../SQL/DaoCategories_S3_Update.xml | 0 .../SQL/DaoCategories_S4_Delete.xml | 0 .../SQL/DaoCustomers_D1_Insert.xml | 0 .../SQL/DaoCustomers_D2_Select.xml | 0 .../SQL/DaoCustomers_D3_Update.xml | 0 .../SQL/DaoCustomers_D4_Delete.xml | 0 .../SQL/DaoCustomers_D5_SelCnt.xml | 0 .../SQL/DaoCustomers_S1_Insert.sql | 0 .../SQL/DaoCustomers_S2_Select.xml | 0 .../SQL/DaoCustomers_S3_Update.xml | 0 .../SQL/DaoCustomers_S4_Delete.xml | 0 .../SQL/DaoEmployeeTerritories_D1_Insert.xml | 0 .../SQL/DaoEmployeeTerritories_D2_Select.xml | 0 .../SQL/DaoEmployeeTerritories_D3_Update.xml | 0 .../SQL/DaoEmployeeTerritories_D4_Delete.xml | 0 .../SQL/DaoEmployeeTerritories_D5_SelCnt.xml | 0 .../SQL/DaoEmployeeTerritories_S1_Insert.sql | 0 .../SQL/DaoEmployeeTerritories_S2_Select.xml | 0 .../SQL/DaoEmployeeTerritories_S3_Update.xml | 0 .../SQL/DaoEmployeeTerritories_S4_Delete.xml | 0 .../SQL/DaoEmployees_D1_Insert.xml | 0 .../SQL/DaoEmployees_D2_Select.xml | 0 .../SQL/DaoEmployees_D3_Update.xml | 0 .../SQL/DaoEmployees_D4_Delete.xml | 0 .../SQL/DaoEmployees_D5_SelCnt.xml | 0 .../SQL/DaoEmployees_S1_Insert.sql | 0 .../SQL/DaoEmployees_S2_Select.xml | 0 .../SQL/DaoEmployees_S3_Update.xml | 0 .../SQL/DaoEmployees_S4_Delete.xml | 0 .../SQL/DaoOrder_Details_D1_Insert.xml | 0 .../SQL/DaoOrder_Details_D2_Select.xml | 0 .../SQL/DaoOrder_Details_D3_Update.xml | 0 .../SQL/DaoOrder_Details_D4_Delete.xml | 0 .../SQL/DaoOrder_Details_D5_SelCnt.xml | 0 .../SQL/DaoOrder_Details_S1_Insert.sql | 0 .../SQL/DaoOrder_Details_S2_Select.xml | 0 .../SQL/DaoOrder_Details_S3_Update.xml | 0 .../SQL/DaoOrder_Details_S4_Delete.xml | 0 .../SQL/DaoOrders2_D1_Insert.xml | 0 .../SQL/DaoOrders2_D2_Select.xml | 0 .../SQL/DaoOrders2_D3_Update.xml | 0 .../SQL/DaoOrders2_D4_Delete.xml | 0 .../SQL/DaoOrders2_D5_SelCnt.xml | 0 .../SQL/DaoOrders2_S1_Insert.sql | 0 .../SQL/DaoOrders2_S2_Select.xml | 0 .../SQL/DaoOrders2_S3_Update.xml | 0 .../SQL/DaoOrders2_S4_Delete.xml | 0 .../SQL/DaoOrders_D1_Insert.xml | 0 .../SQL/DaoOrders_D2_Select.xml | 0 .../SQL/DaoOrders_D3_Update.xml | 0 .../SQL/DaoOrders_D4_Delete.xml | 0 .../SQL/DaoOrders_D5_SelCnt.xml | 0 .../SQL/DaoOrders_S1_Insert.sql | 0 .../SQL/DaoOrders_S2_Select.xml | 0 .../SQL/DaoOrders_S3_Update.xml | 0 .../SQL/DaoOrders_S4_Delete.xml | 0 .../SQL/DaoProducts_D1_Insert.xml | 0 .../SQL/DaoProducts_D2_Select.xml | 0 .../SQL/DaoProducts_D3_Update.xml | 0 .../SQL/DaoProducts_D4_Delete.xml | 0 .../SQL/DaoProducts_D5_SelCnt.xml | 0 .../SQL/DaoProducts_S1_Insert.sql | 0 .../SQL/DaoProducts_S1_Insert_org.sql | 0 .../SQL/DaoProducts_S2_Select.xml | 0 .../SQL/DaoProducts_S3_Update.xml | 0 .../SQL/DaoProducts_S4_Delete.xml | 0 .../SQL/DaoRegion_D1_Insert.xml | 0 .../SQL/DaoRegion_D2_Select.xml | 0 .../SQL/DaoRegion_D3_Update.xml | 0 .../SQL/DaoRegion_D4_Delete.xml | 0 .../SQL/DaoRegion_D5_SelCnt.xml | 0 .../SQL/DaoRegion_S1_Insert.sql | 0 .../SQL/DaoRegion_S2_Select.xml | 0 .../SQL/DaoRegion_S3_Update.xml | 0 .../SQL/DaoRegion_S4_Delete.xml | 0 .../SQL/DaoShippers_D1_Insert.xml | 0 .../SQL/DaoShippers_D2_Select.xml | 0 .../SQL/DaoShippers_D3_Update.xml | 0 .../SQL/DaoShippers_D4_Delete.xml | 0 .../SQL/DaoShippers_D5_SelCnt.xml | 0 .../SQL/DaoShippers_S1_Insert.sql | 0 .../SQL/DaoShippers_S2_Select.xml | 0 .../SQL/DaoShippers_S3_Update.xml | 0 .../SQL/DaoShippers_S4_Delete.xml | 0 .../SQL/DaoSuppliers_D1_Insert.xml | 0 .../SQL/DaoSuppliers_D2_Select.xml | 0 .../SQL/DaoSuppliers_D3_Update.xml | 0 .../SQL/DaoSuppliers_D4_Delete.xml | 0 .../SQL/DaoSuppliers_D5_SelCnt.xml | 0 .../SQL/DaoSuppliers_S1_Insert.sql | 0 .../SQL/DaoSuppliers_S1_Insert_org.sql | 0 .../SQL/DaoSuppliers_S2_Select.xml | 0 .../SQL/DaoSuppliers_S3_Update.xml | 0 .../SQL/DaoSuppliers_S4_Delete.xml | 0 .../SQL/DaoTerritories_D1_Insert.xml | 0 .../SQL/DaoTerritories_D2_Select.xml | 0 .../SQL/DaoTerritories_D3_Update.xml | 0 .../SQL/DaoTerritories_D4_Delete.xml | 0 .../SQL/DaoTerritories_D5_SelCnt.xml | 0 .../SQL/DaoTerritories_S1_Insert.sql | 0 .../SQL/DaoTerritories_S2_Select.xml | 0 .../SQL/DaoTerritories_S3_Update.xml | 0 .../SQL/DaoTerritories_S4_Delete.xml | 0 .../sqlserver/ScreenAutoGen/CreateTable.sql | 0 .../ScreenAutoGen_FreeSQL/CreateTable.sql | 0 .../DaoTABL2_TABL1_JOIN_S2_Select.xml | 0 .../resource/Sql/sqlserver/ShipperCount.sql | 0 .../resource/Sql/sqlserver/ShipperCount.xml | 0 .../resource/Sql/sqlserver/ShipperDelete.sql | 0 .../resource/Sql/sqlserver/ShipperDelete.xml | 0 .../resource/Sql/sqlserver/ShipperInsert.sql | 0 .../resource/Sql/sqlserver/ShipperSelect.sql | 0 .../resource/Sql/sqlserver/ShipperSelect.xml | 0 .../Sql/sqlserver/ShipperSelectOrder.sql | 0 .../Sql/sqlserver/ShipperSelectOrder.xml | 0 .../resource/Sql/sqlserver/ShipperUpdate.sql | 0 .../resource/Sql/sqlserver/ShipperUpdate.xml | 0 .../resource/Sql/sqlserver/TestTable.txt | 0 .../Workflow/Gen/DaoM_User_D1_Insert.xml | 0 .../Workflow/Gen/DaoM_User_D2_Select.xml | 0 .../Workflow/Gen/DaoM_User_D3_Update.xml | 0 .../Workflow/Gen/DaoM_User_D4_Delete.xml | 0 .../Workflow/Gen/DaoM_User_D5_SelCnt.xml | 0 .../Workflow/Gen/DaoM_User_S1_Insert.sql | 0 .../Workflow/Gen/DaoM_User_S2_Select.xml | 0 .../Workflow/Gen/DaoM_User_S3_Update.xml | 0 .../Workflow/Gen/DaoM_User_S4_Delete.xml | 0 .../Workflow/Gen/DaoM_Workflow_D1_Insert.xml | 0 .../Workflow/Gen/DaoM_Workflow_D2_Select.xml | 0 .../Workflow/Gen/DaoM_Workflow_D3_Update.xml | 0 .../Workflow/Gen/DaoM_Workflow_D4_Delete.xml | 0 .../Workflow/Gen/DaoM_Workflow_D5_SelCnt.xml | 0 .../Workflow/Gen/DaoM_Workflow_S1_Insert.sql | 0 .../Workflow/Gen/DaoM_Workflow_S2_Select.xml | 0 .../Workflow/Gen/DaoM_Workflow_S3_Update.xml | 0 .../Gen/DaoT_CurrentWorkflow_D1_Insert.xml | 0 .../Gen/DaoT_CurrentWorkflow_D2_Select.xml | 0 .../Gen/DaoT_CurrentWorkflow_D3_Update.xml | 0 .../Gen/DaoT_CurrentWorkflow_D4_Delete.xml | 0 .../Gen/DaoT_CurrentWorkflow_D5_SelCnt.xml | 0 .../Gen/DaoT_CurrentWorkflow_S1_Insert.sql | 0 .../Gen/DaoT_CurrentWorkflow_S2_Select.xml | 0 .../Gen/DaoT_CurrentWorkflow_S3_Update.xml | 0 .../Gen/DaoT_WorkflowHistory_S2_Select.xml | 0 .../Gen/DaoT_WorkflowHistory_S3_Update.xml | 0 .../Gen/DaoT_WorkflowHistory_S4_Delete.xml | 0 .../Workflow/Gen/DaoT_Workflow_D1_Insert.xml | 0 .../Workflow/Gen/DaoT_Workflow_D2_Select.xml | 0 .../Workflow/Gen/DaoT_Workflow_D3_Update.xml | 0 .../Workflow/Gen/DaoT_Workflow_D4_Delete.xml | 0 .../Workflow/Gen/DaoT_Workflow_D5_SelCnt.xml | 0 .../Workflow/Gen/DaoT_Workflow_S1_Insert.sql | 0 .../Workflow/Gen/DaoT_Workflow_S2_Select.xml | 0 .../Workflow/Gen/DaoT_Workflow_S3_Update.xml | 0 .../Sql/sqlserver/Workflow/Gen/ddef.csv | 0 .../Workflow/Gen/ddef_DBTypeInfo.csv | 0 .../Workflow/Gen/ddef_DotNetTypeInfo.csv | 0 .../SQL/Select/GetProcessingWfRequest.xml | 0 .../Workflow/SQL/Select/GetReplyToUser.sql | 0 .../Workflow/SQL/Select/GetReplyWorkflow.xml | 0 .../Workflow/SQL/Select/GetTurnBackToUser.sql | 0 .../SQL/Select/GetTurnBackWorkflow.sql | 0 .../SQL/Select/GetTurnBackWorkflow2.sql | 0 .../Workflow/SQL/Select/GetWfRequest.xml | 0 .../SQL/Select/RequestApproval_Count.sql | 0 .../SQL/Select/RequestApproval_Move.sql | 0 .../SQL/Table/Check/SELECT_ALL TABLE.sql | 0 .../SQL/Table/Check/SELECT_WF_DEF.sql | 0 .../Workflow/SQL/Table/M_User(sample).sql | 0 .../SQL/Table/M_User_Insert(sample).sql | 0 .../Workflow/SQL/Table/M_Workflow.sql | 0 .../Workflow/SQL/Table/M_Workflow_Insert.sql | 0 .../Workflow/SQL/Table/T_CurrentWorkflow.sql | 0 .../Workflow/SQL/Table/T_Workflow.sql | 0 .../Workflow/SQL/Table/T_WorkflowHistory.sql | 0 .../files/resource/Sql/sqlserver/instnwnd.sql | Bin .../files/resource/Sql/sqlserver/instpubs.sql | 0 .../resource/X509/GenDsaCertByOpenSSL.bat | 0 .../resource/X509/GenECDsaCertByOpenSSL.bat | 0 .../resource/X509/GenRsaCertByOpenSSL.bat | 0 .../files/resource/X509/SHA256DSA.cer | 0 .../files/resource/X509/SHA256DSA.pfx | Bin .../files/resource/X509/SHA256ECDSA.cer | 0 .../files/resource/X509/SHA256ECDSA.pfx | Bin .../resource/X509/SHA256ECDSA_Client.cer | 0 .../resource/X509/SHA256ECDSA_Client.pfx | Bin .../resource/X509/SHA256ECDSA_Server.cer | 0 .../resource/X509/SHA256ECDSA_Server.pfx | Bin .../files/resource/X509/SHA256RSA.cer | 0 .../files/resource/X509/SHA256RSA.pfx | Bin .../resource/X509/SHA256RSAClientCert.pfx | Bin .../files/resource/X509/SHA256RSA_Client.cer | 0 .../files/resource/X509/SHA256RSA_Client.pfx | Bin .../files/resource/X509/SHA256RSA_Server.cer | 0 .../files/resource/X509/SHA256RSA_Server.pfx | Bin .../files/resource/X509/SHA384ECDSA.cer | 0 .../files/resource/X509/SHA384ECDSA.pfx | Bin .../files/resource/X509/SHA521ECDSA.cer | 0 .../files/resource/X509/SHA521ECDSA.pfx | Bin .../files/resource/Xml/MSGDefinition.xml | 0 .../files/resource/Xml/MSGDefinition_ja.xml | 0 .../resource/Xml/MSGDefinition_zh-CN.xml | 0 .../files/resource/Xml/SCDefinition.xml | 0 .../files/resource/Xml/SPDefinition.xml | 0 .../files/resource/Xml/TCDefinition.xml | 0 .../resource/Xml/TMInProcessDefinition.xml | 0 .../resource/Xml/TMProtocolDefinition.xml | 0 .../resource/Xml/TMProtocolDefinition2.xml | 0 .../DGenTemplates/ConditionalSearch.aspx | 0 .../DGenTemplates/ConditionalSearch.aspx.cs | 0 .../DGenTemplates/ConditionalSearch.aspx.vb | 0 .../files/tools/DGenTemplates/DaoTemplate.cs | 0 .../files/tools/DGenTemplates/DaoTemplate.vb | 0 .../files/tools/DGenTemplates/DaoTemplate2.cs | 0 .../files/tools/DGenTemplates/DaoTemplate2.vb | 0 .../files/tools/DGenTemplates/DaoTemplate3.cs | 0 .../files/tools/DGenTemplates/DaoTemplate3.vb | 0 .../tools/DGenTemplates/DataSetTemplate.xsd | 0 .../files/tools/DGenTemplates/Detail.aspx | 0 .../files/tools/DGenTemplates/Detail.aspx.cs | 0 .../files/tools/DGenTemplates/Detail.aspx.vb | 0 .../tools/DGenTemplates/EntityTemplate.cs | 0 .../tools/DGenTemplates/EntityTemplate.vb | 0 .../tools/DGenTemplates/EntityTemplate_bk.cs | 0 .../tools/DGenTemplates/EntityTemplate_bk.vb | 0 .../tools/DGenTemplates/SearchAndUpdate.aspx | 0 .../DGenTemplates/SearchAndUpdate.aspx.cs | 0 .../DGenTemplates/SearchAndUpdate.aspx.vb | 0 .../files/tools/DGenTemplates/TableAdapter.cs | 0 .../files/tools/DGenTemplates/TableAdapter.vb | 0 .../_Screen_ConditionalSearch.aspx | 0 .../_Screen_ConditionalSearch.aspx.cs | 0 .../_Screen_ConditionalSearch.aspx.vb | 0 .../tools/DGenTemplates/_Screen_Detail.aspx | 0 .../DGenTemplates/_Screen_Detail.aspx.cs | 0 .../DGenTemplates/_Screen_Detail.aspx.vb | 0 .../_Screen_SearchAndUpdate.aspx | 0 .../_Screen_SearchAndUpdate.aspx.cs | 0 .../_Screen_SearchAndUpdate.aspx.vb | 0 .../tools/DGenTemplates/d1_DynInsTemplate.xml | 0 .../tools/DGenTemplates/d2_DynSelTemplate.xml | 0 .../tools/DGenTemplates/d3_DynUpdTemplate.xml | 0 .../tools/DGenTemplates/d4_DynDelTemplate.xml | 0 .../DGenTemplates/d5_DynSelCntTemplate.xml | 0 .../tools/DGenTemplates/s1_InsertTemplate.sql | 0 .../tools/DGenTemplates/s2_SelectTemplate.xml | 0 .../tools/DGenTemplates/s3_UpdateTemplate.xml | 0 .../tools/DGenTemplates/s4_DeleteTemplate.xml | 0 .../files/tools/Doxyfile/doxygen.zip | Bin .../files/tools/Doxyfile/readme.txt | 0 .../files/tools/WinMergeFilters/touryo.flt | 0 .../tools/WinMergeFilters/touryofull.flt | 0 root_VS2022/programs/CS/0_ExecAllBat.bat | 37 + .../CS/10_Build_WebAppCore_sample.bat | 35 + .../programs/CS/10_Build_WebApp_sample.bat | 0 .../programs/CS/1_DeleteDir.bat | 0 .../programs/CS/1_DeleteFile.bat | 0 .../CS/3_Build_BusinessRichClient_net48.bat | 4 +- .../3_Build_BusinessRichClient_netcore50.bat | 27 + .../programs/CS/3_Build_Business_net48.bat | 4 +- .../CS/3_Build_Business_netcore50.bat | 27 + .../programs/CS/4_Build_Framework_Tool.bat | 0 .../CS/4_Build_Framework_ToolCore.bat | 35 + .../programs/CS/5_Build_2CSCore_sample.bat | 57 + .../programs/CS/5_Build_2CS_sample.bat | 0 .../programs/CS/5_Build_BatCore_sample.bat | 51 + .../programs/CS/5_Build_Bat_sample.bat | 0 .../programs/CS/6_Build_WSSrvCore_sample.bat | 36 + .../programs/CS/6_Build_WSSrv_sample.bat | 0 .../programs/CS/7_Build_Framework_WS.bat | 0 .../programs/CS/7_Build_Framework_WSCore.bat | 27 + .../programs/CS/8_Build_WSClntCore_sample.bat | 43 + .../programs/CS/8_Build_WSClnt_sample.bat | 14 +- .../Business/Business/MyBaseLogic.cs | 0 .../Business/Business/MyFcBaseLogic.cs | 0 .../Business/Business/_3TierEngine.cs | 0 .../Business/Business_net48.csproj | 49 +- .../Business/Business_netcore50.csproj | 76 + .../Business/Common/MuParameterValue.cs | 0 .../Business/Common/MuReturnValue.cs | 0 .../Business/Common/MyParameterValue.cs | 0 .../Business/Common/MyReturnValue.cs | 0 .../Business/Common/_3TierParameterValue.cs | 0 .../Business/Common/_3TierReturnValue.cs | 0 .../Csp/CstSqlSessionStateProvider.cs | 0 .../Csp/SessionDB creation script.txt | 0 .../Business/Dao/BaseConsolidateDao.cs | 0 .../Infrastructure/Business/Dao/CmnDao.cs | 0 .../Infrastructure/Business/Dao/MyBaseDao.cs | 0 .../MyBusinessApplicationExceptionMessage.cs | 0 .../MyBusinessSystemExceptionMessage.cs | 0 .../AuthenticationFailureResult.cs | 0 .../Business/Presentation/CmnTableAdapter.cs | 0 .../Presentation/MyBaseAsyncApiController.cs | 0 .../MyBaseAsyncApiControllerCore.cs | 0 .../Business/Presentation/MyBaseController.cs | 0 .../Presentation/MyBaseMVController.cs | 0 .../Presentation/MyBaseMVControllerCore.cs | 0 .../Presentation/MyMVCCoreFilterAttribute.cs | 0 .../Presentation/ResultWithChallenge.cs | 0 .../Business/Properties/AssemblyInfo.cs | 0 ...cationExceptionMessageResource.Designer.cs | 28 +- ...icationExceptionMessageResource.ja-JP.resx | 0 ...ssApplicationExceptionMessageResource.resx | 0 ...SystemExceptionMessageResource.Designer.cs | 38 +- ...sSystemExceptionMessageResource.ja-JP.resx | 0 ...usinessSystemExceptionMessageResource.resx | 0 .../Asynchronous/MyBaseAsyncFunc.cs | 0 .../Business.RichClient_net48.csproj | 68 +- .../Business.RichClient_netcore50.csproj | 64 + .../RichClient/Business/MyBaseLogic2CS.cs | 0 .../RichClient/Business/MyFcBaseLogic2CS.cs | 0 .../Presentation/MyBaseControllerWin.cs | 0 .../RichClient/Properties/AssemblyInfo.cs | 0 .../RichClient/Util/RcMyCmnFunction.cs | 0 .../Business/RichClient/packages.config | 24 +- .../Business/Str/JISX0208_1983Checker.cs | 0 .../Infrastructure/Business/Util/GMTMaster.cs | 0 .../Business/Util/MyAttribute.cs | 0 .../Business/Util/MyCmnFunction.cs | 0 .../Infrastructure/Business/Util/MyLiteral.cs | 0 .../Business/Util/MySubsysInfo.cs | 0 .../Business/Util/MyTimeZone.cs | 0 .../Business/Util/MyTimeZoneEnum.cs | 0 .../Business/Util/MyUserInfo.cs | 0 .../Infrastructure/Business/app.config | 21 +- .../Infrastructure/Business/packages.config | 52 +- .../BusinessRichClient_net48.sln | 11 +- .../BusinessRichClient_netcore50.sln | 31 + .../Infrastructure/Business_net48.sln | 11 +- .../Infrastructure/Business_netcore50.sln | 25 + .../CustomControl/Control/WebCustomButton.cs | 0 .../Control/WebCustomCheckBox.cs | 0 .../Control/WebCustomCheckBoxList.cs | 0 .../Control/WebCustomDropDownList.cs | 0 .../Control/WebCustomFileUpload.cs | 0 .../Control/WebCustomImageButton.cs | 0 .../Control/WebCustomImageMap.cs | 0 .../CustomControl/Control/WebCustomLabel.cs | 0 .../Control/WebCustomLinkButton.cs | 0 .../CustomControl/Control/WebCustomListBox.cs | 0 .../CustomControl/Control/WebCustomPanel.cs | 0 .../Control/WebCustomRadioButton.cs | 0 .../Control/WebCustomRadioButtonList.cs | 0 .../CustomControl/Control/WebCustomTextBox.cs | 0 .../CustomControl/CustomControl_net48.csproj | 16 +- .../CustomControl/Function/CheckResult.cs | 0 .../Function/CmnCheckFunction.cs | 0 .../Function/CmnMasterDatasForList.cs | 0 .../CustomControl/Function/ListItem.cs | 0 .../CustomControl/Interface/ICheck.cs | 0 .../CustomControl/Interface/IGetValue.cs | 0 .../CustomControl/Interface/IMasterData.cs | 0 .../CustomControl/Properties/AssemblyInfo.cs | 0 .../CustomControl/PropertyGrid/CheckType.cs | 0 .../PropertyGrid/CheckTypeConverter.cs | 0 .../Control/WinCustomDropDownList.cs | 0 .../Control/WinCustomDropDownList.resx | 0 .../Control/WinCustomMaskedTextBox.cs | 0 .../Control/WinCustomMaskedTextBox.resx | 0 .../Control/WinCustomMaskedTextBoxDgvCell.cs | 0 .../Control/WinCustomMaskedTextBoxDgvCol.cs | 0 .../Control/WinCustomMaskedTextBoxDgvHost.cs | 0 .../RichClient/Control/WinCustomTextBox.cs | 0 .../RichClient/Control/WinCustomTextBox.resx | 0 .../Control/WinCustomTextBoxDgvCell.cs | 0 .../Control/WinCustomTextBoxDgvCol.cs | 0 .../Control/WinCustomTextBoxDgvHost.cs | 0 .../CustomControl.RichClient_net48.csproj | 70 +- .../CustomControl.RichClient_netcore50.csproj | 52 + .../RichClient/Function/CheckResult.cs | 0 .../RichClient/Function/CmnCheckFunction.cs | 0 .../Function/CmnMasterDatasForList.cs | 0 .../RichClient/Function/ListItem.cs | 0 .../RichClient/Interface/ICheck.cs | 0 .../RichClient/Interface/IEdit.cs | 0 .../RichClient/Interface/IGetValue.cs | 0 .../RichClient/Interface/IMasterData.cs | 0 .../RichClient/Properties/AssemblyInfo.cs | 0 .../RichClient/PropertyGrid/CheckType.cs | 0 .../PropertyGrid/CheckTypeConverter.cs | 0 .../RichClient/PropertyGrid/EditAddFigure.cs | 0 .../PropertyGrid/EditDigitsAfterDP.cs | 0 .../EditDigitsAfterDPConverter.cs | 0 .../PropertyGrid/EditInitialValue.cs | 0 .../RichClient/PropertyGrid/EditPadding.cs | 0 .../PropertyGrid/EditPaddingConverter.cs | 0 .../CustomControl}/RichClient/packages.config | 24 +- .../Infrastructure/CustomControl/app.config | 0 .../CustomControl/packages.config | 8 +- .../ASPNETWebService/ASPNETWebService.sln | 7 +- .../ASPNETWebService/ASPNETWebService.csproj | 162 +- .../App_Start/FilterConfig.cs | 0 .../App_Start/WebApiConfig.cs | 0 .../Controllers/FxController.cs | 0 .../ASPNETWebService/IWCFHTTPSvcForFx.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../ASPNETWebService/ServiceForFx.asmx | 0 .../ASPNETWebService/ServiceForFx.asmx.cs | 0 .../ASPNETWebService/Startup.cs | 0 .../ASPNETWebService/WCFHTTPSvcForFx.svc | 0 .../ASPNETWebService/WCFHTTPSvcForFx.svc.cs | 0 .../ASPNETWebService/Web.Debug.config | 0 .../ASPNETWebService/Web.Release.config | 0 .../ASPNETWebService/Web.config | 52 +- .../ASPNETWebService/app.config | 0 .../ASPNETWebService/packages.config | 29 + .../ASPNETWebServiceCore.sln | 25 + .../ASPNETWebServiceCore.csproj | 46 + .../Controllers/FxController.cs | 385 ++++ .../Controllers/ValuesController.cs | 44 + .../ASPNETWebServiceCore/Program.cs | 55 + .../Properties/launchSettings.json | 27 + .../ASPNETWebServiceCore/Startup.cs | 159 ++ .../appsettings.Development.json | 10 + .../ASPNETWebServiceCore/appsettings.json | 86 + .../ServiceInterface/WCFService/App.config | 12 +- .../ServiceInterface/WCFService/Program.cs | 0 .../WCFService/Properties/AssemblyInfo.cs | 0 .../WCFService/WCFService.csproj | 8 +- .../WCFService/WCFService.sln | 7 +- .../WCFService/WCFTCPSvcForFx.cs | 0 .../WCFService/packages.config | 2 +- .../programs/CS/Frameworks/Readme.txt | 0 .../Tools/DPQuery_Tool/CheckException.cs | 0 .../Tools/DPQuery_Tool/CmnMethods.cs | 0 .../Tools/DPQuery_Tool/DPQuery_Tool.csproj | 16 +- .../Tools/DPQuery_Tool/DPQuery_Tool.sln | 7 +- .../DPQuery_Tool/DPQuery_ToolCore.csproj | 77 + .../Tools/DPQuery_Tool/DPQuery_ToolCore.sln | 22 + .../Tools/DPQuery_Tool/DummyDaps.cs | 0 .../Tools/DPQuery_Tool/Form1.Designer.cs | 0 .../CS/Frameworks/Tools/DPQuery_Tool/Form1.cs | 0 .../Tools/DPQuery_Tool/Form1.ja-JP.resx | 0 .../Frameworks/Tools/DPQuery_Tool/Form1.resx | 0 .../Tools/DPQuery_Tool/Form2.Designer.cs | 0 .../CS/Frameworks/Tools/DPQuery_Tool/Form2.cs | 0 .../Tools/DPQuery_Tool/Form2.ja-JP.resx | 0 .../Frameworks/Tools/DPQuery_Tool/Form2.resx | 0 .../Tools/DPQuery_Tool/Form3.Designer.cs | 0 .../CS/Frameworks/Tools/DPQuery_Tool/Form3.cs | 0 .../Tools/DPQuery_Tool/Form3.ja-JP.resx | 0 .../Frameworks/Tools/DPQuery_Tool/Form3.resx | 0 .../DPQuery_Tool/InputDialog.Designer.cs | 0 .../Tools/DPQuery_Tool/InputDialog.cs | 0 .../Tools/DPQuery_Tool/InputDialog.ja-JP.resx | 0 .../Tools/DPQuery_Tool/InputDialog.resx | 0 .../Frameworks/Tools/DPQuery_Tool/Literal.cs | 0 .../Frameworks/Tools/DPQuery_Tool/Program.cs | 0 .../DPQuery_Tool/Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../DPQuery_Tool/Properties/Resources.resx | 0 .../Resources/Resource.Designer.cs | 0 .../Resources/Resource.ja-JP.resx | 0 .../DPQuery_Tool/Resources/Resource.resx | 0 .../DPQuery_Tool/RichTextBoxDisableDF.cs | 0 .../Frameworks/Tools/DPQuery_Tool/app.config | 4 + .../Tools/DPQuery_Tool/appsettings.json | 222 ++ .../CS/Frameworks/Tools/DPQuery_Tool/demo.txt | 0 .../Frameworks/Tools/DaoGen_Tool/CColumn.cs | 0 .../CS/Frameworks/Tools/DaoGen_Tool/CTable.cs | 0 .../Tools/DaoGen_Tool/CheckException.cs | 0 .../Tools/DaoGen_Tool/CmnMethods.cs | 0 .../Tools/DaoGen_Tool/DaoGen_Tool.csproj | 10 +- .../Tools/DaoGen_Tool/DaoGen_Tool.sln | 7 +- .../Tools/DaoGen_Tool/DaoGen_ToolCore.csproj | 77 + .../Tools/DaoGen_Tool/DaoGen_ToolCore.sln | 22 + .../Tools/DaoGen_Tool/Form1.Designer.cs | 0 .../CS/Frameworks/Tools/DaoGen_Tool/Form1.cs | 0 .../Tools/DaoGen_Tool/Form1.ja-JP.resx | 0 .../Frameworks/Tools/DaoGen_Tool/Form1.resx | 0 .../Tools/DaoGen_Tool/Form2.Designer.cs | 0 .../CS/Frameworks/Tools/DaoGen_Tool/Form2.cs | 0 .../Tools/DaoGen_Tool/Form2.ja-JP.resx | 0 .../Frameworks/Tools/DaoGen_Tool/Form2.resx | 0 .../Tools/DaoGen_Tool/Img/downarrow.PNG | Bin .../Frameworks/Tools/DaoGen_Tool/Img/like.PNG | Bin .../Tools/DaoGen_Tool/Img/rightarrow.PNG | Bin .../Frameworks/Tools/DaoGen_Tool/Program.cs | 0 .../DaoGen_Tool/Properties/AssemblyInfo.cs | 0 .../Resources/Resource.Designer.cs | 0 .../DaoGen_Tool/Resources/Resource.ja-JP.resx | 0 .../Tools/DaoGen_Tool/Resources/Resource.resx | 0 .../SetPrimaryKeyWindow.Designer.cs | 0 .../Tools/DaoGen_Tool/SetPrimaryKeyWindow.cs | 0 .../SetPrimaryKeyWindow.ja-JP.resx | 0 .../DaoGen_Tool/SetPrimaryKeyWindow.resx | 0 .../SimpleTextBoxWindow.Designer.cs | 0 .../Tools/DaoGen_Tool/SimpleTextBoxWindow.cs | 0 .../SimpleTextBoxWindow.ja-JP.resx | 0 .../DaoGen_Tool/SimpleTextBoxWindow.resx | 0 .../Frameworks/Tools/DaoGen_Tool/app.config | 4 + .../Tools/DaoGen_Tool/appsettings.json | 216 ++ .../ChangeProgressParameter.cs | 0 .../DeployZipPackWithHTTP/Command line.txt | 0 .../CustMsgBox.Designer.cs | 0 .../Tools/DeployZipPackWithHTTP/CustMsgBox.cs | 0 .../CustMsgBox.ja-JP.resx | 0 .../DeployZipPackWithHTTP/CustMsgBox.resx | 0 .../DeployZipPackWithHTTP.csproj | 10 +- .../DeployZipPackWithHTTP.sln | 7 +- .../Tools/DeployZipPackWithHTTP/Entry.cs | 0 .../DeployZipPackWithHTTP/Form1.Designer.cs | 0 .../Tools/DeployZipPackWithHTTP/Form1.cs | 0 .../DeployZipPackWithHTTP/Form1.ja-JP.resx | 0 .../Tools/DeployZipPackWithHTTP/Form1.resx | 0 .../DeployZipPackWithHTTP/Form2.Designer.cs | 0 .../Tools/DeployZipPackWithHTTP/Form2.cs | 0 .../DeployZipPackWithHTTP/Form2.ja-JP.resx | 0 .../Tools/DeployZipPackWithHTTP/Form2.resx | 0 .../Log4DeployZipPackWithHTTP.xml | 0 .../Tools/DeployZipPackWithHTTP/LogLevel.cs | 0 .../DeployZipPackWithHTTP/MSGDefinition.xml | 0 .../MSGDefinition_ja-JP.xml | 0 .../DeployZipPackWithHTTP/MyException.cs | 0 .../Tools/DeployZipPackWithHTTP/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Resource.Designer.cs | 0 .../Resources/Resource.ja-JP.resx | 0 .../Resources/Resource.resx | 0 .../Sample/FormAppRoot/Wave1.wav | Bin .../Sample/FormAppRoot/Wave2.wav | Bin .../Sample/FormAppRoot/Wave3.wav | Bin .../FormAppRoot/aaa/Excel 97-2003_1.xls | Bin .../FormAppRoot/aaa/Excel 97-2003_2.xls | Bin .../FormAppRoot/aaa/Excel 97-2003_3.xls | Bin .../Sample/FormAppRoot/aaa/top1.exe | Bin .../Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt | Bin .../Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt | Bin .../Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt | Bin .../Sample/FormAppRoot/bbb/top2.exe | Bin .../Sample/FormAppRoot/ccc/Word 97-2003_1.doc | Bin .../Sample/FormAppRoot/ccc/Word 97-2003_2.doc | Bin .../Sample/FormAppRoot/ccc/Word 97-2003_3.doc | Bin .../Sample/FormAppRoot/ccc/top3.exe | Bin .../Sample/FormAppRoot/top.exe | Bin .../FormAppRoot/xxx/Excel 97-2003_1.xls | Bin .../FormAppRoot/xxx/Excel 97-2003_2.xls | Bin .../FormAppRoot/xxx/Excel 97-2003_3.xls | Bin .../Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt | Bin .../Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt | Bin .../Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt | Bin .../Sample/FormAppRoot/xxx/Word 97-2003_1.doc | Bin .../Sample/FormAppRoot/xxx/Word 97-2003_2.doc | Bin .../Sample/FormAppRoot/xxx/Word 97-2003_3.doc | Bin .../Sample/FormAppRootWeb/FormAppRoot.mft | 0 .../Sample/FormAppRootWeb/aaa.zip | Bin .../Sample/FormAppRootWeb/bbb.zip | Bin .../Sample/FormAppRootWeb/ccc.zip | Bin .../Sample/FormAppRootWeb/root.zip | Bin .../Sample/FormAppRootWeb/xxx.zip | Bin .../Tools/DeployZipPackWithHTTP/app.config | 4 + .../Tools/DeployZipPackWithHTTP/app.ico | Bin .../DeployZipPackWithHTTP/packages.config | 2 +- .../2CSClientWPF_sample.csproj | 12 +- .../2CSClientWPF_sample.sln | 25 + .../2CS_sample/2CSClientWPF_sample/App.xaml | 0 .../2CSClientWPF_sample/App.xaml.cs | 0 .../2CSClientWPF_sample/Business/LayerB.cs | 0 .../Common/TestParameterValue.cs | 0 .../Common/TestReturnValue.cs | 0 .../2CSClientWPF_sample/Dao/DaoShippers.cs | 0 .../2CSClientWPF_sample/Dao/LayerD.cs | 0 .../2CSClientWPF_sample/MSGDefinition.xml | 0 .../Properties/AssemblyInfo.cs | 0 .../2CSClientWPF_sample/SPDefinition.xml | 0 .../2CSClientWPF_sample/SampleLogConf2CS.xml | 0 .../2CSClientWPF_sample/Window1.xaml | 0 .../2CSClientWPF_sample/Window1.xaml.cs | 0 .../2CS_sample/2CSClientWPF_sample/app.config | 77 + .../2CSClientWin_sample.csproj | 12 +- .../2CSClientWin_sample.sln | 7 +- .../2CSClientWin_sample/Business/LayerB.cs | 0 .../Common/TestParameterValue.cs | 0 .../Common/TestReturnValue.cs | 0 .../2CSClientWin_sample/Dao/DaoShippers.cs | 0 .../2CSClientWin_sample/Dao/LayerD.cs | 0 .../2CSClientWin_sample/Form1.Designer.cs | 0 .../2CS_sample/2CSClientWin_sample/Form1.cs | 0 .../2CS_sample/2CSClientWin_sample/Form1.resx | 0 .../2CSClientWin_sample/Login.Designer.cs | 0 .../2CS_sample/2CSClientWin_sample/Login.cs | 0 .../2CS_sample/2CSClientWin_sample/Login.resx | 0 .../2CSClientWin_sample/MSGDefinition.xml | 0 .../2CS_sample/2CSClientWin_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../2CSClientWin_sample/SPDefinition.xml | 0 .../2CSClientWin_sample/SampleLogConf2CS.xml | 0 .../2CSClientWin_sample/Splash.Designer.cs | 0 .../2CS_sample/2CSClientWin_sample/Splash.cs | 0 .../2CSClientWin_sample/Splash.resx | 0 .../2CS_sample/2CSClientWin_sample/app.config | 14 + .../AsyncEvent_sample/AsyncEvent_sample.sln | 31 + .../2CS_sample/AsyncEvent_sample/Readme.txt | 0 .../WindowsFormsApplication/Form1.Designer.cs | 0 .../WindowsFormsApplication/Form1.cs | 0 .../WindowsFormsApplication/Form1.resx | 0 .../WindowsFormsApplication/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../WindowsFormsApplication.csproj | 6 +- .../AsyncEvent_sample/WpfApplication/App.xaml | 0 .../WpfApplication/App.xaml.cs | 0 .../WpfApplication/Properties/AssemblyInfo.cs | 0 .../WpfApplication/Window1.xaml | 0 .../WpfApplication/Window1.xaml.cs | 0 .../WpfApplication/WpfApplication.csproj | 6 +- .../AsyncEvent_sample/test-winx2&wpfx2.bat | 0 .../2CS_sample/CustCtrl_sample/Bean.cs | 0 .../CustCtrl_sample/CustCtrl_sample.csproj | 4 +- .../CustCtrl_sample/CustCtrl_sample.sln | 25 + .../CustCtrl_sample/Form1.Designer.cs | 0 .../2CS_sample/CustCtrl_sample/Form1.cs | 0 .../2CS_sample/CustCtrl_sample/Form1.resx | 0 .../2CS_sample/CustCtrl_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../2CS_sample/CustCtrl_sample/Readme.txt | 0 .../Business/LayerB_BatUpd.cs | 0 .../Business/LayerB_Dynamic.cs | 0 .../Business/LayerB_Static.cs | 0 .../Common/TestParameterValue.cs | 0 .../Common/TestReturnValue.cs | 0 .../Dao/DaoCategories.cs | 0 .../Dao/DaoCategories_D1_Insert.xml | 0 .../Dao/DaoCategories_D2_Select.xml | 0 .../Dao/DaoCategories_D3_Update.xml | 0 .../Dao/DaoCategories_D4_Delete.xml | 0 .../Dao/DaoCategories_D5_SelCnt.xml | 0 .../Dao/DaoCategories_S1_Insert.sql | 0 .../Dao/DaoCategories_S2_Select.xml | 0 .../Dao/DaoCategories_S3_Update.xml | 0 .../Dao/DaoCategories_S4_Delete.xml | 0 .../GenDaoAndBatUpd_sample/Dao/DaoProducts.cs | 0 .../Dao/DaoProducts_D1_Insert.xml | 0 .../Dao/DaoProducts_D2_Select.xml | 0 .../Dao/DaoProducts_D3_Update.xml | 0 .../Dao/DaoProducts_D4_Delete.xml | 0 .../Dao/DaoProducts_D5_SelCnt.xml | 0 .../Dao/DaoProducts_S1_Insert.sql | 0 .../Dao/DaoProducts_S2_Select.xml | 0 .../Dao/DaoProducts_S3_Update.xml | 0 .../Dao/DaoProducts_S4_Delete.xml | 0 .../Dao/DaoSuppliers.cs | 0 .../Dao/DaoSuppliers_D1_Insert.xml | 0 .../Dao/DaoSuppliers_D2_Select.xml | 0 .../Dao/DaoSuppliers_D3_Update.xml | 0 .../Dao/DaoSuppliers_D4_Delete.xml | 0 .../Dao/DaoSuppliers_D5_SelCnt.xml | 0 .../Dao/DaoSuppliers_S1_Insert.sql | 0 .../Dao/DaoSuppliers_S2_Select.xml | 0 .../Dao/DaoSuppliers_S3_Update.xml | 0 .../Dao/DaoSuppliers_S4_Delete.xml | 0 .../GenDaoAndBatUpd_sample/Diagram.bmp | Bin .../GenDaoAndBatUpd_sample/Form1.Designer.cs | 0 .../GenDaoAndBatUpd_sample/Form1.cs | 0 .../GenDaoAndBatUpd_sample/Form1.resx | 0 .../GenDaoAndBatUpd_sample.csproj | 12 +- .../GenDaoAndBatUpd_sample.sln | 28 + .../GenDaoAndBatUpd_sample/MSGDefinition.xml | 0 .../GenDaoAndBatUpd_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.resx | 0 .../GenDaoAndBatUpd_sample/Readme.txt | 0 .../GenDaoAndBatUpd_sample/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../GenDaoAndBatUpd_sample/app.config | 59 + .../TimeStamp_sample/Dao/Daots_test_table1.cs | 0 .../Dao/Daots_test_table1_D1_Insert.xml | 0 .../Dao/Daots_test_table1_D2_Select.xml | 0 .../Dao/Daots_test_table1_D3_Update.xml | 0 .../Dao/Daots_test_table1_D4_Delete.xml | 0 .../Dao/Daots_test_table1_D5_SelCnt.xml | 0 .../Dao/Daots_test_table1_S1_Insert.sql | 0 .../Dao/Daots_test_table1_S2_Select.xml | 0 .../Dao/Daots_test_table1_S3_Update.xml | 0 .../Dao/Daots_test_table1_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_table2.cs | 0 .../Dao/Daots_test_table2_D1_Insert.xml | 0 .../Dao/Daots_test_table2_D2_Select.xml | 0 .../Dao/Daots_test_table2_D3_Update.xml | 0 .../Dao/Daots_test_table2_D4_Delete.xml | 0 .../Dao/Daots_test_table2_D5_SelCnt.xml | 0 .../Dao/Daots_test_table2_S1_Insert.sql | 0 .../Dao/Daots_test_table2_S2_Select.xml | 0 .../Dao/Daots_test_table2_S3_Update.xml | 0 .../Dao/Daots_test_table2_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_table3.cs | 0 .../Dao/Daots_test_table3_D1_Insert.xml | 0 .../Dao/Daots_test_table3_D2_Select.xml | 0 .../Dao/Daots_test_table3_D3_Update.xml | 0 .../Dao/Daots_test_table3_D4_Delete.xml | 0 .../Dao/Daots_test_table3_D5_SelCnt.xml | 0 .../Dao/Daots_test_table3_S1_Insert.sql | 0 .../Dao/Daots_test_table3_S2_Select.xml | 0 .../Dao/Daots_test_table3_S3_Update.xml | 0 .../Dao/Daots_test_table3_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_tableA.cs | 0 .../Dao/Daots_test_tableA_D1_Insert.xml | 0 .../Dao/Daots_test_tableA_D2_Select.xml | 0 .../Dao/Daots_test_tableA_D3_Update.xml | 0 .../Dao/Daots_test_tableA_D4_Delete.xml | 0 .../Dao/Daots_test_tableA_D5_SelCnt.xml | 0 .../Dao/Daots_test_tableA_S1_Insert.sql | 0 .../Dao/Daots_test_tableA_S2_Select.xml | 0 .../Dao/Daots_test_tableA_S3_Update.xml | 0 .../Dao/Daots_test_tableA_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_tableB.cs | 0 .../Dao/Daots_test_tableB_D1_Insert.xml | 0 .../Dao/Daots_test_tableB_D2_Select.xml | 0 .../Dao/Daots_test_tableB_D3_Update.xml | 0 .../Dao/Daots_test_tableB_D4_Delete.xml | 0 .../Dao/Daots_test_tableB_D5_SelCnt.xml | 0 .../Dao/Daots_test_tableB_S1_Insert.sql | 0 .../Dao/Daots_test_tableB_S2_Select.xml | 0 .../Dao/Daots_test_tableB_S3_Update.xml | 0 .../Dao/Daots_test_tableB_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_tableC.cs | 0 .../Dao/Daots_test_tableC_D1_Insert.xml | 0 .../Dao/Daots_test_tableC_D2_Select.xml | 0 .../Dao/Daots_test_tableC_D3_Update.xml | 0 .../Dao/Daots_test_tableC_D4_Delete.xml | 0 .../Dao/Daots_test_tableC_D5_SelCnt.xml | 0 .../Dao/Daots_test_tableC_S1_Insert.sql | 0 .../Dao/Daots_test_tableC_S2_Select.xml | 0 .../Dao/Daots_test_tableC_S3_Update.xml | 0 .../Dao/Daots_test_tableC_S4_Delete.xml | 0 .../TimeStamp_sample/Form1.Designer.cs | 0 .../2CS_sample/TimeStamp_sample/Form1.cs | 0 .../2CS_sample/TimeStamp_sample/Form1.resx | 0 .../TimeStamp_sample/MSGDefinition.xml | 0 .../2CS_sample/TimeStamp_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../2CS_sample/TimeStamp_sample/Readme.txt | 0 .../TimeStamp_sample/SPDefinition.xml | 0 .../TimeStamp_sample/SampleLogConf2CS.xml | 0 .../TimeStamp_sample/TimeStamp_sample.csproj | 8 +- .../TimeStamp_sample/TimeStamp_sample.sln | 7 +- .../2CS_sample/TimeStamp_sample/app.config | 36 +- .../RerunnableBatch_sample/Business/LayerB.cs | 0 .../RerunnableBatch_sample/CREATE ORDERS2.sql | 0 .../ExecuteBatchProcessParameterValue.cs | 0 .../Common/SelectPkListReturnValue.cs | 0 .../Common/VoidParameterValue.cs | 0 .../Common/VoidReturnValue.cs | 0 .../RerunnableBatch_sample/Dao/DaoOrders2.cs | 0 .../Dao/DaoOrders2_D1_Insert.xml | 0 .../Dao/DaoOrders2_D2_Select.xml | 0 .../Dao/DaoOrders2_D3_Update.xml | 0 .../Dao/DaoOrders2_D4_Delete.xml | 0 .../Dao/DaoOrders2_D5_SelCnt.xml | 0 .../Dao/DaoOrders2_S1_Insert.sql | 0 .../Dao/DaoOrders2_S2_Select.xml | 0 .../Dao/DaoOrders2_S3_Update.xml | 0 .../Dao/DaoOrders2_S4_Delete.xml | 0 .../Dao/SelectAllOrderID.xml | 0 .../Dao/SelectInOrderID.xml | 0 .../RerunnableBatch_sample/MSGDefinition.xml | 0 .../RerunnableBatch_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RerunnableBatch_sample.csproj | 8 +- .../RerunnableBatch_sample.sln | 7 +- .../RerunnableBatch_sample/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../RerunnableBatch_sample/app.config | 78 + .../RerunnableBatch_sample/readme.txt | 0 .../Business/LayerB.cs | 0 .../CREATE ORDERS2.sql | 0 .../ExecuteBatchProcessParameterValue.cs | 0 .../Common/SelectPkListReturnValue.cs | 0 .../Common/VoidParameterValue.cs | 0 .../Common/VoidReturnValue.cs | 0 .../RerunnableBatch_sample2/Dao/DaoOrders2.cs | 0 .../Dao/DaoOrders2_D1_Insert.xml | 0 .../Dao/DaoOrders2_D2_Select.xml | 0 .../Dao/DaoOrders2_D3_Update.xml | 0 .../Dao/DaoOrders2_D4_Delete.xml | 0 .../Dao/DaoOrders2_D5_SelCnt.xml | 0 .../Dao/DaoOrders2_S1_Insert.sql | 0 .../Dao/DaoOrders2_S2_Select.xml | 0 .../Dao/DaoOrders2_S3_Update.xml | 0 .../Dao/DaoOrders2_S4_Delete.xml | 0 .../Dao/SelectAllOrderID.xml | 0 .../Dao/SelectInOrderID.xml | 0 .../RerunnableBatch_sample2/MSGDefinition.xml | 0 .../RerunnableBatch_sample2/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RerunnableBatch_sample2.csproj | 8 +- .../RerunnableBatch_sample2.sln | 7 +- .../RerunnableBatch_sample2/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../RerunnableBatch_sample2/app.config | 78 + .../RerunnableBatch_sample2/readme.txt | 0 .../Business/LayerB.cs | 0 .../CREATE ORDERS2.sql | 0 .../ExecuteBatchProcessParameterValue.cs | 0 .../Common/SelectPkListReturnValue.cs | 0 .../Common/VoidParameterValue.cs | 0 .../Common/VoidReturnValue.cs | 0 .../RerunnableBatch_sample3/Dao/DaoOrders2.cs | 0 .../Dao/DaoOrders2_D1_Insert.xml | 0 .../Dao/DaoOrders2_D2_Select.xml | 0 .../Dao/DaoOrders2_D3_Update.xml | 0 .../Dao/DaoOrders2_D4_Delete.xml | 0 .../Dao/DaoOrders2_D5_SelCnt.xml | 0 .../Dao/DaoOrders2_S1_Insert.sql | 0 .../Dao/DaoOrders2_S2_Select.xml | 0 .../Dao/DaoOrders2_S3_Update.xml | 0 .../Dao/DaoOrders2_S4_Delete.xml | 0 .../Dao/SelectAllOrderID.xml | 0 .../Dao/SelectInOrderID.xml | 0 .../RerunnableBatch_sample3/MSGDefinition.xml | 0 .../RerunnableBatch_sample3/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RerunnableBatch_sample3.csproj | 8 +- .../RerunnableBatch_sample3.sln | 7 +- .../RerunnableBatch_sample3/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../RerunnableBatch_sample3/app.config | 78 + .../RerunnableBatch_sample3/readme.txt | 0 .../SimpleBatch_sample/Business/LayerB.cs | 0 .../Common/TestParameterValue.cs | 0 .../Common/TestReturnValue.cs | 0 .../SimpleBatch_sample/Dao/DaoShippers.cs | 0 .../SimpleBatch_sample/Dao/LayerD.cs | 0 .../SimpleBatch_sample/MSGDefinition.xml | 0 .../Bat_sample/SimpleBatch_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../SimpleBatch_sample/SPDefinition.xml | 0 .../SimpleBatch_sample/SampleLogConf2CS.xml | 0 .../SimpleBatch_sample.csproj | 8 +- .../SimpleBatch_sample/SimpleBatch_sample.sln | 7 +- .../Bat_sample/SimpleBatch_sample}/app.config | 19 +- .../Bat_sample/SimpleBatch_sample/readme.txt | 0 .../WS_sample/ASPNETWebService/README.md | 4 + .../WSClientWPF_sample/App.xaml | 0 .../WSClientWPF_sample/App.xaml.cs | 0 .../WSClientWPF_sample/AsyncFunc.cs | 0 .../WSClientWPF_sample/MSGDefinition.xml | 0 .../Properties/AssemblyInfo.cs | 0 .../WSClientWPF_sample/SPDefinition.xml | 0 .../WSClientWPF_sample/SampleLogConf2CS.xml | 0 .../TMInProcessDefinition.xml | 0 .../TMProtocolDefinition.xml | 0 .../TMProtocolDefinition2.xml | 0 .../WSClientWPF_sample.csproj | 12 +- .../WSClientWPF_sample/WSClientWPF_sample.sln | 7 +- .../WSClientWPF_sample/Window0.xaml | 0 .../WSClientWPF_sample/Window0.xaml.cs | 0 .../WSClientWPF_sample/Window1.xaml | 0 .../WSClientWPF_sample/Window1.xaml.cs | 0 .../WSClientWPF_sample/app.config | 0 .../WSClientWin2_sample/ByReturn.Designer.cs | 0 .../WSClientWin2_sample/ByReturn.cs | 0 .../WSClientWin2_sample/ByReturn.resx | 0 .../WSClientWin2_sample/Form0.Designer.cs | 0 .../WSClientWin2_sample/Form0.cs | 0 .../WSClientWin2_sample/Form0.resx | 0 .../WSClientWin2_sample/Form1.Designer.cs | 0 .../WSClientWin2_sample/Form1.cs | 0 .../WSClientWin2_sample/Form1.resx | 0 .../WSClientWin2_sample/Form2.Designer.cs | 0 .../WSClientWin2_sample/Form2.cs | 0 .../WSClientWin2_sample/Form2.resx | 0 .../WSClientWin2_sample/Form3.Designer.cs | 0 .../WSClientWin2_sample/Form3.cs | 0 .../WSClientWin2_sample/Form3.resx | 0 .../WSClientWin2_sample/Login.Designer.cs | 0 .../WSClientWin2_sample/Login.cs | 0 .../WSClientWin2_sample/Login.resx | 0 .../WSClientWin2_sample/MSGDefinition.xml | 0 .../WSClientWin2_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../WSClientWin2_sample/SPDefinition.xml | 0 .../WSClientWin2_sample/SampleLogConf2CS.xml | 0 .../WSClientWin2_sample/Splash.Designer.cs | 0 .../WSClientWin2_sample/Splash.cs | 0 .../WSClientWin2_sample/Splash.resx | 0 .../UserControl3.Designer.cs | 0 .../WSClientWin2_sample/UserControl3.cs | 0 .../WSClientWin2_sample/UserControl3.resx | 0 .../UserControlChild.Designer.cs | 0 .../WSClientWin2_sample/UserControlChild.cs | 0 .../WSClientWin2_sample/UserControlChild.resx | 0 .../UserControlParent.Designer.cs | 0 .../WSClientWin2_sample/UserControlParent.cs | 0 .../UserControlParent.resx | 0 .../WSClientWin2_sample.csproj | 12 +- .../WSClientWin2_sample.sln | 38 + .../WSClientWin2_sample/app.config | 0 .../WSClientWinCone_sample/AsyncFunc.cs | 0 .../WSClientWinCone_sample/Form1.Designer.cs | 0 .../WSClientWinCone_sample/Form1.cs | 0 .../WSClientWinCone_sample/Form1.resx | 0 .../WSClientWinCone_sample/Login.Designer.cs | 0 .../WSClientWinCone_sample/Login.cs | 0 .../WSClientWinCone_sample/Login.resx | 0 .../WSClientWinCone_sample/MSGDefinition.xml | 0 .../WSClientWinCone_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/app.manifest | 0 .../WSClientWinCone_sample/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../WSClientWinCone_sample/Splash.Designer.cs | 0 .../WSClientWinCone_sample/Splash.cs | 0 .../WSClientWinCone_sample/Splash.resx | 0 .../TMProtocolDefinition.xml | 0 .../TMProtocolDefinition2.xml | 0 .../WSClientWinCone_sample.csproj | 12 +- .../WSClientWinCone_sample.sln | 7 +- .../WSClientWinCone_sample/app.config | 0 .../WSClientWinCone_sample/packages.config | 8 +- .../WSClientWin_sample/AsyncFunc.cs | 0 .../WSClientWin_sample/Blue hills.jpg | Bin .../WSClientWin_sample/Form1.Designer.cs | 0 .../WSClientWin_sample/Form1.cs | 0 .../WSClientWin_sample/Form1.resx | 0 .../WSClientWin_sample/Login.Designer.cs | 0 .../WSClientWin_sample/Login.cs | 0 .../WSClientWin_sample/Login.resx | 0 .../WSClientWin_sample/MSGDefinition.xml | 0 .../WSClientWin_sample/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../WSClientWin_sample/SPDefinition.xml | 0 .../WSClientWin_sample/SampleLogConf2CS.xml | 0 .../WSClientWin_sample/Splash.Designer.cs | 0 .../WSClientWin_sample/Splash.cs | 0 .../WSClientWin_sample/Splash.resx | 0 .../TMInProcessDefinition.xml | 0 .../TMProtocolDefinition.xml | 0 .../TMProtocolDefinition2.xml | 0 .../WSClientWin_sample.csproj | 12 +- .../WSClientWin_sample/WSClientWin_sample.sln | 7 +- .../WSClientWin_sample/app.config | 0 .../WSClientWin_sample/packages.config | 8 +- .../Properties/AssemblyInfo.cs | 0 .../WSIFType_sample/TestParameterValue.cs | 0 .../WSIFType_sample/TestReturnValue.cs | 0 .../WSIFType_sample/WSIFType_sample.csproj | 6 +- .../WSServer_sample/Business/LayerB.cs | 0 .../WSServer_sample/Common/Shipper.cs | 0 .../WSServer_sample/Common/WebApiParams.cs | 0 .../WSServer_sample/Dao/DaoShippers.cs | 0 .../WS_sample/WSServer_sample/Dao/LayerD.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../WSServer_sample/WSServer_sample.csproj | 8 +- .../WSServer_sample/WSServer_sample.sln | 7 +- .../WebApp_sample/MVC_Sample/MVC_Sample.sln | 7 +- .../MVC_Sample/App_Start/BundleConfig.cs | 0 .../MVC_Sample/App_Start/FilterConfig.cs | 0 .../MVC_Sample/App_Start/RouteConfig.cs | 0 .../MVC_Sample/App_Start/WebApiConfig.cs | 0 .../MVC_Sample/Content/app/Site.css | 0 .../MVC_Sample/Content/bootstrap-grid.css | 0 .../MVC_Sample/Content/bootstrap-grid.css.map | 0 .../MVC_Sample/Content/bootstrap-grid.min.css | 0 .../Content/bootstrap-grid.min.css.map | 0 .../MVC_Sample/Content/bootstrap-reboot.css | 0 .../Content/bootstrap-reboot.css.map | 0 .../Content/bootstrap-reboot.min.css | 0 .../Content/bootstrap-reboot.min.css.map | 0 .../MVC_Sample/Content/bootstrap.css | 0 .../MVC_Sample/Content/bootstrap.css.map | 0 .../MVC_Sample/Content/bootstrap.min.css | 0 .../MVC_Sample/Content/bootstrap.min.css.map | 0 .../MVC_Sample/Content/font-awesome.css | 0 .../MVC_Sample/Content/font-awesome.min.css | 0 .../MVC_Sample/Content/touryo/Style.css | 0 .../MVC_Sample/Controllers/Crud1Controller.cs | 0 .../MVC_Sample/Controllers/Crud2Controller.cs | 0 .../MVC_Sample/Controllers/ErrorController.cs | 0 .../MVC_Sample/Controllers/HomeController.cs | 0 .../MVC_Sample/Controllers/PingController.cs | 0 .../MVC_Sample/MVC_Sample/Global.asax | 0 .../MVC_Sample/MVC_Sample/Global.asax.cs | 0 .../MVC_Sample/MVC_Sample/Index.html | 0 .../MVC_Sample/Logic/Business/LayerB.cs | 0 .../Logic/Common/TestParameterValue.cs | 0 .../Logic/Common/TestReturnValue.cs | 0 .../MVC_Sample/Logic/Dao/DaoShippers.cs | 0 .../MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs | 0 .../MVC_Sample/MVC_Sample/MVC_Sample.csproj | 18 +- .../Models/ViewModels/BaseViewModel.cs | 0 .../Models/ViewModels/CrudViweModel.cs | 0 .../Models/ViewModels/LoginViewModel.cs | 0 .../Models/ViewModels/ShipperViweModel.cs | 0 .../Models/ViewModels/TestShipperViweModel.cs | 0 .../MVC_Sample/Properties/AssemblyInfo.cs | 0 .../MVC_Sample/MVC_Sample/Scripts/README.md | 0 .../MVC_Sample/MVC_Sample/Scripts/app/Site.js | 0 .../MVC_Sample/Scripts/bootstrap.bundle.js | 0 .../Scripts/bootstrap.bundle.js.map | 0 .../Scripts/bootstrap.bundle.min.js | 0 .../Scripts/bootstrap.bundle.min.js.map | 0 .../MVC_Sample/Scripts/bootstrap.js | 0 .../MVC_Sample/Scripts/bootstrap.js.map | 0 .../MVC_Sample/Scripts/bootstrap.min.js | 0 .../MVC_Sample/Scripts/bootstrap.min.js.map | 0 .../MVC_Sample/Scripts/esm/popper-utils.js | 0 .../Scripts/esm/popper-utils.js.map | 0 .../Scripts/esm/popper-utils.min.js | 0 .../Scripts/esm/popper-utils.min.js.map | 0 .../MVC_Sample/Scripts/esm/popper.js | 0 .../MVC_Sample/Scripts/esm/popper.js.map | 0 .../MVC_Sample/Scripts/esm/popper.min.js | 0 .../MVC_Sample/Scripts/esm/popper.min.js.map | 0 .../MVC_Sample/MVC_Sample/Scripts/index.d.ts | 0 .../Scripts/jquery-3.4.1.intellisense.js | 0 .../MVC_Sample/Scripts/jquery-3.4.1.js | 0 .../MVC_Sample/Scripts/jquery-3.4.1.min.js | 0 .../MVC_Sample/Scripts/jquery-3.4.1.min.map | 0 .../MVC_Sample/Scripts/jquery-3.4.1.slim.js | 0 .../Scripts/jquery-3.4.1.slim.min.js | 0 .../Scripts/jquery-3.4.1.slim.min.map | 0 .../Scripts/jquery.unobtrusive-ajax.js | 0 .../Scripts/jquery.unobtrusive-ajax.min.js | 0 .../Scripts/jquery.validate-vsdoc.js | 0 .../MVC_Sample/Scripts/jquery.validate.js | 0 .../MVC_Sample/Scripts/jquery.validate.min.js | 0 .../Scripts/jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../MVC_Sample/Scripts/modernizr-2.8.3.js | 0 .../MVC_Sample/Scripts/popper-utils.js | 0 .../MVC_Sample/Scripts/popper-utils.js.map | 0 .../MVC_Sample/Scripts/popper-utils.min.js | 0 .../Scripts/popper-utils.min.js.map | 0 .../MVC_Sample/MVC_Sample/Scripts/popper.js | 0 .../MVC_Sample/Scripts/popper.js.map | 0 .../MVC_Sample/Scripts/popper.min.js | 0 .../MVC_Sample/Scripts/popper.min.js.map | 0 .../MVC_Sample/MVC_Sample/Scripts/respond.js | 0 .../Scripts/respond.matchmedia.addListener.js | 0 .../respond.matchmedia.addListener.min.js | 0 .../MVC_Sample/Scripts/respond.min.js | 0 .../MVC_Sample/Scripts/touryo/common.js | 0 .../MVC_Sample/Scripts/touryo/else.js | 0 .../MVC_Sample/Scripts/umd/popper-utils.js | 0 .../Scripts/umd/popper-utils.js.map | 0 .../Scripts/umd/popper-utils.min.js | 0 .../Scripts/umd/popper-utils.min.js.map | 0 .../MVC_Sample/Scripts/umd/popper.js | 0 .../MVC_Sample/Scripts/umd/popper.js.map | 0 .../MVC_Sample/Scripts/umd/popper.min.js | 0 .../MVC_Sample/Scripts/umd/popper.min.js.map | 0 .../MVC_Sample/MVC_Sample/Startup.cs | 0 .../MVC_Sample/Views/Crud1/Index.cshtml | 0 .../MVC_Sample/Views/Crud1/_ChartView.cshtml | 0 .../Views/Crud1/_MessageView.cshtml | 0 .../MVC_Sample/Views/Crud2/Index.cshtml | 0 .../MVC_Sample/Views/Crud2/_ChartView.cshtml | 0 .../Views/Crud2/_MessageView.cshtml | 0 .../MVC_Sample/Views/Error/Index.cshtml | 0 .../MVC_Sample/Views/Home/Index.cshtml | 0 .../MVC_Sample/Views/Home/Login.cshtml | 0 .../MVC_Sample/Views/Home/Scroll.cshtml | 0 .../MVC_Sample/Views/Shared/Error.cshtml | 0 .../MVC_Sample/Views/Shared/_Layout.cshtml | 0 .../MVC_Sample/MVC_Sample/Views/Web.config | 0 .../MVC_Sample/Views/_ViewStart.cshtml | 0 .../MVC_Sample/MVC_Sample/Web.Debug.config | 0 .../MVC_Sample/MVC_Sample/Web.Release.config | 0 .../MVC_Sample/MVC_Sample/Web.config | 8 +- .../MVC_Sample/MVC_Sample/app.config | 0 .../MVC_Sample/fonts/FontAwesome.otf | Bin .../MVC_Sample/fonts/fontawesome-webfont.eot | Bin .../MVC_Sample/fonts/fontawesome-webfont.svg | 0 .../MVC_Sample/fonts/fontawesome-webfont.ttf | Bin .../MVC_Sample/fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../MVC_Sample/images/touryo/loading.gif | Bin .../MVC_Sample/images/touryo/logo.png | Bin .../MVC_Sample/MVC_Sample/packages.config | 76 +- .../WebApp_sample/MVC_Sample/Readme.txt | 0 .../WebForms_Sample/WebForms_Sample.sln | 7 +- .../3TierTableAdapter/ProductsTableAdapter.cs | 0 .../AppCode/sample/Business/GetMasterData.cs | 0 .../AppCode/sample/Business/LayerB.cs | 0 .../sample/Common/TestParameterValue.cs | 0 .../AppCode/sample/Common/TestReturnValue.cs | 0 .../AppCode/sample/Dao/DaoCategories.cs | 0 .../AppCode/sample/Dao/DaoShippers.cs | 0 .../AppCode/sample/Dao/DaoSuppliers.cs | 0 .../AppCode/sample/Dao/LayerD.cs | 0 .../AppCode/testPublic/Business/TestMTC.cs | 0 .../testPublic/Business/TestMTC_mcn.cs | 0 .../testPublic/Business/TestMTC_txg.cs | 0 .../WebForms_Sample/App_Start/BundleConfig.cs | 0 .../WebForms_Sample/App_Start/RouteConfig.cs | 0 .../Aspx/Common/ErrorScreen.aspx | 0 .../Aspx/Common/ErrorScreen.aspx.cs | 0 .../Aspx/Common/ErrorScreen.aspx.designer.cs | 0 .../Aspx/Common/Master/sampleScreen.master | 0 .../Aspx/Common/Master/sampleScreen.master.cs | 0 .../Master/sampleScreen.master.designer.cs | 0 .../testAspNetAjaxExtension_Separate.master | 0 ...testAspNetAjaxExtension_Separate.master.cs | 0 ...tAjaxExtension_Separate.master.designer.cs | 0 .../testAspNetAjaxExtension_Single.master | 0 .../testAspNetAjaxExtension_Single.master.cs | 0 ...NetAjaxExtension_Single.master.designer.cs | 0 .../Aspx/Common/Master/testBlankScreen.master | 0 .../Common/Master/testBlankScreen.master.cs | 0 .../Master/testBlankScreen.master.designer.cs | 0 .../Common/Master/testBlankScreenNoJs.master | 0 .../Master/testBlankScreenNoJs.master.cs | 0 .../testBlankScreenNoJs.master.designer.cs | 0 .../Common/Master/testClientCallback.master | 0 .../Master/testClientCallback.master.cs | 0 .../testClientCallback.master.designer.cs | 0 .../Master/testNest/branchMasterPage1.master | 0 .../testNest/branchMasterPage1.master.cs | 0 .../branchMasterPage1.master.designer.cs | 0 .../Master/testNest/branchMasterPage2.master | 0 .../testNest/branchMasterPage2.master.cs | 0 .../branchMasterPage2.master.designer.cs | 0 .../Master/testNest/noBaseMasterPage.master | 0 .../testNest/noBaseMasterPage.master.cs | 0 .../noBaseMasterPage.master.designer.cs | 0 .../Master/testNest/rootMasterPage.master | 0 .../Master/testNest/rootMasterPage.master.cs | 0 .../rootMasterPage.master.designer.cs | 0 .../Master/testNest/testScreen1bmp1.master | 0 .../Master/testNest/testScreen1bmp1.master.cs | 0 .../testScreen1bmp1.master.designer.cs | 0 .../Master/testNest/testScreen1bmp2.master | 0 .../Master/testNest/testScreen1bmp2.master.cs | 0 .../testScreen1bmp2.master.designer.cs | 0 .../Master/testNest/testScreen2bmp1.master | 0 .../Master/testNest/testScreen2bmp1.master.cs | 0 .../testScreen2bmp1.master.designer.cs | 0 .../Master/testNest/testScreen2bmp2.master | 0 .../Master/testNest/testScreen2bmp2.master.cs | 0 .../testScreen2bmp2.master.designer.cs | 0 .../Aspx/Common/Master/testScreen1.master | 0 .../Aspx/Common/Master/testScreen1.master.cs | 0 .../Master/testScreen1.master.designer.cs | 0 .../Aspx/Common/Master/testScreen2.master | 0 .../Aspx/Common/Master/testScreen2.master.cs | 0 .../Master/testScreen2.master.designer.cs | 0 .../Aspx/Common/Master/testScreenCtrl.master | 0 .../Common/Master/testScreenCtrl.master.cs | 0 .../Master/testScreenCtrl.master.designer.cs | 0 .../Aspx/Common/Wuc/sampleChildControl.ascx | 0 .../Common/Wuc/sampleChildControl.ascx.cs | 0 .../Wuc/sampleChildControl.ascx.designer.cs | 0 .../Aspx/Common/Wuc/sampleControl.ascx | 0 .../Aspx/Common/Wuc/sampleControl.ascx.cs | 0 .../Common/Wuc/sampleControl.ascx.designer.cs | 0 .../Aspx/Framework/DialogFrame.htm | 0 .../Aspx/Framework/DialogLoader.htm | 0 .../WebForms_Sample/Aspx/Framework/Ping.aspx | 0 .../Aspx/Framework/Ping.aspx.cs | 0 .../Aspx/Framework/Ping.aspx.designer.cs | 0 .../Aspx/Framework/myOKMessageDialog.aspx | 0 .../Aspx/Framework/myOKMessageDialog.aspx.cs | 0 .../myOKMessageDialog.aspx.designer.cs | 0 .../Aspx/Framework/myYesNoMessageDialog.aspx | 0 .../Framework/myYesNoMessageDialog.aspx.cs | 0 .../myYesNoMessageDialog.aspx.designer.cs | 0 .../OAuth2AuthorizationCodeGrantClient.aspx | 0 ...OAuth2AuthorizationCodeGrantClient.aspx.cs | 0 ...horizationCodeGrantClient.aspx.designer.cs | 0 .../3Tier/ProductsConditionalSearch.aspx | 0 .../3Tier/ProductsConditionalSearch.aspx.cs | 0 ...ProductsConditionalSearch.aspx.designer.cs | 0 .../Aspx/sample/3Tier/ProductsDetail.aspx | 0 .../Aspx/sample/3Tier/ProductsDetail.aspx.cs | 0 .../3Tier/ProductsDetail.aspx.designer.cs | 0 .../sample/3Tier/ProductsSearchAndUpdate.aspx | 0 .../3Tier/ProductsSearchAndUpdate.aspx.cs | 0 .../ProductsSearchAndUpdate.aspx.designer.cs | 0 .../Aspx/sample/crud/sampleScreen.aspx | 0 .../Aspx/sample/crud/sampleScreen.aspx.cs | 0 .../sample/crud/sampleScreen.aspx.designer.cs | 0 .../Aspx/sample/crud/sampleScreen_cc.aspx | 0 .../Aspx/sample/crud/sampleScreen_cc.aspx.cs | 0 .../crud/sampleScreen_cc.aspx.designer.cs | 0 .../WebForms_Sample/Aspx/start/login.aspx | 0 .../WebForms_Sample/Aspx/start/login.aspx.cs | 0 .../Aspx/start/login.aspx.designer.cs | 0 .../WebForms_Sample/Aspx/start/logout.aspx | 0 .../WebForms_Sample/Aspx/start/logout.aspx.cs | 0 .../Aspx/start/logout.aspx.designer.cs | 0 .../WebForms_Sample/Aspx/start/menu.aspx | 0 .../WebForms_Sample/Aspx/start/menu.aspx.cs | 0 .../Aspx/start/menu.aspx.designer.cs | 0 .../nest/testNestMasterScreen.aspx | 0 .../nest/testNestMasterScreen.aspx.cs | 0 .../testNestMasterScreen.aspx.designer.cs | 0 .../testFxLayerP/nest/testScreen1nest.aspx | 0 .../testFxLayerP/nest/testScreen1nest.aspx.cs | 0 .../nest/testScreen1nest.aspx.designer.cs | 0 .../testFxLayerP/nest/testScreen2nest.aspx | 0 .../testFxLayerP/nest/testScreen2nest.aspx.cs | 0 .../nest/testScreen2nest.aspx.designer.cs | 0 .../normal/noBaseMasterScreen.aspx | 0 .../normal/noBaseMasterScreen.aspx.cs | 0 .../noBaseMasterScreen.aspx.designer.cs | 0 .../testFxLayerP/normal/noMasterScreen.aspx | 0 .../normal/noMasterScreen.aspx.cs | 0 .../normal/noMasterScreen.aspx.designer.cs | 0 .../Aspx/testFxLayerP/normal/testScreen0.aspx | 0 .../testFxLayerP/normal/testScreen0.aspx.cs | 0 .../normal/testScreen0.aspx.designer.cs | 0 .../Aspx/testFxLayerP/normal/testScreen1.aspx | 0 .../testFxLayerP/normal/testScreen1.aspx.cs | 0 .../normal/testScreen1.aspx.designer.cs | 0 .../Aspx/testFxLayerP/normal/testScreen2.aspx | 0 .../testFxLayerP/normal/testScreen2.aspx.cs | 0 .../normal/testScreen2.aspx.designer.cs | 0 .../Aspx/testFxLayerP/table/testGridView.aspx | 0 .../testFxLayerP/table/testGridView.aspx.cs | 0 .../table/testGridView.aspx.designer.cs | 0 .../testFxLayerP/table/testJQGridJson.aspx | 0 .../testFxLayerP/table/testJQGridJson.aspx.cs | 0 .../table/testJQGridJson.aspx.designer.cs | 0 .../Aspx/testFxLayerP/table/testListView.aspx | 0 .../testFxLayerP/table/testListView.aspx.cs | 0 .../table/testListView.aspx.designer.cs | 0 .../Aspx/testFxLayerP/table/testRepeater.aspx | 0 .../testFxLayerP/table/testRepeater.aspx.cs | 0 .../table/testRepeater.aspx.designer.cs | 0 .../Aspx/testFxLayerP/testDLFrame.aspx | 0 .../Aspx/testFxLayerP/testDLFrame.aspx.cs | 0 .../testFxLayerP/testDLFrame.aspx.designer.cs | 0 .../Aspx/testFxLayerP/testDLScreen.aspx | 0 .../Aspx/testFxLayerP/testDLScreen.aspx.cs | 0 .../testDLScreen.aspx.designer.cs | 0 .../Aspx/testFxLayerP/testDialogAtOnLoad.aspx | 0 .../testFxLayerP/testDialogAtOnLoad.aspx.cs | 0 .../testDialogAtOnLoad.aspx.designer.cs | 0 .../testTransitionAheadScreen.aspx | 0 .../testTransitionAheadScreen.aspx.cs | 0 ...testTransitionAheadScreen.aspx.designer.cs | 0 .../Aspx/testFxLayerP/wcc/testWCTextBox.aspx | 0 .../testFxLayerP/wcc/testWCTextBox.aspx.cs | 0 .../wcc/testWCTextBox.aspx.designer.cs | 0 .../withAjax/testClientCallback.aspx | 0 .../withAjax/testClientCallback.aspx.cs | 0 .../testClientCallback.aspx.designer.cs | 0 .../withAjax/testExtension_Separate.aspx | 0 .../withAjax/testExtension_Separate.aspx.cs | 0 .../testExtension_Separate.aspx.designer.cs | 0 .../withAjax/testExtension_Single.aspx | 0 .../withAjax/testExtension_Single.aspx.cs | 0 .../testExtension_Single.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/Google.PNG | Bin .../Aspx/testScreenCtrl/WebForm0.aspx | 0 .../Aspx/testScreenCtrl/WebForm0.aspx.cs | 0 .../testScreenCtrl/WebForm0.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/WebForm1.aspx | 0 .../Aspx/testScreenCtrl/WebForm1.aspx.cs | 0 .../testScreenCtrl/WebForm1.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/WebForm2.aspx | 0 .../Aspx/testScreenCtrl/WebForm2.aspx.cs | 0 .../testScreenCtrl/WebForm2.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/WebForm3.aspx | 0 .../Aspx/testScreenCtrl/WebForm3.aspx.cs | 0 .../testScreenCtrl/WebForm3.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/WebForm4.aspx | 0 .../Aspx/testScreenCtrl/WebForm4.aspx.cs | 0 .../testScreenCtrl/WebForm4.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/WebForm5.aspx | 0 .../Aspx/testScreenCtrl/WebForm5.aspx.cs | 0 .../testScreenCtrl/WebForm5.aspx.designer.cs | 0 .../Aspx/testScreenCtrl/sc1.PNG | Bin .../Aspx/testScreenCtrl/sc2.PNG | Bin .../Aspx/testScreenCtrl/sc3.PNG | Bin .../Aspx/testScreenCtrl/sc4.PNG | Bin .../Aspx/testScreenCtrl/sc5.PNG | Bin .../WebForms_Sample/Bundle.config | 0 .../WebForms_Sample/Content/app/Site.css | 0 .../Content/bootstrap-grid.css | 0 .../Content/bootstrap-grid.css.map | 0 .../Content/bootstrap-grid.min.css | 0 .../Content/bootstrap-grid.min.css.map | 0 .../Content/bootstrap-reboot.css | 0 .../Content/bootstrap-reboot.css.map | 0 .../Content/bootstrap-reboot.min.css | 0 .../Content/bootstrap-reboot.min.css.map | 0 .../WebForms_Sample/Content/bootstrap.css | 0 .../WebForms_Sample/Content/bootstrap.css.map | 0 .../WebForms_Sample/Content/bootstrap.min.css | 0 .../Content/bootstrap.min.css.map | 0 .../WebForms_Sample/Content/font-awesome.css | 0 .../Content/font-awesome.min.css | 0 .../WebForms_Sample/Content/touryo/Style.css | 0 .../WebForms_Sample/Global.asax | 0 .../WebForms_Sample/Global.asax.cs | 0 .../WebForms_Sample/Index.html | 0 .../Properties/AssemblyInfo.cs | 0 .../WebForms_Sample/Scripts/README.md | 0 .../Scripts/WebForms/DetailsView.js | 0 .../WebForms_Sample/Scripts/WebForms/Focus.js | 0 .../Scripts/WebForms/GridView.js | 0 .../Scripts/WebForms/MSAjax/MicrosoftAjax.js | 0 .../MicrosoftAjaxApplicationServices.js | 0 .../MSAjax/MicrosoftAjaxComponentModel.js | 0 .../WebForms/MSAjax/MicrosoftAjaxCore.js | 0 .../MSAjax/MicrosoftAjaxGlobalization.js | 0 .../WebForms/MSAjax/MicrosoftAjaxHistory.js | 0 .../WebForms/MSAjax/MicrosoftAjaxNetwork.js | 0 .../MSAjax/MicrosoftAjaxSerialization.js | 0 .../WebForms/MSAjax/MicrosoftAjaxTimer.js | 0 .../WebForms/MSAjax/MicrosoftAjaxWebForms.js | 0 .../MSAjax/MicrosoftAjaxWebServices.js | 0 .../WebForms_Sample/Scripts/WebForms/Menu.js | 0 .../Scripts/WebForms/MenuStandards.js | 0 .../Scripts/WebForms/SmartNav.js | 0 .../Scripts/WebForms/TreeView.js | 0 .../Scripts/WebForms/WebForms.js | 0 .../Scripts/WebForms/WebParts.js | 0 .../Scripts/WebForms/WebUIValidation.js | 0 .../WebForms_Sample/Scripts/app/Site.js | 0 .../Scripts/bootstrap.bundle.js | 0 .../Scripts/bootstrap.bundle.js.map | 0 .../Scripts/bootstrap.bundle.min.js | 0 .../Scripts/bootstrap.bundle.min.js.map | 0 .../WebForms_Sample/Scripts/bootstrap.js | 0 .../WebForms_Sample/Scripts/bootstrap.js.map | 0 .../WebForms_Sample/Scripts/bootstrap.min.js | 0 .../Scripts/bootstrap.min.js.map | 0 .../Scripts/esm/popper-utils.js | 0 .../Scripts/esm/popper-utils.js.map | 0 .../Scripts/esm/popper-utils.min.js | 0 .../Scripts/esm/popper-utils.min.js.map | 0 .../WebForms_Sample/Scripts/esm/popper.js | 0 .../WebForms_Sample/Scripts/esm/popper.js.map | 0 .../WebForms_Sample/Scripts/esm/popper.min.js | 0 .../Scripts/esm/popper.min.js.map | 0 .../WebForms_Sample/Scripts/index.d.ts | 0 .../Scripts/jquery-3.4.1.intellisense.js | 0 .../WebForms_Sample/Scripts/jquery-3.4.1.js | 0 .../Scripts/jquery-3.4.1.min.js | 0 .../Scripts/jquery-3.4.1.min.map | 0 .../Scripts/jquery-3.4.1.slim.js | 0 .../Scripts/jquery-3.4.1.slim.min.js | 0 .../Scripts/jquery-3.4.1.slim.min.map | 0 .../Scripts/modernizr-2.8.3.js | 0 .../WebForms_Sample/Scripts/popper-utils.js | 0 .../Scripts/popper-utils.js.map | 0 .../Scripts/popper-utils.min.js | 0 .../Scripts/popper-utils.min.js.map | 0 .../WebForms_Sample/Scripts/popper.js | 0 .../WebForms_Sample/Scripts/popper.js.map | 0 .../WebForms_Sample/Scripts/popper.min.js | 0 .../WebForms_Sample/Scripts/popper.min.js.map | 0 .../WebForms_Sample/Scripts/respond.js | 0 .../Scripts/respond.matchmedia.addListener.js | 0 .../respond.matchmedia.addListener.min.js | 0 .../WebForms_Sample/Scripts/respond.min.js | 0 .../WebForms_Sample/Scripts/touryo/common.js | 0 .../WebForms_Sample/Scripts/touryo/else.js | 0 .../Scripts/touryo/ie_key_event.js | 0 .../Scripts/umd/popper-utils.js | 0 .../Scripts/umd/popper-utils.js.map | 0 .../Scripts/umd/popper-utils.min.js | 0 .../Scripts/umd/popper-utils.min.js.map | 0 .../WebForms_Sample/Scripts/umd/popper.js | 0 .../WebForms_Sample/Scripts/umd/popper.js.map | 0 .../WebForms_Sample/Scripts/umd/popper.min.js | 0 .../Scripts/umd/popper.min.js.map | 0 .../WebForms_Sample/Startup.cs | 0 .../WebForms_Sample/Web.Debug.config | 0 .../WebForms_Sample/Web.Release.config | 0 .../WebForms_Sample/Web.config | 4 +- .../WebForms_Sample/WebForms_Sample.csproj | 33 +- .../WebService/IJSONService.cs | 0 .../WebService/JSONService.svc | 0 .../WebService/JSONService.svc.cs | 0 .../WebForms_Sample/app.config | 0 .../WebForms_Sample/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../WebForms_Sample/images/touryo/error.ico | Bin .../WebForms_Sample/images/touryo/image.jpg | Bin .../images/touryo/information.ico | Bin .../WebForms_Sample/images/touryo/loading.gif | Bin .../WebForms_Sample/images/touryo/logo.png | Bin .../images/touryo/question.ico | Bin .../WebForms_Sample/images/touryo/warning.ico | Bin .../WebForms_Sample/packages.config | 52 +- .../Backend/MVC_Sample/MVC_Sample.sln | 25 + .../MVC_Sample/Controllers/Crud1Controller.cs | 603 ++++++ .../MVC_Sample/Controllers/Crud2Controller.cs | 603 ++++++ .../MVC_Sample/Controllers/ErrorController.cs | 85 + .../MVC_Sample/Controllers/HomeController.cs | 277 +++ .../MVC_Sample/Controllers/PingController.cs | 54 + .../MVC_Sample/Logic/Business/LayerB.cs | 824 ++++++++ .../Logic/Common/TestParameterValue.cs | 48 + .../Logic/Common/TestReturnValue.cs | 33 + .../MVC_Sample/Logic/Dao/DaoShippers.cs | 409 ++++ .../MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs | 506 +++++ .../MVC_Sample/MVC_Sample/MVC_Sample.csproj | 38 + .../Models/ViewModels/BaseViewModel.cs | 77 + .../Models/ViewModels/CrudViweModel.cs | 176 ++ .../Models/ViewModels/ErrorViewModel.cs | 44 + .../Models/ViewModels/LoginViewModel.cs | 53 + .../Models/ViewModels/ShipperViweModel.cs | 80 + .../Models/ViewModels/TestShipperViweModel.cs | 39 + .../Backend/MVC_Sample/MVC_Sample/Program.cs | 57 + .../MVC_Sample/Properties/launchSettings.json | 27 + .../MVC_Sample/MVC_Sample/RestoreLib1.bat | 2 + .../MVC_Sample/MVC_Sample/RestoreLib2.bat | 2 + .../Backend/MVC_Sample/MVC_Sample/Startup.cs | 226 +++ .../MVC_Sample/Views/Crud1/Index.cshtml | 124 ++ .../MVC_Sample/Views/Crud1/_ChartView.cshtml | 0 .../Views/Crud1/_MessageView.cshtml | 0 .../MVC_Sample/Views/Crud2/Index.cshtml | 124 ++ .../MVC_Sample/Views/Crud2/_ChartView.cshtml | 0 .../Views/Crud2/_MessageView.cshtml | 24 + .../MVC_Sample/Views/Error/Index.cshtml | 40 + .../MVC_Sample/Views/Home/Index.cshtml | 48 + .../MVC_Sample/Views/Home/Login.cshtml | 65 + .../MVC_Sample/Views/Home/Scroll.cshtml | 128 ++ .../MVC_Sample/Views/Shared/_Layout.cshtml | 126 ++ .../Shared/_ValidationScriptsPartial.cshtml | 18 + .../MVC_Sample/Views/_ViewImports.cshtml | 25 + .../MVC_Sample/Views/_ViewStart.cshtml | 24 + .../MVC_Sample/appsettings.Development.json | 10 + .../MVC_Sample/MVC_Sample/appsettings.json | 66 + .../MVC_Sample/MVC_Sample/gruntfile.js | 82 + .../MVC_Sample/MVC_Sample/package.json | 26 + .../MVC_Sample/wwwroot/css/app/site.css | 0 .../MVC_Sample/wwwroot/css}/touryo/Style.css | 0 .../MVC_Sample/MVC_Sample/wwwroot/favicon.ico | Bin 0 -> 32038 bytes .../wwwroot}/images/touryo/loading.gif | Bin .../wwwroot}/images/touryo/logo.png | Bin .../MVC_Sample/wwwroot/js/app/site.js | 1 + .../MVC_Sample/wwwroot/js}/touryo/common.js | 0 .../MVC_Sample/wwwroot/js}/touryo/else.js | 0 .../CS/Samples4NetCore/Frontend/README.md | 4 + .../2CSClientWPF_sample.csproj | 58 + .../2CSClientWPF_sample.sln | 4 +- .../2CS_sample/2CSClientWPF_sample/App.xaml | 8 + .../2CSClientWPF_sample/App.xaml.cs | 38 + .../2CSClientWPF_sample/Business/LayerB.cs | 848 ++++++++ .../Common/TestParameterValue.cs | 60 + .../Common/TestReturnValue.cs | 41 + .../2CSClientWPF_sample/Dao/DaoShippers.cs | 406 ++++ .../2CSClientWPF_sample/Dao/LayerD.cs | 518 +++++ .../2CSClientWPF_sample/MSGDefinition.xml | 0 .../2CSClientWPF_sample/SPDefinition.xml | 0 .../2CSClientWPF_sample/SampleLogConf2CS.xml | 0 .../2CSClientWPF_sample/Window1.xaml | 50 + .../2CSClientWPF_sample/Window1.xaml.cs | 642 ++++++ .../2CSClientWPF_sample/appsettings.json | 59 + .../2CSClientWin_sample.csproj | 60 + .../2CSClientWin_sample.sln | 22 + .../2CSClientWin_sample/Business/LayerB.cs | 847 ++++++++ .../Common/TestParameterValue.cs | 59 + .../Common/TestReturnValue.cs | 41 + .../2CSClientWin_sample/Dao/DaoShippers.cs | 406 ++++ .../2CSClientWin_sample/Dao/LayerD.cs | 517 +++++ .../2CSClientWin_sample/Form1.Designer.cs | 425 ++++ .../2CS_sample/2CSClientWin_sample/Form1.cs | 648 ++++++ .../2CS_sample/2CSClientWin_sample/Form1.resx | 1194 +++++++++++ .../2CSClientWin_sample/Login.Designer.cs | 81 + .../2CS_sample/2CSClientWin_sample/Login.cs | 53 + .../2CS_sample/2CSClientWin_sample/Login.resx | 0 .../2CSClientWin_sample/MSGDefinition.xml | 0 .../2CS_sample/2CSClientWin_sample/Program.cs | 119 ++ .../2CSClientWin_sample/SPDefinition.xml | 0 .../2CSClientWin_sample/SampleLogConf2CS.xml | 0 .../2CSClientWin_sample/Splash.Designer.cs | 60 + .../2CS_sample/2CSClientWin_sample/Splash.cs | 188 ++ .../2CSClientWin_sample/Splash.resx | 0 .../2CSClientWin_sample/appsettings.json | 59 + .../AsyncEvent_sample/AsyncEvent_sample.sln | 4 +- .../2CS_sample/AsyncEvent_sample/Readme.txt | 0 .../WindowsFormsApplication/Form1.Designer.cs | 164 ++ .../WindowsFormsApplication/Form1.cs | 290 +++ .../WindowsFormsApplication/Form1.resx | 0 .../WindowsFormsApplication/Program.cs | 38 + .../WindowsFormsApplication.csproj | 22 + .../AsyncEvent_sample/WpfApplication/App.xaml | 8 + .../WpfApplication/App.xaml.cs | 30 + .../WpfApplication/Window1.xaml | 16 + .../WpfApplication/Window1.xaml.cs | 302 +++ .../WpfApplication/WpfApplication.csproj | 20 + .../AsyncEvent_sample/test-winx2&wpfx2.bat | 5 + .../Legacy/2CS_sample/CustCtrl_sample/Bean.cs | 37 + .../CustCtrl_sample/CustCtrl_sample.csproj | 27 + .../CustCtrl_sample/CustCtrl_sample.sln | 4 +- .../CustCtrl_sample/Form1.Designer.cs | 1792 +++++++++++++++++ .../2CS_sample/CustCtrl_sample/Form1.cs | 666 ++++++ .../2CS_sample/CustCtrl_sample/Form1.resx | 0 .../2CS_sample/CustCtrl_sample/Program.cs | 38 + .../2CS_sample/CustCtrl_sample/Readme.txt | 0 .../Business/LayerB_BatUpd.cs | 169 ++ .../Business/LayerB_Dynamic.cs | 206 ++ .../Business/LayerB_Static.cs | 233 +++ .../Common/TestParameterValue.cs | 114 ++ .../Common/TestReturnValue.cs | 58 + .../Dao/DaoCategories.cs | 450 +++++ .../Dao/DaoCategories_D1_Insert.xml | 0 .../Dao/DaoCategories_D2_Select.xml | 0 .../Dao/DaoCategories_D3_Update.xml | 0 .../Dao/DaoCategories_D4_Delete.xml | 0 .../Dao/DaoCategories_D5_SelCnt.xml | 0 .../Dao/DaoCategories_S1_Insert.sql | 0 .../Dao/DaoCategories_S2_Select.xml | 0 .../Dao/DaoCategories_S3_Update.xml | 0 .../Dao/DaoCategories_S4_Delete.xml | 0 .../GenDaoAndBatUpd_sample/Dao/DaoProducts.cs | 714 +++++++ .../Dao/DaoProducts_D1_Insert.xml | 0 .../Dao/DaoProducts_D2_Select.xml | 0 .../Dao/DaoProducts_D3_Update.xml | 0 .../Dao/DaoProducts_D4_Delete.xml | 0 .../Dao/DaoProducts_D5_SelCnt.xml | 0 .../Dao/DaoProducts_S1_Insert.sql | 0 .../Dao/DaoProducts_S2_Select.xml | 0 .../Dao/DaoProducts_S3_Update.xml | 0 .../Dao/DaoProducts_S4_Delete.xml | 0 .../Dao/DaoSuppliers.cs | 802 ++++++++ .../Dao/DaoSuppliers_D1_Insert.xml | 0 .../Dao/DaoSuppliers_D2_Select.xml | 0 .../Dao/DaoSuppliers_D3_Update.xml | 0 .../Dao/DaoSuppliers_D4_Delete.xml | 0 .../Dao/DaoSuppliers_D5_SelCnt.xml | 0 .../Dao/DaoSuppliers_S1_Insert.sql | 0 .../Dao/DaoSuppliers_S2_Select.xml | 0 .../Dao/DaoSuppliers_S3_Update.xml | 0 .../Dao/DaoSuppliers_S4_Delete.xml | 0 .../GenDaoAndBatUpd_sample/Diagram.bmp | Bin .../GenDaoAndBatUpd_sample/Form1.Designer.cs | 883 ++++++++ .../GenDaoAndBatUpd_sample/Form1.cs | 821 ++++++++ .../GenDaoAndBatUpd_sample}/Form1.resx | 0 .../GenDaoAndBatUpd_sample.csproj | 211 ++ .../GenDaoAndBatUpd_sample.sln | 4 +- .../GenDaoAndBatUpd_sample/MSGDefinition.xml | 0 .../GenDaoAndBatUpd_sample/Program.cs | 43 + .../GenDaoAndBatUpd_sample/Readme.txt | 0 .../Resources.Designer.cs | 73 + .../GenDaoAndBatUpd_sample/Resources.resx | 124 ++ .../GenDaoAndBatUpd_sample/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../GenDaoAndBatUpd_sample/appsettings.json | 40 + .../TimeStamp_sample/Dao/Daots_test_table1.cs | 406 ++++ .../Dao/Daots_test_table1_D1_Insert.xml | 0 .../Dao/Daots_test_table1_D2_Select.xml | 0 .../Dao/Daots_test_table1_D3_Update.xml | 0 .../Dao/Daots_test_table1_D4_Delete.xml | 0 .../Dao/Daots_test_table1_D5_SelCnt.xml | 0 .../Dao/Daots_test_table1_S1_Insert.sql | 0 .../Dao/Daots_test_table1_S2_Select.xml | 0 .../Dao/Daots_test_table1_S3_Update.xml | 0 .../Dao/Daots_test_table1_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_table2.cs | 406 ++++ .../Dao/Daots_test_table2_D1_Insert.xml | 0 .../Dao/Daots_test_table2_D2_Select.xml | 0 .../Dao/Daots_test_table2_D3_Update.xml | 0 .../Dao/Daots_test_table2_D4_Delete.xml | 0 .../Dao/Daots_test_table2_D5_SelCnt.xml | 0 .../Dao/Daots_test_table2_S1_Insert.sql | 0 .../Dao/Daots_test_table2_S2_Select.xml | 0 .../Dao/Daots_test_table2_S3_Update.xml | 0 .../Dao/Daots_test_table2_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_table3.cs | 406 ++++ .../Dao/Daots_test_table3_D1_Insert.xml | 0 .../Dao/Daots_test_table3_D2_Select.xml | 0 .../Dao/Daots_test_table3_D3_Update.xml | 0 .../Dao/Daots_test_table3_D4_Delete.xml | 0 .../Dao/Daots_test_table3_D5_SelCnt.xml | 0 .../Dao/Daots_test_table3_S1_Insert.sql | 0 .../Dao/Daots_test_table3_S2_Select.xml | 0 .../Dao/Daots_test_table3_S3_Update.xml | 0 .../Dao/Daots_test_table3_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_tableA.cs | 406 ++++ .../Dao/Daots_test_tableA_D1_Insert.xml | 0 .../Dao/Daots_test_tableA_D2_Select.xml | 0 .../Dao/Daots_test_tableA_D3_Update.xml | 0 .../Dao/Daots_test_tableA_D4_Delete.xml | 0 .../Dao/Daots_test_tableA_D5_SelCnt.xml | 0 .../Dao/Daots_test_tableA_S1_Insert.sql | 0 .../Dao/Daots_test_tableA_S2_Select.xml | 0 .../Dao/Daots_test_tableA_S3_Update.xml | 0 .../Dao/Daots_test_tableA_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_tableB.cs | 406 ++++ .../Dao/Daots_test_tableB_D1_Insert.xml | 0 .../Dao/Daots_test_tableB_D2_Select.xml | 0 .../Dao/Daots_test_tableB_D3_Update.xml | 0 .../Dao/Daots_test_tableB_D4_Delete.xml | 0 .../Dao/Daots_test_tableB_D5_SelCnt.xml | 0 .../Dao/Daots_test_tableB_S1_Insert.sql | 0 .../Dao/Daots_test_tableB_S2_Select.xml | 0 .../Dao/Daots_test_tableB_S3_Update.xml | 0 .../Dao/Daots_test_tableB_S4_Delete.xml | 0 .../TimeStamp_sample/Dao/Daots_test_tableC.cs | 406 ++++ .../Dao/Daots_test_tableC_D1_Insert.xml | 0 .../Dao/Daots_test_tableC_D2_Select.xml | 0 .../Dao/Daots_test_tableC_D3_Update.xml | 0 .../Dao/Daots_test_tableC_D4_Delete.xml | 0 .../Dao/Daots_test_tableC_D5_SelCnt.xml | 0 .../Dao/Daots_test_tableC_S1_Insert.sql | 0 .../Dao/Daots_test_tableC_S2_Select.xml | 0 .../Dao/Daots_test_tableC_S3_Update.xml | 0 .../Dao/Daots_test_tableC_S4_Delete.xml | 0 .../TimeStamp_sample/Form1.Designer.cs | 288 +++ .../2CS_sample/TimeStamp_sample/Form1.cs | 864 ++++++++ .../2CS_sample/TimeStamp_sample/Form1.resx | 771 +++++++ .../2CS_sample/TimeStamp_sample/Program.cs | 43 + .../2CS_sample/TimeStamp_sample/Readme.txt | 0 .../TimeStamp_sample/SampleLogConf2CS.xml | 0 .../TimeStamp_sample/TimeStamp_sample.csproj | 271 +++ .../TimeStamp_sample/TimeStamp_sample.sln | 25 + .../TimeStamp_sample/appsettings.json | 32 + .../RerunnableBatch_sample/Business/LayerB.cs | 150 ++ .../RerunnableBatch_sample/CREATE ORDERS2.sql | 0 .../ExecuteBatchProcessParameterValue.cs | 46 + .../Common/SelectPkListReturnValue.cs | 33 + .../Common/VoidParameterValue.cs | 41 + .../Common/VoidReturnValue.cs | 30 + .../RerunnableBatch_sample/Dao/DaoOrders2.cs | 890 ++++++++ .../Dao/DaoOrders2_D1_Insert.xml | 0 .../Dao/DaoOrders2_D2_Select.xml | 0 .../Dao/DaoOrders2_D3_Update.xml | 0 .../Dao/DaoOrders2_D4_Delete.xml | 0 .../Dao/DaoOrders2_D5_SelCnt.xml | 0 .../Dao/DaoOrders2_S1_Insert.sql | 0 .../Dao/DaoOrders2_S2_Select.xml | 0 .../Dao/DaoOrders2_S3_Update.xml | 0 .../Dao/DaoOrders2_S4_Delete.xml | 0 .../Dao/SelectAllOrderID.xml | 0 .../Dao/SelectInOrderID.xml | 0 .../RerunnableBatch_sample}/MSGDefinition.xml | 0 .../RerunnableBatch_sample/Program.cs | 151 ++ .../RerunnableBatch_sample.csproj | 96 + .../RerunnableBatch_sample.sln | 25 + .../RerunnableBatch_sample}/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../RerunnableBatch_sample/appsettings.json | 19 + .../RerunnableBatch_sample/readme.txt | 0 .../Business/LayerB.cs | 160 ++ .../CREATE ORDERS2.sql | 0 .../ExecuteBatchProcessParameterValue.cs | 45 + .../Common/SelectPkListReturnValue.cs | 33 + .../Common/VoidParameterValue.cs | 41 + .../Common/VoidReturnValue.cs | 30 + .../RerunnableBatch_sample2/Dao/DaoOrders2.cs | 890 ++++++++ .../Dao/DaoOrders2_D1_Insert.xml | 0 .../Dao/DaoOrders2_D2_Select.xml | 0 .../Dao/DaoOrders2_D3_Update.xml | 0 .../Dao/DaoOrders2_D4_Delete.xml | 0 .../Dao/DaoOrders2_D5_SelCnt.xml | 0 .../Dao/DaoOrders2_S1_Insert.sql | 0 .../Dao/DaoOrders2_S2_Select.xml | 0 .../Dao/DaoOrders2_S3_Update.xml | 0 .../Dao/DaoOrders2_S4_Delete.xml | 0 .../Dao/SelectAllOrderID.xml | 0 .../Dao/SelectInOrderID.xml | 0 .../MSGDefinition.xml | 0 .../RerunnableBatch_sample2/Program.cs | 151 ++ .../RerunnableBatch_sample2.csproj | 96 + .../RerunnableBatch_sample2.sln | 25 + .../RerunnableBatch_sample2}/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../RerunnableBatch_sample2/appsettings.json | 19 + .../RerunnableBatch_sample2/readme.txt | 0 .../Business/LayerB.cs | 146 ++ .../CREATE ORDERS2.sql | 0 .../ExecuteBatchProcessParameterValue.cs | 45 + .../Common/SelectPkListReturnValue.cs | 33 + .../Common/VoidParameterValue.cs | 41 + .../Common/VoidReturnValue.cs | 30 + .../RerunnableBatch_sample3/Dao/DaoOrders2.cs | 890 ++++++++ .../Dao/DaoOrders2_D1_Insert.xml | 0 .../Dao/DaoOrders2_D2_Select.xml | 0 .../Dao/DaoOrders2_D3_Update.xml | 0 .../Dao/DaoOrders2_D4_Delete.xml | 0 .../Dao/DaoOrders2_D5_SelCnt.xml | 0 .../Dao/DaoOrders2_S1_Insert.sql | 0 .../Dao/DaoOrders2_S2_Select.xml | 0 .../Dao/DaoOrders2_S3_Update.xml | 0 .../Dao/DaoOrders2_S4_Delete.xml | 0 .../Dao/SelectAllOrderID.xml | 0 .../Dao/SelectInOrderID.xml | 0 .../MSGDefinition.xml | 0 .../RerunnableBatch_sample3/Program.cs | 151 ++ .../RerunnableBatch_sample3.csproj | 96 + .../RerunnableBatch_sample3.sln | 25 + .../RerunnableBatch_sample3}/SPDefinition.xml | 0 .../SampleLogConf2CS.xml | 0 .../RerunnableBatch_sample3/appsettings.json | 19 + .../RerunnableBatch_sample3/readme.txt | 0 .../SimpleBatch_sample/Business/LayerB.cs | 847 ++++++++ .../Common/TestParameterValue.cs | 60 + .../Common/TestReturnValue.cs | 42 + .../SimpleBatch_sample/Dao/DaoShippers.cs | 421 ++++ .../SimpleBatch_sample/Dao/LayerD.cs | 517 +++++ .../SimpleBatch_sample}/MSGDefinition.xml | 0 .../Bat_sample/SimpleBatch_sample/Program.cs | 93 + .../SimpleBatch_sample}/SPDefinition.xml | 0 .../SimpleBatch_sample/SampleLogConf2CS.xml | 0 .../SimpleBatch_sample.csproj | 62 + .../SimpleBatch_sample/SimpleBatch_sample.sln | 25 + .../SimpleBatch_sample/appsettings.json | 19 + .../Bat_sample/SimpleBatch_sample/readme.txt | 0 .../WSClientWPF_sample/App.xaml | 8 + .../WSClientWPF_sample/App.xaml.cs | 35 + .../WSClientWPF_sample/AsyncFunc.cs | 78 + .../WSClientWPF_sample}/MSGDefinition.xml | 0 .../WSClientWPF_sample}/SPDefinition.xml | 0 .../WSClientWPF_sample/SampleLogConf2CS.xml | 0 .../TMInProcessDefinition.xml | 0 .../TMProtocolDefinition.xml | 0 .../TMProtocolDefinition2.xml | 0 .../WSClientWPF_sample.csproj | 88 + .../WSClientWPF_sample/WSClientWPF_sample.sln | 38 + .../WSClientWPF_sample/Window0.xaml | 8 + .../WSClientWPF_sample/Window0.xaml.cs | 40 + .../WSClientWPF_sample/Window1.xaml | 52 + .../WSClientWPF_sample/Window1.xaml.cs | 682 +++++++ .../WSClientWPF_sample/appsettings.json | 72 + .../WSClientWin2_sample/ByReturn.Designer.cs | 73 + .../WSClientWin2_sample/ByReturn.cs | 109 + .../WSClientWin2_sample/ByReturn.resx | 0 .../WSClientWin2_sample/Form0.Designer.cs | 83 + .../WSClientWin2_sample/Form0.cs | 61 + .../WSClientWin2_sample/Form0.resx | 0 .../WSClientWin2_sample/Form1.Designer.cs | 299 +++ .../WSClientWin2_sample/Form1.cs | 280 +++ .../WSClientWin2_sample/Form1.resx | 0 .../WSClientWin2_sample/Form2.Designer.cs | 106 + .../WSClientWin2_sample/Form2.cs | 90 + .../WSClientWin2_sample/Form2.resx | 0 .../WSClientWin2_sample/Form3.Designer.cs | 473 +++++ .../WSClientWin2_sample/Form3.cs | 600 ++++++ .../WSClientWin2_sample/Form3.resx | 1040 ++++++++++ .../WSClientWin2_sample/Login.Designer.cs | 81 + .../WSClientWin2_sample/Login.cs | 55 + .../WSClientWin2_sample/Login.resx | 0 .../WSClientWin2_sample/Program.cs | 130 ++ .../WSClientWin2_sample/SampleLogConf2CS.xml | 0 .../WSClientWin2_sample/Splash.Designer.cs | 60 + .../WSClientWin2_sample/Splash.cs | 188 ++ .../WSClientWin2_sample/Splash.resx | 120 ++ .../UserControl3.Designer.cs | 247 +++ .../WSClientWin2_sample/UserControl3.cs | 78 + .../WSClientWin2_sample/UserControl3.resx | 0 .../UserControlChild.Designer.cs | 58 + .../WSClientWin2_sample/UserControlChild.cs | 44 + .../WSClientWin2_sample/UserControlChild.resx | 0 .../UserControlParent.Designer.cs | 68 + .../WSClientWin2_sample/UserControlParent.cs | 33 + .../UserControlParent.resx | 0 .../WSClientWin2_sample.csproj | 57 + .../WSClientWin2_sample.sln | 0 .../WSClientWin2_sample/appsettings.json | 32 + .../WSClientWin_sample/AsyncFunc.cs | 78 + .../WSClientWin_sample/Blue hills.jpg | Bin 0 -> 28521 bytes .../WSClientWin_sample/Form1.Designer.cs | 443 ++++ .../WSClientWin_sample/Form1.cs | 734 +++++++ .../WSClientWin_sample/Form1.resx | 1311 ++++++++++++ .../WSClientWin_sample/Login.Designer.cs | 93 + .../WSClientWin_sample/Login.cs | 121 ++ .../WSClientWin_sample/Login.resx | 120 ++ .../WSClientWin_sample}/MSGDefinition.xml | 0 .../WSClientWin_sample/Program.cs | 122 ++ .../WSClientWin_sample}/SPDefinition.xml | 0 .../WSClientWin_sample/SampleLogConf2CS.xml | 0 .../WSClientWin_sample/Splash.Designer.cs | 60 + .../WSClientWin_sample/Splash.cs | 188 ++ .../WSClientWin_sample/Splash.resx | 120 ++ .../TMInProcessDefinition.xml | 0 .../TMProtocolDefinition.xml | 0 .../TMProtocolDefinition2.xml | 0 .../WSClientWin_sample.csproj | 90 + .../WSClientWin_sample/WSClientWin_sample.sln | 62 + .../WSClientWin_sample/appsettings.json | 87 + .../WSIFType_sample/TestParameterValue.cs | 62 + .../WSIFType_sample/TestReturnValue.cs | 44 + .../WSIFType_sample/WSIFType_sample.csproj | 23 + .../WSServer_sample/Business/LayerB.cs | 847 ++++++++ .../WSServer_sample/Common/Shipper.cs | 36 + .../WSServer_sample/Common/WebApiParams.cs | 62 + .../WSServer_sample/Dao/DaoShippers.cs | 409 ++++ .../WS_sample/WSServer_sample/Dao/LayerD.cs | 517 +++++ .../WSServer_sample/WSServer_sample.csproj | 33 + .../WSServer_sample/WSServer_sample.sln | 31 + ... a double-click to build bat file here.txt | 0 .../programs/CS/z_Common.bat | 19 +- .../programs/CS/z_Common2.bat | 0 .../programs/VB/0_ExecAllBat.bat | 8 +- .../programs/VB/10_Build_WebApp_sample.bat | 0 .../programs/VB/1_DeleteDir.bat | 0 .../programs/VB/1_DeleteFile.bat | 0 .../VB/3_Build_BusinessRichClient_net48.bat | 6 +- .../programs/VB/3_Build_Business_net48.bat | 4 +- .../programs/VB/4_Build_CopyAssemblies.bat | 10 + .../programs/VB/5_Build_2CS_sample.bat | 0 .../programs/VB/5_Build_Bat_sample.bat | 0 .../programs/VB/6_Build_WSSrv_sample.bat | 0 .../programs/VB/7_Build_Framework_WS.bat | 0 .../programs/VB/8_Build_WSClntWin_sample.bat | 7 - .../programs/VB/9_Build_WSClntWPF_sample.bat | 26 + .../Business/Business/MyBaseLogic.vb | 0 .../Business/Business/MyFcBaseLogic.vb | 0 .../Business/Business/_3TierEngine.vb | 0 .../Business/Business_net48.vbproj | 39 +- .../Business/Common/MuParameterValue.vb | 0 .../Business/Common/MuReturnValue.vb | 0 .../Business/Common/MyParameterValue.vb | 0 .../Business/Common/MyReturnValue.vb | 0 .../Business/Common/_3TierParameterValue.vb | 0 .../Business/Common/_3TierReturnValue.vb | 0 .../Csp/CstSqlSessionStateProvider.vb | 0 .../Csp/SessionDB creation script.txt | 0 .../Business/Dao/BaseConsolidateDao.vb | 0 .../Infrastructure/Business/Dao/CmnDao.vb | 0 .../Infrastructure/Business/Dao/MyBaseDao.vb | 0 .../MyBusinessApplicationExceptionMessage.vb | 0 .../MyBusinessSystemExceptionMessage.vb | 0 .../My Project/Application.Designer.vb | 0 .../Business/My Project/Application.myapp | 0 .../Business/My Project/AssemblyInfo.vb | 0 .../Business/Presentation/CmnTableAdapter.vb | 0 .../Business/Presentation/MyBaseController.vb | 0 .../Presentation/MyBaseMVController.vb | 0 ...cationExceptionMessageResource.Designer.vb | 28 +- ...icationExceptionMessageResource.ja-JP.resx | 0 ...ssApplicationExceptionMessageResource.resx | 0 ...SystemExceptionMessageResource.Designer.vb | 38 +- ...sSystemExceptionMessageResource.ja-JP.resx | 0 ...usinessSystemExceptionMessageResource.resx | 0 .../Asynchronous/MyBaseAsyncFunc.vb | 0 .../Business.RichClient_net48.vbproj | 72 +- .../RichClient/Business/MyBaseLogic2CS.vb | 0 .../RichClient/Business/MyFcBaseLogic2CS.vb | 0 .../My Project/Application.Designer.vb | 0 .../RichClient/My Project/Application.myapp | 0 .../RichClient/My Project/AssemblyInfo.vb | 0 .../Presentation/MyBaseControllerWin.vb | 0 .../RichClient/Util/RcMyCmnFunction.vb | 0 .../Business}/RichClient/packages.config | 24 +- .../Business/Str/JISX0208_1983Checker.vb | 0 .../Infrastructure/Business/Util/GMTMaster.vb | 0 .../Business/Util/MyAttribute.vb | 0 .../Business/Util/MyCmnFunction.vb | 0 .../Infrastructure/Business/Util/MyLiteral.vb | 0 .../Business/Util/MySubsysInfo.vb | 0 .../Business/Util/MyTimeZone.vb | 0 .../Business/Util/MyTimeZoneEnum.vb | 0 .../Business/Util/MyUserInfo.vb | 0 .../Infrastructure/Business/app.config | 24 + .../Infrastructure/Business/packages.config | 52 +- .../BusinessRichClient_net48.sln | 11 +- .../Infrastructure/Business_net48.sln | 11 +- .../CustomControl/Control/WebCustomButton.vb | 0 .../Control/WebCustomCheckBox.vb | 0 .../Control/WebCustomCheckBoxList.vb | 0 .../Control/WebCustomDropDownList.vb | 0 .../Control/WebCustomFileUpload.vb | 0 .../Control/WebCustomImageButton.vb | 0 .../Control/WebCustomImageMap.vb | 0 .../CustomControl/Control/WebCustomLabel.vb | 0 .../Control/WebCustomLinkButton.vb | 0 .../CustomControl/Control/WebCustomListBox.vb | 0 .../CustomControl/Control/WebCustomPanel.vb | 0 .../Control/WebCustomRadioButton.vb | 0 .../Control/WebCustomRadioButtonList.vb | 0 .../CustomControl/Control/WebCustomTextBox.vb | 0 .../CustomControl/CustomControl_net48.vbproj | 16 +- .../CustomControl/Function/CheckResult.vb | 0 .../Function/CmnCheckFunction.vb | 0 .../Function/CmnMasterDatasForList.vb | 0 .../CustomControl/Function/ListItem.vb | 0 .../CustomControl/Interface/ICheck.vb | 0 .../CustomControl/Interface/IGetValue.vb | 0 .../CustomControl/Interface/IMasterData.vb | 0 .../My Project/Application.Designer.vb | 13 + .../My Project/Application.myapp | 0 .../CustomControl/My Project/AssemblyInfo.vb | 0 .../CustomControl/PropertyGrid/CheckType.vb | 0 .../PropertyGrid/CheckTypeConverter.vb | 0 .../Control/WinCustomDropDownList.resx | 0 .../Control/WinCustomDropDownList.vb | 0 .../Control/WinCustomMaskedTextBox.resx | 0 .../Control/WinCustomMaskedTextBox.vb | 0 .../Control/WinCustomMaskedTextBoxDgvCell.vb | 0 .../Control/WinCustomMaskedTextBoxDgvCol.vb | 0 .../Control/WinCustomMaskedTextBoxDgvHost.vb | 0 .../RichClient/Control/WinCustomTextBox.resx | 0 .../RichClient/Control/WinCustomTextBox.vb | 0 .../Control/WinCustomTextBoxDgvCell.vb | 0 .../Control/WinCustomTextBoxDgvCol.vb | 0 .../Control/WinCustomTextBoxDgvHost.vb | 0 .../CustomControl.RichClient_net48.vbproj | 60 +- .../RichClient/Function/CheckResult.vb | 0 .../RichClient/Function/CmnCheckFunction.vb | 0 .../Function/CmnMasterDatasForList.vb | 0 .../RichClient/Function/ListItem.vb | 0 .../RichClient/Interface/ICheck.vb | 0 .../RichClient/Interface/IEdit.vb | 0 .../RichClient/Interface/IGetValue.vb | 0 .../RichClient/Interface/IMasterData.vb | 0 .../My Project/Application.Designer.vb | 13 + .../RichClient/My Project/Application.myapp | 0 .../RichClient/My Project/AssemblyInfo.vb | 0 .../RichClient/PropertyGrid/CheckType.vb | 0 .../PropertyGrid/CheckTypeConverter.vb | 0 .../RichClient/PropertyGrid/EditAddFigure.vb | 0 .../PropertyGrid/EditDigitsAfterDP.vb | 0 .../EditDigitsAfterDPConverter.vb | 0 .../PropertyGrid/EditInitialValue.vb | 0 .../RichClient/PropertyGrid/EditPadding.vb | 0 .../PropertyGrid/EditPaddingConverter.vb | 0 .../CustomControl/RichClient/packages.config | 24 +- .../CustomControl/packages.config | 8 +- .../ASPNETWebService/ASPNETWebService.sln | 7 +- .../ASPNETWebService/ASPNETWebService.vbproj | 151 +- .../App_Start/FilterConfig.vb | 0 .../App_Start/WebApiConfig.vb | 0 .../Controllers/FxController.vb | 0 .../ASPNETWebService/IWCFHTTPSvcForFx.vb | 0 .../My Project/Application.Designer.vb | 13 + .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../My Project/MyExtensions/MyWebExtension.vb | 0 .../My Project/Resources.Designer.vb | 4 +- .../My Project/Resources.resx | 0 .../My Project/Settings.Designer.vb | 4 +- .../My Project/Settings.settings | 0 .../ASPNETWebService/ServiceForFx.asmx | 0 .../ASPNETWebService/ServiceForFx.asmx.vb | 0 .../ASPNETWebService/Startup.vb | 0 .../ASPNETWebService/WCFHTTPSvcForFx.svc | 0 .../ASPNETWebService/WCFHTTPSvcForFx.svc.vb | 0 .../ASPNETWebService/Web.Debug.config | 0 .../ASPNETWebService/Web.Release.config | 0 .../ASPNETWebService/Web.config | 47 +- .../ASPNETWebService/app.config | 4 +- .../ASPNETWebService/packages.config | 34 + .../ServiceInterface/WCFService/App.config | 8 +- .../ServiceInterface/WCFService/Module1.vb | 0 .../My Project/Application.Designer.vb | 13 + .../WCFService/My Project/Application.myapp | 0 .../WCFService/My Project/AssemblyInfo.vb | 0 .../WCFService/WCFService.sln | 7 +- .../WCFService/WCFService.vbproj | 8 +- .../WCFService/WCFTCPSvcForFx.vb | 0 .../WCFService/packages.config | 0 .../2CSClientWPF_sample.sln | 7 +- .../2CSClientWPF_sample.vbproj | 12 +- .../2CSClientWPF_sample/Application.xaml | 0 .../2CSClientWPF_sample/Application.xaml.vb | 0 .../2CSClientWPF_sample/Business/LayerB.vb | 0 .../Common/TestParameterValue.vb | 0 .../Common/TestReturnValue.vb | 0 .../2CSClientWPF_sample/Dao/DaoShippers.vb | 0 .../2CSClientWPF_sample/Dao/LayerD.vb | 0 .../2CSClientWPF_sample}/MSGDefinition.xml | 0 .../My Project/AssemblyInfo.vb | 0 .../My Project/MyExtensions/MyWpfExtension.vb | 0 .../2CSClientWPF_sample}/SPDefinition.xml | 0 .../2CSClientWPF_sample/SampleLogConf2CS.xml | 133 ++ .../2CSClientWPF_sample/Window1.xaml | 0 .../2CSClientWPF_sample/Window1.xaml.vb | 0 .../2CS_sample/2CSClientWPF_sample/app.config | 11 + .../2CSClientWin_sample.sln | 7 +- .../2CSClientWin_sample.vbproj | 12 +- .../2CSClientWin_sample/Business/LayerB.vb | 0 .../Common/TestParameterValue.vb | 0 .../Common/TestReturnValue.vb | 0 .../2CSClientWin_sample/Dao/DaoShippers.vb | 0 .../2CSClientWin_sample/Dao/LayerD.vb | 0 .../2CSClientWin_sample/Form1.Designer.vb | 0 .../2CS_sample/2CSClientWin_sample/Form1.resx | 120 ++ .../2CS_sample/2CSClientWin_sample/Form1.vb | 0 .../2CSClientWin_sample/Login.Designer.vb | 0 .../2CS_sample/2CSClientWin_sample/Login.vb | 0 .../2CSClientWin_sample}/MSGDefinition.xml | 0 .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../2CS_sample/2CSClientWin_sample/Program.vb | 0 .../2CSClientWin_sample}/SPDefinition.xml | 0 .../2CSClientWin_sample/SampleLogConf2CS.xml | 133 ++ .../2CSClientWin_sample/Splash.Designer.vb | 0 .../2CSClientWin_sample/Splash.resx | 120 ++ .../2CS_sample/2CSClientWin_sample/Splash.vb | 0 .../2CS_sample/2CSClientWin_sample/app.config | 8 +- .../AsyncEvent_sample/AsyncEvent_sample.sln | 7 +- .../2CS_sample/AsyncEvent_sample/Readme.txt | 5 + .../WindowsFormsApplication/Form1.Designer.vb | 0 .../WindowsFormsApplication/Form1.resx | 120 ++ .../WindowsFormsApplication/Form1.vb | 0 .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../WindowsFormsApplication.vbproj | 6 +- .../WpfApplication/Application.xaml | 0 .../WpfApplication/Application.xaml.vb | 0 .../WpfApplication/My Project/AssemblyInfo.vb | 0 .../My Project/MyExtensions/MyWpfExtension.vb | 0 .../WpfApplication/Window1.xaml | 0 .../WpfApplication/Window1.xaml.vb | 0 .../WpfApplication/WpfApplication.vbproj | 6 +- .../AsyncEvent_sample/test-winx2&wpfx2.bat | 0 .../2CS_sample/CustCtrl_sample/Bean.vb | 0 .../CustCtrl_sample/CustCtrl_sample.sln | 7 +- .../CustCtrl_sample/CustCtrl_sample.vbproj | 4 +- .../CustCtrl_sample/Form1.Designer.vb | 0 .../2CS_sample/CustCtrl_sample/Form1.resx | 120 ++ .../2CS_sample/CustCtrl_sample/Form1.vb | 0 .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../2CS_sample/CustCtrl_sample/Readme.txt | 217 ++ .../Business/LayerB_BatUpd.vb | 0 .../Business/LayerB_Dynamic.vb | 0 .../Business/LayerB_Static.vb | 0 .../Common/TestParameterValue.vb | 0 .../Common/TestReturnValue.vb | 0 .../Dao/DaoCategories.vb | 0 .../Dao/DaoCategories_D1_Insert.xml | 27 + .../Dao/DaoCategories_D2_Select.xml | 23 + .../Dao/DaoCategories_D3_Update.xml | 21 + .../Dao/DaoCategories_D4_Delete.xml | 14 + .../Dao/DaoCategories_D5_SelCnt.xml | 20 + .../Dao/DaoCategories_S1_Insert.sql | 17 + .../Dao/DaoCategories_S2_Select.xml | 16 + .../Dao/DaoCategories_S3_Update.xml | 16 + .../Dao/DaoCategories_S4_Delete.xml | 11 + .../GenDaoAndBatUpd_sample/Dao/DaoProducts.vb | 0 .../Dao/DaoProducts_D1_Insert.xml | 39 + .../Dao/DaoProducts_D2_Select.xml | 41 + .../Dao/DaoProducts_D3_Update.xml | 33 + .../Dao/DaoProducts_D4_Delete.xml | 20 + .../Dao/DaoProducts_D5_SelCnt.xml | 32 + .../Dao/DaoProducts_S1_Insert.sql | 27 + .../Dao/DaoProducts_S2_Select.xml | 22 + .../Dao/DaoProducts_S3_Update.xml | 22 + .../Dao/DaoProducts_S4_Delete.xml | 11 + .../Dao/DaoSuppliers.vb | 0 .../Dao/DaoSuppliers_D1_Insert.xml | 43 + .../Dao/DaoSuppliers_D2_Select.xml | 47 + .../Dao/DaoSuppliers_D3_Update.xml | 37 + .../Dao/DaoSuppliers_D4_Delete.xml | 22 + .../Dao/DaoSuppliers_D5_SelCnt.xml | 36 + .../Dao/DaoSuppliers_S1_Insert.sql | 31 + .../Dao/DaoSuppliers_S2_Select.xml | 24 + .../Dao/DaoSuppliers_S3_Update.xml | 24 + .../Dao/DaoSuppliers_S4_Delete.xml | 11 + .../GenDaoAndBatUpd_sample/Diagram.bmp | Bin 0 -> 377414 bytes .../GenDaoAndBatUpd_sample/Form1.Designer.vb | 0 .../GenDaoAndBatUpd_sample/Form1.resx | 0 .../GenDaoAndBatUpd_sample/Form1.vb | 0 .../GenDaoAndBatUpd_sample.sln | 7 +- .../GenDaoAndBatUpd_sample.vbproj | 12 +- .../GenDaoAndBatUpd_sample/MSGDefinition.xml | 23 + .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../GenDaoAndBatUpd_sample/Readme.txt | 1 + .../GenDaoAndBatUpd_sample/SPDefinition.xml | 15 + .../SampleLogConf2CS.xml | 133 ++ .../GenDaoAndBatUpd_sample/app.config | 15 +- .../TimeStamp_sample/Dao/Daots_test_table1.vb | 0 .../Dao/Daots_test_table1_D1_Insert.xml | 25 + .../Dao/Daots_test_table1_D2_Select.xml | 20 + .../Dao/Daots_test_table1_D3_Update.xml | 19 + .../Dao/Daots_test_table1_D4_Delete.xml | 13 + .../Dao/Daots_test_table1_D5_SelCnt.xml | 18 + .../Dao/Daots_test_table1_S1_Insert.sql | 13 + .../Dao/Daots_test_table1_S2_Select.xml | 16 + .../Dao/Daots_test_table1_S3_Update.xml | 16 + .../Dao/Daots_test_table1_S4_Delete.xml | 12 + .../TimeStamp_sample/Dao/Daots_test_table2.vb | 0 .../Dao/Daots_test_table2_D1_Insert.xml | 25 + .../Dao/Daots_test_table2_D2_Select.xml | 20 + .../Dao/Daots_test_table2_D3_Update.xml | 19 + .../Dao/Daots_test_table2_D4_Delete.xml | 13 + .../Dao/Daots_test_table2_D5_SelCnt.xml | 18 + .../Dao/Daots_test_table2_S1_Insert.sql | 13 + .../Dao/Daots_test_table2_S2_Select.xml | 16 + .../Dao/Daots_test_table2_S3_Update.xml | 16 + .../Dao/Daots_test_table2_S4_Delete.xml | 12 + .../TimeStamp_sample/Dao/Daots_test_table3.vb | 0 .../Dao/Daots_test_table3_D1_Insert.xml | 25 + .../Dao/Daots_test_table3_D2_Select.xml | 20 + .../Dao/Daots_test_table3_D3_Update.xml | 19 + .../Dao/Daots_test_table3_D4_Delete.xml | 13 + .../Dao/Daots_test_table3_D5_SelCnt.xml | 18 + .../Dao/Daots_test_table3_S1_Insert.sql | 13 + .../Dao/Daots_test_table3_S2_Select.xml | 16 + .../Dao/Daots_test_table3_S3_Update.xml | 16 + .../Dao/Daots_test_table3_S4_Delete.xml | 12 + .../TimeStamp_sample/Dao/Daots_test_tableA.vb | 0 .../Dao/Daots_test_tableA_D1_Insert.xml | 25 + .../Dao/Daots_test_tableA_D2_Select.xml | 20 + .../Dao/Daots_test_tableA_D3_Update.xml | 19 + .../Dao/Daots_test_tableA_D4_Delete.xml | 13 + .../Dao/Daots_test_tableA_D5_SelCnt.xml | 18 + .../Dao/Daots_test_tableA_S1_Insert.sql | 12 + .../Dao/Daots_test_tableA_S2_Select.xml | 16 + .../Dao/Daots_test_tableA_S3_Update.xml | 16 + .../Dao/Daots_test_tableA_S4_Delete.xml | 12 + .../TimeStamp_sample/Dao/Daots_test_tableB.vb | 0 .../Dao/Daots_test_tableB_D1_Insert.xml | 25 + .../Dao/Daots_test_tableB_D2_Select.xml | 20 + .../Dao/Daots_test_tableB_D3_Update.xml | 19 + .../Dao/Daots_test_tableB_D4_Delete.xml | 13 + .../Dao/Daots_test_tableB_D5_SelCnt.xml | 18 + .../Dao/Daots_test_tableB_S1_Insert.sql | 12 + .../Dao/Daots_test_tableB_S2_Select.xml | 16 + .../Dao/Daots_test_tableB_S3_Update.xml | 16 + .../Dao/Daots_test_tableB_S4_Delete.xml | 12 + .../TimeStamp_sample/Dao/Daots_test_tableC.vb | 0 .../Dao/Daots_test_tableC_D1_Insert.xml | 25 + .../Dao/Daots_test_tableC_D2_Select.xml | 20 + .../Dao/Daots_test_tableC_D3_Update.xml | 19 + .../Dao/Daots_test_tableC_D4_Delete.xml | 13 + .../Dao/Daots_test_tableC_D5_SelCnt.xml | 18 + .../Dao/Daots_test_tableC_S1_Insert.sql | 12 + .../Dao/Daots_test_tableC_S2_Select.xml | 16 + .../Dao/Daots_test_tableC_S3_Update.xml | 16 + .../Dao/Daots_test_tableC_S4_Delete.xml | 12 + .../TimeStamp_sample/Form1.Designer.vb | 0 .../2CS_sample/TimeStamp_sample/Form1.resx | 120 ++ .../2CS_sample/TimeStamp_sample/Form1.vb | 0 .../TimeStamp_sample/MSGDefinition.xml | 23 + .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../2CS_sample/TimeStamp_sample/Readme.txt | 2 + .../TimeStamp_sample/SPDefinition.xml | 15 + .../TimeStamp_sample/SampleLogConf2CS.xml | 133 ++ .../TimeStamp_sample/TimeStamp_sample.sln | 7 +- .../TimeStamp_sample/TimeStamp_sample.vbproj | 8 +- .../2CS_sample/TimeStamp_sample/app.config | 10 + .../RerunnableBatch_sample/Business/LayerB.vb | 0 .../RerunnableBatch_sample/CREATE ORDERS2.sql | 34 + .../ExecuteBatchProcessParameterValue.vb | 0 .../Common/SelectPkListReturnValue.vb | 0 .../Common/VoidParameterValue.vb | 0 .../Common/VoidReturnValue.vb | 0 .../RerunnableBatch_sample/Dao/DaoOrders2.vb | 0 .../Dao/DaoOrders2_D1_Insert.xml | 47 + .../Dao/DaoOrders2_D2_Select.xml | 53 + .../Dao/DaoOrders2_D3_Update.xml | 41 + .../Dao/DaoOrders2_D4_Delete.xml | 24 + .../Dao/DaoOrders2_D5_SelCnt.xml | 40 + .../Dao/DaoOrders2_S1_Insert.sql | 37 + .../Dao/DaoOrders2_S2_Select.xml | 26 + .../Dao/DaoOrders2_S3_Update.xml | 26 + .../Dao/DaoOrders2_S4_Delete.xml | 11 + .../Dao/SelectAllOrderID.xml | 9 + .../Dao/SelectInOrderID.xml | 25 + .../RerunnableBatch_sample/MSGDefinition.xml | 23 + .../RerunnableBatch_sample/Program.vb | 0 .../Properties/AssemblyInfo.vb | 0 .../RerunnableBatch_sample.sln | 7 +- .../RerunnableBatch_sample.vbproj | 8 +- .../RerunnableBatch_sample/SPDefinition.xml | 15 + .../SampleLogConf2CS.xml | 133 ++ .../RerunnableBatch_sample/app.config | 8 +- .../RerunnableBatch_sample/readme.txt | 8 + .../Business/LayerB.vb | 0 .../CREATE ORDERS2.sql | 34 + .../ExecuteBatchProcessParameterValue.vb | 0 .../Common/SelectPkListReturnValue.vb | 0 .../Common/VoidParameterValue.vb | 0 .../Common/VoidReturnValue.vb | 0 .../RerunnableBatch_sample2/Dao/DaoOrders2.vb | 0 .../Dao/DaoOrders2_D1_Insert.xml | 47 + .../Dao/DaoOrders2_D2_Select.xml | 53 + .../Dao/DaoOrders2_D3_Update.xml | 41 + .../Dao/DaoOrders2_D4_Delete.xml | 24 + .../Dao/DaoOrders2_D5_SelCnt.xml | 40 + .../Dao/DaoOrders2_S1_Insert.sql | 37 + .../Dao/DaoOrders2_S2_Select.xml | 26 + .../Dao/DaoOrders2_S3_Update.xml | 26 + .../Dao/DaoOrders2_S4_Delete.xml | 11 + .../Dao/SelectAllOrderID.xml | 9 + .../Dao/SelectInOrderID.xml | 25 + .../RerunnableBatch_sample2/MSGDefinition.xml | 23 + .../RerunnableBatch_sample2/Program.vb | 0 .../Properties/AssemblyInfo.vb | 0 .../RerunnableBatch_sample2.sln | 7 +- .../RerunnableBatch_sample2.vbproj | 8 +- .../RerunnableBatch_sample2/SPDefinition.xml | 15 + .../SampleLogConf2CS.xml | 133 ++ .../RerunnableBatch_sample2/app.config | 8 +- .../RerunnableBatch_sample2/readme.txt | 8 + .../Business/LayerB.vb | 0 .../CREATE ORDERS2.sql | 34 + .../ExecuteBatchProcessParameterValue.vb | 0 .../Common/SelectPkListReturnValue.vb | 0 .../Common/VoidParameterValue.vb | 0 .../Common/VoidReturnValue.vb | 0 .../RerunnableBatch_sample3/Dao/DaoOrders2.vb | 0 .../Dao/DaoOrders2_D1_Insert.xml | 47 + .../Dao/DaoOrders2_D2_Select.xml | 53 + .../Dao/DaoOrders2_D3_Update.xml | 41 + .../Dao/DaoOrders2_D4_Delete.xml | 24 + .../Dao/DaoOrders2_D5_SelCnt.xml | 40 + .../Dao/DaoOrders2_S1_Insert.sql | 37 + .../Dao/DaoOrders2_S2_Select.xml | 26 + .../Dao/DaoOrders2_S3_Update.xml | 26 + .../Dao/DaoOrders2_S4_Delete.xml | 11 + .../Dao/SelectAllOrderID.xml | 9 + .../Dao/SelectInOrderID.xml | 25 + .../RerunnableBatch_sample3/MSGDefinition.xml | 23 + .../RerunnableBatch_sample3/Program.vb | 0 .../Properties/AssemblyInfo.vb | 0 .../RerunnableBatch_sample3.sln | 7 +- .../RerunnableBatch_sample3.vbproj | 8 +- .../RerunnableBatch_sample3/SPDefinition.xml | 15 + .../SampleLogConf2CS.xml | 133 ++ .../RerunnableBatch_sample3/app.config | 8 +- .../RerunnableBatch_sample3/readme.txt | 7 + .../SimpleBatch_sample/Business/LayerB.vb | 0 .../Common/TestParameterValue.vb | 0 .../Common/TestReturnValue.vb | 0 .../SimpleBatch_sample/Dao/DaoShippers.vb | 0 .../SimpleBatch_sample/Dao/LayerD.vb | 0 .../SimpleBatch_sample/MSGDefinition.xml | 23 + .../Bat_sample/SimpleBatch_sample/Module1.vb | 0 .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../SimpleBatch_sample/SPDefinition.xml | 15 + .../SimpleBatch_sample/SampleLogConf2CS.xml | 133 ++ .../SimpleBatch_sample/SimpleBatch_sample.sln | 7 +- .../SimpleBatch_sample.vbproj | 8 +- .../Bat_sample/SimpleBatch_sample/app.config | 8 +- .../Bat_sample/SimpleBatch_sample/readme.txt | 4 + .../WSClientWPF_sample/Application.xaml | 0 .../WSClientWPF_sample/Application.xaml.vb | 0 .../WSClientWPF_sample/AsyncFunc.vb | 0 .../WSClientWPF_sample/MSGDefinition.xml | 23 + .../My Project/AssemblyInfo.vb | 0 .../My Project/MyExtensions/MyWpfExtension.vb | 0 .../WSClientWPF_sample/SPDefinition.xml | 15 + .../WSClientWPF_sample/SampleLogConf2CS.xml | 133 ++ .../TMInProcessDefinition.xml | 18 + .../TMProtocolDefinition.xml | 44 + .../TMProtocolDefinition2.xml | 44 + .../WSClientWPF_sample/WSClientWPF_sample.sln | 7 +- .../WSClientWPF_sample.vbproj | 12 +- .../WSClientWPF_sample/Window0.xaml | 0 .../WSClientWPF_sample/Window0.xaml.vb | 0 .../WSClientWPF_sample/Window1.xaml | 0 .../WSClientWPF_sample/Window1.xaml.vb | 0 .../WSClientWPF_sample/app.config | 5 + .../WSClientWin2_sample/ByReturn.Designer.vb | 0 .../WSClientWin2_sample/ByReturn.vb | 0 .../WSClientWin2_sample/Form0.Designer.vb | 0 .../WSClientWin2_sample/Form0.resx | 120 ++ .../WSClientWin2_sample/Form0.vb | 0 .../WSClientWin2_sample/Form1.Designer.vb | 0 .../WSClientWin2_sample/Form1.resx | 120 ++ .../WSClientWin2_sample/Form1.vb | 0 .../WSClientWin2_sample/Form2.Designer.vb | 0 .../WSClientWin2_sample/Form2.resx | 120 ++ .../WSClientWin2_sample/Form2.vb | 0 .../WSClientWin2_sample/Form3.Designer.vb | 0 .../WSClientWin2_sample/Form3.resx | 0 .../WSClientWin2_sample/Form3.vb | 0 .../WSClientWin2_sample/Login.Designer.vb | 0 .../WSClientWin2_sample/Login.vb | 0 .../WSClientWin2_sample/MSGDefinition.xml | 23 + .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../WSClientWin2_sample/Program.vb | 0 .../WSClientWin2_sample/SPDefinition.xml | 15 + .../WSClientWin2_sample/SampleLogConf2CS.xml | 133 ++ .../WSClientWin2_sample/Splash.Designer.vb | 0 .../WSClientWin2_sample/Splash.resx | 120 ++ .../WSClientWin2_sample/Splash.vb | 0 .../UserControl3.Designer.vb | 0 .../WSClientWin2_sample/UserControl3.resx | 1115 ++++++++++ .../WSClientWin2_sample/UserControl3.vb | 0 .../UserControlChild.Designer.vb | 0 .../WSClientWin2_sample/UserControlChild.resx | 0 .../WSClientWin2_sample/UserControlChild.vb | 0 .../UserControlParent.Designer.vb | 0 .../UserControlParent.resx | 120 ++ .../WSClientWin2_sample/UserControlParent.vb | 0 .../WSClientWin2_sample.sln | 7 +- .../WSClientWin2_sample.vbproj | 12 +- .../WSClientWin2_sample/app.config | 4 + .../WSClientWin_sample/AsyncFunc.vb | 0 .../WSClientWin_sample/Form1.Designer.vb | 0 .../WSClientWin_sample/Form1.resx | 0 .../WSClientWin_sample/Form1.vb | 0 .../WSClientWin_sample/Login.Designer.vb | 0 .../WSClientWin_sample/Login.resx | 120 ++ .../WSClientWin_sample/Login.vb | 0 .../WSClientWin_sample/MSGDefinition.xml | 23 + .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../WSClientWin_sample/Program.vb | 0 .../WSClientWin_sample/SPDefinition.xml | 15 + .../WSClientWin_sample/SampleLogConf2CS.xml | 133 ++ .../WSClientWin_sample/Splash.Designer.vb | 0 .../WSClientWin_sample/Splash.resx | 120 ++ .../WSClientWin_sample/Splash.vb | 0 .../TMInProcessDefinition.xml | 18 + .../TMProtocolDefinition.xml | 44 + .../TMProtocolDefinition2.xml | 44 + .../WSClientWin_sample/WSClientWin_sample.sln | 7 +- .../WSClientWin_sample.vbproj | 12 +- .../WSClientWin_sample/app.config | 8 +- .../WSClientWin_sample/packages.config | 8 +- .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../WSIFType_sample/TestParameterValue.vb | 0 .../WSIFType_sample/TestReturnValue.vb | 0 .../WSIFType_sample/WSIFType_sample.vbproj | 6 +- .../WSServer_sample/Business/LayerB.vb | 0 .../WSServer_sample/Dao/DaoShippers.vb | 0 .../WS_sample/WSServer_sample/Dao/LayerD.vb | 0 .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../WSServer_sample/WSServer_sample.sln | 7 +- .../WSServer_sample/WSServer_sample.vbproj | 8 +- .../WebApp_sample/MVC_Sample/MVC_Sample.sln | 7 +- .../MVC_Sample/App_Start/BundleConfig.vb | 0 .../MVC_Sample/App_Start/FilterConfig.vb | 0 .../MVC_Sample/App_Start/RouteConfig.vb | 0 .../MVC_Sample/App_Start/WebApiConfig.vb | 0 .../MVC_Sample}/Content/app/Site.css | 0 .../MVC_Sample/Content/bootstrap-grid.css | 0 .../MVC_Sample/Content/bootstrap-grid.css.map | 0 .../MVC_Sample/Content/bootstrap-grid.min.css | 0 .../Content/bootstrap-grid.min.css.map | 0 .../MVC_Sample/Content/bootstrap-reboot.css | 0 .../Content/bootstrap-reboot.css.map | 0 .../Content/bootstrap-reboot.min.css | 0 .../Content/bootstrap-reboot.min.css.map | 0 .../MVC_Sample/Content/bootstrap.css | 0 .../MVC_Sample/Content/bootstrap.css.map | 0 .../MVC_Sample/Content/bootstrap.min.css | 0 .../MVC_Sample/Content/bootstrap.min.css.map | 0 .../MVC_Sample/Content/font-awesome.css | 0 .../MVC_Sample/Content/font-awesome.min.css | 0 .../MVC_Sample/Content/touryo/Style.css | 205 ++ .../MVC_Sample/Controllers/Crud1Controller.vb | 0 .../MVC_Sample/Controllers/Crud2Controller.vb | 0 .../MVC_Sample/Controllers/ErrorController.vb | 0 .../MVC_Sample/Controllers/HomeController.vb | 0 .../MVC_Sample/Controllers/PingController.vb | 0 .../MVC_Sample/MVC_Sample/Global.asax | 0 .../MVC_Sample/MVC_Sample/Global.asax.vb | 0 .../MVC_Sample/MVC_Sample/Index.html | 0 .../MVC_Sample/Logic/Business/LayerB.vb | 0 .../Logic/Common/TestParameterValue.vb | 0 .../Logic/Common/TestReturnValue.vb | 0 .../MVC_Sample/Logic/Dao/DaoShippers.vb | 0 .../MVC_Sample/MVC_Sample/Logic/Dao/LayerD.vb | 0 .../MVC_Sample/MVC_Sample/MVC_Sample.vbproj | 25 +- .../Models/ViewModels/BaseViewModel.vb | 0 .../Models/ViewModels/CrudViweModel.vb | 0 .../Models/ViewModels/LoginViewModel.vb | 0 .../Models/ViewModels/ShipperViweModel.vb | 0 .../Models/ViewModels/TestShipperViweModel.vb | 0 .../MVC_Sample/My Project/AssemblyInfo.vb | 0 .../MVC_Sample/MVC_Sample/Scripts/README.md | 0 .../MVC_Sample/MVC_Sample/Scripts/app/Site.js | 0 .../MVC_Sample/Scripts/bootstrap.bundle.js | 0 .../Scripts/bootstrap.bundle.js.map | 0 .../Scripts/bootstrap.bundle.min.js | 0 .../Scripts/bootstrap.bundle.min.js.map | 0 .../MVC_Sample/Scripts/bootstrap.js | 0 .../MVC_Sample/Scripts/bootstrap.js.map | 0 .../MVC_Sample/Scripts/bootstrap.min.js | 0 .../MVC_Sample/Scripts/bootstrap.min.js.map | 0 .../MVC_Sample/Scripts/esm/popper-utils.js | 0 .../Scripts/esm/popper-utils.js.map | 0 .../Scripts/esm/popper-utils.min.js | 0 .../Scripts/esm/popper-utils.min.js.map | 0 .../MVC_Sample/Scripts/esm/popper.js | 0 .../MVC_Sample/Scripts/esm/popper.js.map | 0 .../MVC_Sample/Scripts/esm/popper.min.js | 0 .../MVC_Sample/Scripts/esm/popper.min.js.map | 0 .../MVC_Sample/MVC_Sample/Scripts/index.d.ts | 0 .../Scripts/jquery-3.4.1.intellisense.js | 0 .../MVC_Sample/Scripts/jquery-3.4.1.js | 0 .../MVC_Sample/Scripts/jquery-3.4.1.min.js | 0 .../MVC_Sample/Scripts/jquery-3.4.1.min.map | 0 .../MVC_Sample/Scripts/jquery-3.4.1.slim.js | 0 .../Scripts/jquery-3.4.1.slim.min.js | 0 .../Scripts/jquery-3.4.1.slim.min.map | 0 .../Scripts/jquery.unobtrusive-ajax.js | 0 .../Scripts/jquery.unobtrusive-ajax.min.js | 0 .../Scripts/jquery.validate-vsdoc.js | 0 .../MVC_Sample/Scripts/jquery.validate.js | 0 .../MVC_Sample/Scripts/jquery.validate.min.js | 0 .../Scripts/jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../MVC_Sample/Scripts/modernizr-2.8.3.js | 0 .../MVC_Sample/Scripts/popper-utils.js | 0 .../MVC_Sample/Scripts/popper-utils.js.map | 0 .../MVC_Sample/Scripts/popper-utils.min.js | 0 .../Scripts/popper-utils.min.js.map | 0 .../MVC_Sample/MVC_Sample/Scripts/popper.js | 0 .../MVC_Sample/Scripts/popper.js.map | 0 .../MVC_Sample/Scripts/popper.min.js | 0 .../MVC_Sample/Scripts/popper.min.js.map | 0 .../MVC_Sample/MVC_Sample/Scripts/respond.js | 0 .../Scripts/respond.matchmedia.addListener.js | 0 .../respond.matchmedia.addListener.min.js | 0 .../MVC_Sample/Scripts/respond.min.js | 0 .../MVC_Sample/Scripts/touryo/common.js | 819 ++++++++ .../MVC_Sample}/Scripts/touryo/else.js | 0 .../MVC_Sample/Scripts/umd/popper-utils.js | 0 .../Scripts/umd/popper-utils.js.map | 0 .../Scripts/umd/popper-utils.min.js | 0 .../Scripts/umd/popper-utils.min.js.map | 0 .../MVC_Sample/Scripts/umd/popper.js | 0 .../MVC_Sample/Scripts/umd/popper.js.map | 0 .../MVC_Sample/Scripts/umd/popper.min.js | 0 .../MVC_Sample/Scripts/umd/popper.min.js.map | 0 .../MVC_Sample/MVC_Sample/Startup.vb | 0 .../MVC_Sample/Views/Crud1/Index.cshtml | 0 .../MVC_Sample/Views/Crud1/_ChartView.cshtml | 46 + .../Views/Crud1/_MessageView.cshtml | 24 + .../MVC_Sample/Views/Crud2/Index.cshtml | 0 .../MVC_Sample/Views/Crud2/_ChartView.cshtml | 46 + .../Views/Crud2/_MessageView.cshtml | 0 .../MVC_Sample/Views/Error/Index.cshtml | 0 .../MVC_Sample/Views/Home/Index.cshtml | 0 .../MVC_Sample/Views/Home/Login.cshtml | 0 .../MVC_Sample/Views/Home/Scroll.cshtml | 0 .../MVC_Sample/Views/Shared/Error.cshtml | 0 .../MVC_Sample/Views/Shared/_Layout.cshtml | 0 .../MVC_Sample/MVC_Sample/Views/Web.config | 0 .../MVC_Sample/Views/_ViewStart.cshtml | 0 .../MVC_Sample/MVC_Sample/Web.Debug.config | 0 .../MVC_Sample/MVC_Sample/Web.Release.config | 0 .../MVC_Sample/MVC_Sample/Web.config | 38 +- .../MVC_Sample/MVC_Sample/app.config | 0 .../MVC_Sample/fonts/FontAwesome.otf | Bin .../MVC_Sample/fonts/fontawesome-webfont.eot | Bin .../MVC_Sample/fonts/fontawesome-webfont.svg | 0 .../MVC_Sample/fonts/fontawesome-webfont.ttf | Bin .../MVC_Sample/fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../MVC_Sample}/images/touryo/loading.gif | Bin .../MVC_Sample}/images/touryo/logo.png | Bin .../MVC_Sample/MVC_Sample/packages.config | 74 +- .../WebForms_Sample/WebForms_Sample.sln | 7 +- .../3TierTableAdapter/ProductsTableAdapter.vb | 0 .../AppCode/sample/Business/GetMasterData.vb | 0 .../AppCode/sample/Business/LayerB.vb | 0 .../sample/Common/TestParameterValue.vb | 0 .../AppCode/sample/Common/TestReturnValue.vb | 0 .../AppCode/sample/Dao/DaoCategories.vb | 0 .../AppCode/sample/Dao/DaoShippers.vb | 0 .../AppCode/sample/Dao/DaoSuppliers.vb | 0 .../AppCode/sample/Dao/LayerD.vb | 0 .../AppCode/testPublic/Business/TestMTC.vb | 0 .../testPublic/Business/TestMTC_mcn.vb | 0 .../testPublic/Business/TestMTC_txg.vb | 0 .../WebForms_Sample/App_Start/BundleConfig.vb | 0 .../WebForms_Sample/App_Start/RouteConfig.vb | 0 .../Aspx/Common/ErrorScreen.aspx | 0 .../Aspx/Common/ErrorScreen.aspx.designer.vb | 0 .../Aspx/Common/ErrorScreen.aspx.vb | 0 .../Aspx/Common/Master/sampleScreen.master | 0 .../Master/sampleScreen.master.designer.vb | 0 .../Aspx/Common/Master/sampleScreen.master.vb | 0 .../testAspNetAjaxExtension_Separate.master | 0 ...tAjaxExtension_Separate.master.designer.vb | 0 ...testAspNetAjaxExtension_Separate.master.vb | 0 .../testAspNetAjaxExtension_Single.master | 0 ...NetAjaxExtension_Single.master.designer.vb | 0 .../testAspNetAjaxExtension_Single.master.vb | 0 .../Aspx/Common/Master/testBlankScreen.master | 0 .../Master/testBlankScreen.master.designer.vb | 0 .../Common/Master/testBlankScreen.master.vb | 0 .../Common/Master/testBlankScreenNoJs.master | 0 .../testBlankScreenNoJs.master.designer.vb | 0 .../Master/testBlankScreenNoJs.master.vb | 0 .../Common/Master/testClientCallback.master | 0 .../testClientCallback.master.designer.vb | 0 .../Master/testClientCallback.master.vb | 0 .../Master/testNest/branchMasterPage1.master | 0 .../branchMasterPage1.master.designer.vb | 0 .../testNest/branchMasterPage1.master.vb | 0 .../Master/testNest/branchMasterPage2.master | 0 .../branchMasterPage2.master.designer.vb | 0 .../testNest/branchMasterPage2.master.vb | 0 .../Master/testNest/noBaseMasterPage.master | 0 .../noBaseMasterPage.master.designer.vb | 0 .../testNest/noBaseMasterPage.master.vb | 0 .../Master/testNest/rootMasterPage.master | 0 .../rootMasterPage.master.designer.vb | 0 .../Master/testNest/rootMasterPage.master.vb | 0 .../Master/testNest/testScreen1bmp1.master | 0 .../testScreen1bmp1.master.designer.vb | 0 .../Master/testNest/testScreen1bmp1.master.vb | 0 .../Master/testNest/testScreen1bmp2.master | 0 .../testScreen1bmp2.master.designer.vb | 0 .../Master/testNest/testScreen1bmp2.master.vb | 0 .../Master/testNest/testScreen2bmp1.master | 0 .../testScreen2bmp1.master.designer.vb | 0 .../Master/testNest/testScreen2bmp1.master.vb | 0 .../Master/testNest/testScreen2bmp2.master | 0 .../testScreen2bmp2.master.designer.vb | 0 .../Master/testNest/testScreen2bmp2.master.vb | 0 .../Aspx/Common/Master/testScreen1.master | 0 .../Master/testScreen1.master.designer.vb | 0 .../Aspx/Common/Master/testScreen1.master.vb | 0 .../Aspx/Common/Master/testScreen2.master | 0 .../Master/testScreen2.master.designer.vb | 0 .../Aspx/Common/Master/testScreen2.master.vb | 0 .../Aspx/Common/Master/testScreenCtrl.master | 0 .../Master/testScreenCtrl.master.designer.vb | 0 .../Common/Master/testScreenCtrl.master.vb | 0 .../Aspx/Common/Wuc/sampleChildControl.ascx | 0 .../Wuc/sampleChildControl.ascx.designer.vb | 0 .../Common/Wuc/sampleChildControl.ascx.vb | 0 .../Aspx/Common/Wuc/sampleControl.ascx | 0 .../Common/Wuc/sampleControl.ascx.designer.vb | 0 .../Aspx/Common/Wuc/sampleControl.ascx.vb | 0 .../Aspx/Framework/DialogFrame.htm | 0 .../Aspx/Framework/DialogLoader.htm | 0 .../WebForms_Sample/Aspx/Framework/Ping.aspx | 0 .../Aspx/Framework/Ping.aspx.designer.vb | 0 .../Aspx/Framework/Ping.aspx.vb | 0 .../Aspx/Framework/myOKMessageDialog.aspx | 0 .../myOKMessageDialog.aspx.designer.vb | 0 .../Aspx/Framework/myOKMessageDialog.aspx.vb | 0 .../Aspx/Framework/myYesNoMessageDialog.aspx | 0 .../myYesNoMessageDialog.aspx.designer.vb | 0 .../Framework/myYesNoMessageDialog.aspx.vb | 0 .../OAuth2AuthorizationCodeGrantClient.aspx | 0 ...horizationCodeGrantClient.aspx.designer.vb | 0 ...OAuth2AuthorizationCodeGrantClient.aspx.vb | 0 .../3Tier/ProductsConditionalSearch.aspx | 0 ...ProductsConditionalSearch.aspx.designer.vb | 0 .../3Tier/ProductsConditionalSearch.aspx.vb | 0 .../Aspx/sample/3Tier/ProductsDetail.aspx | 0 .../3Tier/ProductsDetail.aspx.designer.vb | 0 .../Aspx/sample/3Tier/ProductsDetail.aspx.vb | 0 .../sample/3Tier/ProductsSearchAndUpdate.aspx | 0 .../ProductsSearchAndUpdate.aspx.designer.vb | 0 .../3Tier/ProductsSearchAndUpdate.aspx.vb | 0 .../Aspx/sample/crud/sampleScreen.aspx | 0 .../sample/crud/sampleScreen.aspx.designer.vb | 0 .../Aspx/sample/crud/sampleScreen.aspx.vb | 0 .../Aspx/sample/crud/sampleScreen_cc.aspx | 0 .../crud/sampleScreen_cc.aspx.designer.vb | 0 .../Aspx/sample/crud/sampleScreen_cc.aspx.vb | 0 .../WebForms_Sample/Aspx/start/login.aspx | 0 .../Aspx/start/login.aspx.designer.vb | 0 .../WebForms_Sample/Aspx/start/login.aspx.vb | 0 .../WebForms_Sample/Aspx/start/logout.aspx | 0 .../Aspx/start/logout.aspx.designer.vb | 0 .../WebForms_Sample/Aspx/start/logout.aspx.vb | 0 .../WebForms_Sample/Aspx/start/menu.aspx | 0 .../Aspx/start/menu.aspx.designer.vb | 0 .../WebForms_Sample/Aspx/start/menu.aspx.vb | 0 .../nest/testNestMasterScreen.aspx | 0 .../testNestMasterScreen.aspx.designer.vb | 0 .../nest/testNestMasterScreen.aspx.vb | 0 .../testFxLayerP/nest/testScreen1nest.aspx | 0 .../nest/testScreen1nest.aspx.designer.vb | 0 .../testFxLayerP/nest/testScreen1nest.aspx.vb | 0 .../testFxLayerP/nest/testScreen2nest.aspx | 0 .../nest/testScreen2nest.aspx.designer.vb | 0 .../testFxLayerP/nest/testScreen2nest.aspx.vb | 0 .../normal/noBaseMasterScreen.aspx | 0 .../noBaseMasterScreen.aspx.designer.vb | 0 .../normal/noBaseMasterScreen.aspx.vb | 0 .../testFxLayerP/normal/noMasterScreen.aspx | 0 .../normal/noMasterScreen.aspx.designer.vb | 0 .../normal/noMasterScreen.aspx.vb | 0 .../Aspx/testFxLayerP/normal/testScreen0.aspx | 0 .../normal/testScreen0.aspx.designer.vb | 0 .../testFxLayerP/normal/testScreen0.aspx.vb | 0 .../Aspx/testFxLayerP/normal/testScreen1.aspx | 0 .../normal/testScreen1.aspx.designer.vb | 0 .../testFxLayerP/normal/testScreen1.aspx.vb | 0 .../Aspx/testFxLayerP/normal/testScreen2.aspx | 0 .../normal/testScreen2.aspx.designer.vb | 0 .../testFxLayerP/normal/testScreen2.aspx.vb | 0 .../Aspx/testFxLayerP/table/testGridView.aspx | 0 .../table/testGridView.aspx.designer.vb | 0 .../testFxLayerP/table/testGridView.aspx.vb | 0 .../testFxLayerP/table/testJQGridJson.aspx | 0 .../table/testJQGridJson.aspx.designer.vb | 0 .../testFxLayerP/table/testJQGridJson.aspx.vb | 0 .../Aspx/testFxLayerP/table/testListView.aspx | 0 .../table/testListView.aspx.designer.vb | 0 .../testFxLayerP/table/testListView.aspx.vb | 0 .../Aspx/testFxLayerP/table/testRepeater.aspx | 0 .../table/testRepeater.aspx.designer.vb | 0 .../testFxLayerP/table/testRepeater.aspx.vb | 0 .../Aspx/testFxLayerP/testDLFrame.aspx | 0 .../testFxLayerP/testDLFrame.aspx.designer.vb | 0 .../Aspx/testFxLayerP/testDLFrame.aspx.vb | 0 .../Aspx/testFxLayerP/testDLScreen.aspx | 0 .../testDLScreen.aspx.designer.vb | 0 .../Aspx/testFxLayerP/testDLScreen.aspx.vb | 0 .../Aspx/testFxLayerP/testDialogAtOnLoad.aspx | 0 .../testDialogAtOnLoad.aspx.designer.vb | 0 .../testFxLayerP/testDialogAtOnLoad.aspx.vb | 0 .../testTransitionAheadScreen.aspx | 0 ...testTransitionAheadScreen.aspx.designer.vb | 0 .../testTransitionAheadScreen.aspx.vb | 0 .../Aspx/testFxLayerP/wcc/testWCTextBox.aspx | 0 .../wcc/testWCTextBox.aspx.designer.vb | 0 .../testFxLayerP/wcc/testWCTextBox.aspx.vb | 0 .../withAjax/testClientCallback.aspx | 0 .../testClientCallback.aspx.designer.vb | 0 .../withAjax/testClientCallback.aspx.vb | 0 .../withAjax/testExtension_Separate.aspx | 0 .../testExtension_Separate.aspx.designer.vb | 0 .../withAjax/testExtension_Separate.aspx.vb | 0 .../withAjax/testExtension_Single.aspx | 0 .../testExtension_Single.aspx.designer.vb | 0 .../withAjax/testExtension_Single.aspx.vb | 0 .../Aspx/testScreenCtrl/Google.PNG | Bin .../Aspx/testScreenCtrl/WebForm0.aspx | 0 .../testScreenCtrl/WebForm0.aspx.designer.vb | 0 .../Aspx/testScreenCtrl/WebForm0.aspx.vb | 0 .../Aspx/testScreenCtrl/WebForm1.aspx | 0 .../testScreenCtrl/WebForm1.aspx.designer.vb | 0 .../Aspx/testScreenCtrl/WebForm1.aspx.vb | 0 .../Aspx/testScreenCtrl/WebForm2.aspx | 0 .../testScreenCtrl/WebForm2.aspx.designer.vb | 0 .../Aspx/testScreenCtrl/WebForm2.aspx.vb | 0 .../Aspx/testScreenCtrl/WebForm3.aspx | 0 .../testScreenCtrl/WebForm3.aspx.designer.vb | 0 .../Aspx/testScreenCtrl/WebForm3.aspx.vb | 0 .../Aspx/testScreenCtrl/WebForm4.aspx | 0 .../testScreenCtrl/WebForm4.aspx.designer.vb | 0 .../Aspx/testScreenCtrl/WebForm4.aspx.vb | 0 .../Aspx/testScreenCtrl/WebForm5.aspx | 0 .../testScreenCtrl/WebForm5.aspx.designer.vb | 0 .../Aspx/testScreenCtrl/WebForm5.aspx.vb | 0 .../Aspx/testScreenCtrl/sc1.PNG | Bin .../Aspx/testScreenCtrl/sc2.PNG | Bin .../Aspx/testScreenCtrl/sc3.PNG | Bin .../Aspx/testScreenCtrl/sc4.PNG | Bin .../Aspx/testScreenCtrl/sc5.PNG | Bin .../WebForms_Sample/Bundle.config | 0 .../WebForms_Sample/Content/app/Site.css | 9 + .../Content/bootstrap-grid.css | 0 .../Content/bootstrap-grid.css.map | 0 .../Content/bootstrap-grid.min.css | 0 .../Content/bootstrap-grid.min.css.map | 0 .../Content/bootstrap-reboot.css | 0 .../Content/bootstrap-reboot.css.map | 0 .../Content/bootstrap-reboot.min.css | 0 .../Content/bootstrap-reboot.min.css.map | 0 .../WebForms_Sample/Content/bootstrap.css | 0 .../WebForms_Sample/Content/bootstrap.css.map | 0 .../WebForms_Sample/Content/bootstrap.min.css | 0 .../Content/bootstrap.min.css.map | 0 .../WebForms_Sample/Content/font-awesome.css | 0 .../Content/font-awesome.min.css | 0 .../WebForms_Sample/Content/touryo/Style.css | 0 .../WebForms_Sample/Global.asax | 0 .../WebForms_Sample/Global.asax.vb | 0 .../WebForms_Sample/Index.html | 0 .../My Project/AssemblyInfo.vb | 0 .../WebForms_Sample/Scripts/README.md | 0 .../Scripts/WebForms/DetailsView.js | 0 .../WebForms_Sample/Scripts/WebForms/Focus.js | 0 .../Scripts/WebForms/GridView.js | 0 .../Scripts/WebForms/MSAjax/MicrosoftAjax.js | 0 .../MicrosoftAjaxApplicationServices.js | 0 .../MSAjax/MicrosoftAjaxComponentModel.js | 0 .../WebForms/MSAjax/MicrosoftAjaxCore.js | 0 .../MSAjax/MicrosoftAjaxGlobalization.js | 0 .../WebForms/MSAjax/MicrosoftAjaxHistory.js | 0 .../WebForms/MSAjax/MicrosoftAjaxNetwork.js | 0 .../MSAjax/MicrosoftAjaxSerialization.js | 0 .../WebForms/MSAjax/MicrosoftAjaxTimer.js | 0 .../WebForms/MSAjax/MicrosoftAjaxWebForms.js | 0 .../MSAjax/MicrosoftAjaxWebServices.js | 0 .../WebForms_Sample/Scripts/WebForms/Menu.js | 0 .../Scripts/WebForms/MenuStandards.js | 0 .../Scripts/WebForms/SmartNav.js | 0 .../Scripts/WebForms/TreeView.js | 0 .../Scripts/WebForms/WebForms.js | 0 .../Scripts/WebForms/WebParts.js | 0 .../Scripts/WebForms/WebUIValidation.js | 0 .../WebForms_Sample/Scripts/app/Site.js | 0 .../Scripts/bootstrap.bundle.js | 0 .../Scripts/bootstrap.bundle.js.map | 0 .../Scripts/bootstrap.bundle.min.js | 0 .../Scripts/bootstrap.bundle.min.js.map | 0 .../WebForms_Sample/Scripts/bootstrap.js | 0 .../WebForms_Sample/Scripts/bootstrap.js.map | 0 .../WebForms_Sample/Scripts/bootstrap.min.js | 0 .../Scripts/bootstrap.min.js.map | 0 .../Scripts/esm/popper-utils.js | 0 .../Scripts/esm/popper-utils.js.map | 0 .../Scripts/esm/popper-utils.min.js | 0 .../Scripts/esm/popper-utils.min.js.map | 0 .../WebForms_Sample/Scripts/esm/popper.js | 0 .../WebForms_Sample/Scripts/esm/popper.js.map | 0 .../WebForms_Sample/Scripts/esm/popper.min.js | 0 .../Scripts/esm/popper.min.js.map | 0 .../WebForms_Sample/Scripts/index.d.ts | 0 .../Scripts/jquery-3.4.1.intellisense.js | 0 .../WebForms_Sample/Scripts/jquery-3.4.1.js | 0 .../Scripts/jquery-3.4.1.min.js | 0 .../Scripts/jquery-3.4.1.min.map | 0 .../Scripts/jquery-3.4.1.slim.js | 0 .../Scripts/jquery-3.4.1.slim.min.js | 0 .../Scripts/jquery-3.4.1.slim.min.map | 0 .../Scripts/modernizr-2.8.3.js | 0 .../WebForms_Sample/Scripts/popper-utils.js | 0 .../Scripts/popper-utils.js.map | 0 .../Scripts/popper-utils.min.js | 0 .../Scripts/popper-utils.min.js.map | 0 .../WebForms_Sample/Scripts/popper.js | 0 .../WebForms_Sample/Scripts/popper.js.map | 0 .../WebForms_Sample/Scripts/popper.min.js | 0 .../WebForms_Sample/Scripts/popper.min.js.map | 0 .../WebForms_Sample/Scripts/respond.js | 0 .../Scripts/respond.matchmedia.addListener.js | 0 .../respond.matchmedia.addListener.min.js | 0 .../WebForms_Sample/Scripts/respond.min.js | 0 .../WebForms_Sample/Scripts/touryo/common.js | 0 .../WebForms_Sample/Scripts/touryo/else.js | 64 + .../Scripts/touryo/ie_key_event.js | 0 .../Scripts/umd/popper-utils.js | 0 .../Scripts/umd/popper-utils.js.map | 0 .../Scripts/umd/popper-utils.min.js | 0 .../Scripts/umd/popper-utils.min.js.map | 0 .../WebForms_Sample/Scripts/umd/popper.js | 0 .../WebForms_Sample/Scripts/umd/popper.js.map | 0 .../WebForms_Sample/Scripts/umd/popper.min.js | 0 .../Scripts/umd/popper.min.js.map | 0 .../WebForms_Sample/Startup.vb | 0 .../WebForms_Sample/Web.Debug.config | 0 .../WebForms_Sample/Web.Release.config | 0 .../WebForms_Sample/WebForms_Sample.vbproj | 45 +- .../WebService/IJSONService.vb | 0 .../WebService/JSONService.svc | 0 .../WebService/JSONService.svc.vb | 0 .../WebForms_Sample/app.config | 0 .../WebForms_Sample/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../WebForms_Sample/images/touryo/error.ico | Bin .../WebForms_Sample/images/touryo/image.jpg | Bin .../images/touryo/information.ico | Bin .../WebForms_Sample/images/touryo/loading.gif | Bin 0 -> 32137 bytes .../WebForms_Sample/images/touryo/logo.png | Bin 0 -> 203101 bytes .../images/touryo/question.ico | Bin .../WebForms_Sample/images/touryo/warning.ico | Bin .../WebForms_Sample/packages.config | 52 +- .../WebForms_Sample/web.config | 4 +- ... a double-click to build bat file here.txt | 0 .../programs/VB/z_Common.bat | 19 +- .../programs/VB/z_Common2.bat | 0 .../programs/nuget.exe | Bin 3105 files changed, 56721 insertions(+), 1778 deletions(-) delete mode 100644 root_VS2015/programs/CS/0_ExecAllBat.bat delete mode 100644 root_VS2015/programs/CS/Frameworks/Infrastructure/Business/app.config delete mode 100644 root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config delete mode 100644 root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config delete mode 100644 root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config delete mode 100644 root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config delete mode 100644 root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config delete mode 100644 root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config delete mode 100644 root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config delete mode 100644 root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb delete mode 100644 root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb delete mode 100644 root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb delete mode 100644 root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb rename {root_VS2015 => root_VS2022}/README.md (70%) rename {root_VS2015 => root_VS2022}/Readme.ja.md (72%) rename {root_VS2015 => root_VS2022}/files/resource/Log/Examples of rolling of date+size.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Log/Log4NetConfigTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Log/SampleLogConf.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Log/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Log/SampleLogConfMobile.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Log/SampleLogConfWebService.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoCategories_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoProducts_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoProducts_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoProducts_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoProducts_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoProducts_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoShippers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/DaoSuppliers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/db2/TestTable.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/hirdb/TestTable.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/mysql/TestTable.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/Configuration steps ODBC.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/DaoShippers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/ole_odbc/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2DataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert_org.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/SCOTT.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/oracle/TestTable.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/pstgrs/TestTable.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/1.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/2.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/3.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/A.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/B.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/C.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DBTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DotNetTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DBTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DotNetTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1DataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2DataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3DataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableADataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2DataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesDataSet.xsd (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.cs (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.vb (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert_org.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ScreenAutoGen/CreateTable.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/CreateTable.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/DaoTABL2_TABL1_JOIN_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperCount.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperCount.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperDelete.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperDelete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperInsert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperSelect.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperSelect.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperSelectOrder.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperSelectOrder.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperUpdate.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/ShipperUpdate.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/TestTable.txt (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/ddef.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DBTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DotNetTypeInfo.csv (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetProcessingWfRequest.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyToUser.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyWorkflow.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackToUser.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow2.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetWfRequest.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Count.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Move.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_ALL TABLE.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_WF_DEF.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User(sample).sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User_Insert(sample).sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_CurrentWorkflow.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_Workflow.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_WorkflowHistory.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/instnwnd.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/Sql/sqlserver/instpubs.sql (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/GenDsaCertByOpenSSL.bat (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/GenECDsaCertByOpenSSL.bat (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/GenRsaCertByOpenSSL.bat (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256DSA.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256DSA.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256ECDSA.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256ECDSA.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256ECDSA_Client.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256ECDSA_Client.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256ECDSA_Server.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256ECDSA_Server.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSA.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSA.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSAClientCert.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSA_Client.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSA_Client.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSA_Server.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA256RSA_Server.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA384ECDSA.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA384ECDSA.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA521ECDSA.cer (100%) rename {root_VS2015 => root_VS2022}/files/resource/X509/SHA521ECDSA.pfx (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/MSGDefinition_ja.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/MSGDefinition_zh-CN.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/SCDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/TCDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/TMInProcessDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/TMProtocolDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/files/resource/Xml/TMProtocolDefinition2.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/ConditionalSearch.aspx (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/ConditionalSearch.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/ConditionalSearch.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DaoTemplate.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DaoTemplate.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DaoTemplate2.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DaoTemplate2.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DaoTemplate3.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DaoTemplate3.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/DataSetTemplate.xsd (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/Detail.aspx (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/Detail.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/Detail.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/EntityTemplate.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/EntityTemplate.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/EntityTemplate_bk.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/EntityTemplate_bk.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/SearchAndUpdate.aspx (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/SearchAndUpdate.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/SearchAndUpdate.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/TableAdapter.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/TableAdapter.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_Detail.aspx (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_Detail.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_Detail.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/d1_DynInsTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/d2_DynSelTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/d3_DynUpdTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/d4_DynDelTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/d5_DynSelCntTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/s1_InsertTemplate.sql (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/s2_SelectTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/s3_UpdateTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/DGenTemplates/s4_DeleteTemplate.xml (100%) rename {root_VS2015 => root_VS2022}/files/tools/Doxyfile/doxygen.zip (100%) rename {root_VS2015 => root_VS2022}/files/tools/Doxyfile/readme.txt (100%) rename {root_VS2015 => root_VS2022}/files/tools/WinMergeFilters/touryo.flt (100%) rename {root_VS2015 => root_VS2022}/files/tools/WinMergeFilters/touryofull.flt (100%) create mode 100644 root_VS2022/programs/CS/0_ExecAllBat.bat create mode 100644 root_VS2022/programs/CS/10_Build_WebAppCore_sample.bat rename {root_VS2015 => root_VS2022}/programs/CS/10_Build_WebApp_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/CS/1_DeleteDir.bat (100%) rename {root_VS2015 => root_VS2022}/programs/CS/1_DeleteFile.bat (100%) rename root_VS2015/programs/VB/3_Build_BusinessRichClient_net46.bat => root_VS2022/programs/CS/3_Build_BusinessRichClient_net48.bat (95%) create mode 100644 root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat rename root_VS2015/programs/CS/3_Build_Business_net46.bat => root_VS2022/programs/CS/3_Build_Business_net48.bat (91%) create mode 100644 root_VS2022/programs/CS/3_Build_Business_netcore50.bat rename {root_VS2015 => root_VS2022}/programs/CS/4_Build_Framework_Tool.bat (100%) create mode 100644 root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat create mode 100644 root_VS2022/programs/CS/5_Build_2CSCore_sample.bat rename {root_VS2015 => root_VS2022}/programs/CS/5_Build_2CS_sample.bat (100%) create mode 100644 root_VS2022/programs/CS/5_Build_BatCore_sample.bat rename {root_VS2015 => root_VS2022}/programs/CS/5_Build_Bat_sample.bat (100%) create mode 100644 root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat rename {root_VS2015 => root_VS2022}/programs/CS/6_Build_WSSrv_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/CS/7_Build_Framework_WS.bat (100%) create mode 100644 root_VS2022/programs/CS/7_Build_Framework_WSCore.bat create mode 100644 root_VS2022/programs/CS/8_Build_WSClntCore_sample.bat rename {root_VS2015 => root_VS2022}/programs/CS/8_Build_WSClnt_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Business/MyBaseLogic.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Business/_3TierEngine.cs (100%) rename root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business_net46.csproj => root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj (84%) create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Common/MuParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Common/MuReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Common/MyParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Common/MyReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Dao/CmnDao.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Dao/MyBaseDao.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/AuthenticationFailureResult.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiControllerCore.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyMVCCoreFilterAttribute.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Presentation/ResultWithChallenge.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs (63%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs (63%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.cs (100%) rename root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.csproj => root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj (51%) create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config (68%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/GMTMaster.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MyAttribute.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MyCmnFunction.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MyLiteral.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MySubsysInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZone.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/Business/Util/MyUserInfo.cs (100%) rename {root_VS2015/programs/VB => root_VS2022/programs/CS}/Frameworks/Infrastructure/Business/app.config (80%) rename {root_VS2015/programs/VB => root_VS2022/programs/CS}/Frameworks/Infrastructure/Business/packages.config (66%) rename root_VS2015/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net46.sln => root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln (81%) create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln rename root_VS2015/programs/CS/Frameworks/Infrastructure/Business_net46.sln => root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln (81%) create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.cs (100%) rename root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net46.csproj => root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj (92%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CheckResult.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Function/ListItem.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/ICheck.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs (100%) rename root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.csproj => root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj (56%) create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.cs (100%) rename {root_VS2015/programs/VB/Frameworks/Infrastructure/Business => root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl}/RichClient/packages.config (68%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/CustomControl/app.config (100%) rename {root_VS2015/programs/VB => root_VS2022/programs/CS}/Frameworks/Infrastructure/CustomControl/packages.config (70%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln (83%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj (72%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config (91%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/app.config (100%) create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/ValuesController.cs create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Program.cs create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Properties/launchSettings.json create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Startup.cs create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.Development.json create mode 100644 root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config (94%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj (93%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln (82%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.cs (100%) rename {root_VS2015/programs/VB => root_VS2022/programs/CS}/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config (91%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/CheckException.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/CmnMethods.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj (93%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln (82%) create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/DummyDaps.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Literal.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config (97%) create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DPQuery_Tool/demo.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/CColumn.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/CTable.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/CheckException.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/CmnMethods.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj (95%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln (82%) create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/downarrow.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/like.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/rightarrow.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config (97%) create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj (95%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln (83%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config (84%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config (95%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj (93%) create mode 100644 root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs (100%) create mode 100644 root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj (93%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln (90%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.resx (100%) rename {root_VS2015/programs/VB => root_VS2022/programs/CS}/Samples/2CS_sample/2CSClientWin_sample/app.config (86%) create mode 100644 root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/Readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Bean.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj (96%) create mode 100644 root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/CustCtrl_sample/Readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj (96%) create mode 100644 root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/Readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj (97%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln (90%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config (54%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj (95%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj (95%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln (83%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj (95%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln (83%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj (94%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln (83%) rename {root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample => root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample}/app.config (86%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/Bat_sample/SimpleBatch_sample/readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples/WS_sample/ASPNETWebService/README.md rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln (94%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj (96%) create mode 100644 root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/AsyncFunc.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/app.manifest (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition2.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config (71%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln (96%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config (71%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSIFType_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSIFType_sample/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSIFType_sample/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj (94%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/Common/Shipper.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/Common/WebApiParams.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/Dao/LayerD.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj (94%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln (93%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln (82%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj (97%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config (97%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config (63%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/MVC_Sample/Readme.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Properties/AssemblyInfo.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config (99%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj (98%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.cs (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico (100%) rename {root_VS2015 => root_VS2022}/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config (59%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/HomeController.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/PingController.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ErrorViewModel.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Properties/launchSettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib1.bat create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib2.bat create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml rename {root_VS2015/programs/VB/Samples/WebApp_sample => root_VS2022/programs/CS/Samples4NetCore/Backend}/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample => root_VS2022/programs/CS/Samples4NetCore/Backend}/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml rename {root_VS2015/programs/VB/Samples/WebApp_sample => root_VS2022/programs/CS/Samples4NetCore/Backend}/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_ValidationScriptsPartial.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewImports.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.Development.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/gruntfile.js create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/package.json rename root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css => root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/app/site.css (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content => root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css}/touryo/Style.css (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/favicon.ico rename {root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample => root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot}/images/touryo/loading.gif (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample => root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot}/images/touryo/logo.png (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/js/app/site.js rename {root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts => root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/js}/touryo/common.js (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts => root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/js}/touryo/else.js (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Frontend/README.md create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj rename {root_VS2015/programs/CS/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln (93%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWPF_sample/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Business/LayerB.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.resx create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.cs rename root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx => root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.resx (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWin_sample/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Program.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWin_sample/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/2CSClientWin_sample/Splash.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json rename {root_VS2015/programs/CS/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln (95%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/AsyncEvent_sample/Readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Bean.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj rename {root_VS2015/programs/CS/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln (93%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/CustCtrl_sample/Form1.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Program.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/CustCtrl_sample/Readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs rename {root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample}/Form1.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj rename {root_VS2015/programs/CS/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln (94%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Program.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.resx rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.resx create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Program.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/Readme.txt (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml (100%) rename {root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample}/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln rename {root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample}/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample/readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml (100%) rename {root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2}/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln rename {root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2}/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample2/readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml (100%) rename {root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2 => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3}/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln rename {root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2 => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3}/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/RerunnableBatch_sample3/readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Business/LayerB.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs rename {root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3 => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample}/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs rename {root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3 => root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample}/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/Bat_sample/SimpleBatch_sample/readme.txt (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs rename {root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample}/MSGDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample}/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs rename root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs rename root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs rename root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs rename root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs rename root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj rename {root_VS2015/programs/CS/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx rename {root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample}/MSGDefinition.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs rename {root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample => root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample}/SPDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml (100%) rename {root_VS2015/programs/VB/Samples => root_VS2022/programs/CS/Samples4NetCore/Legacy}/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml (100%) create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestParameterValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestReturnValue.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Business/LayerB.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/Shipper.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/WebApiParams.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/DaoShippers.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/LayerD.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln rename {root_VS2015 => root_VS2022}/programs/CS/_Please run with a double-click to build bat file here.txt (100%) rename {root_VS2015 => root_VS2022}/programs/CS/z_Common.bat (62%) rename {root_VS2015 => root_VS2022}/programs/CS/z_Common2.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/0_ExecAllBat.bat (59%) rename {root_VS2015 => root_VS2022}/programs/VB/10_Build_WebApp_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/1_DeleteDir.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/1_DeleteFile.bat (100%) rename root_VS2015/programs/CS/3_Build_BusinessRichClient_net46.bat => root_VS2022/programs/VB/3_Build_BusinessRichClient_net48.bat (89%) rename root_VS2015/programs/VB/3_Build_Business_net46.bat => root_VS2022/programs/VB/3_Build_Business_net48.bat (91%) create mode 100644 root_VS2022/programs/VB/4_Build_CopyAssemblies.bat rename {root_VS2015 => root_VS2022}/programs/VB/5_Build_2CS_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/5_Build_Bat_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/6_Build_WSSrv_sample.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/7_Build_Framework_WS.bat (100%) rename root_VS2015/programs/VB/8_Build_WSClnt_sample.bat => root_VS2022/programs/VB/8_Build_WSClntWin_sample.bat (82%) create mode 100644 root_VS2022/programs/VB/9_Build_WSClntWPF_sample.bat rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Business/MyBaseLogic.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Business/_3TierEngine.vb (100%) rename root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business_net46.vbproj => root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj (91%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Common/MuParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Common/MuReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Common/MyParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Common/MyReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Dao/CmnDao.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Dao/MyBaseDao.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.vb (100%) rename {root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService => root_VS2022/programs/VB/Frameworks/Infrastructure/Business}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb (63%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb (65%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.vb (100%) rename root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.vbproj => root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj (55%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.vb (100%) rename {root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService => root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.vb (100%) rename {root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl => root_VS2022/programs/VB/Frameworks/Infrastructure/Business}/RichClient/packages.config (68%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/GMTMaster.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MyAttribute.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MyCmnFunction.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MyLiteral.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MySubsysInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZone.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/Business/Util/MyUserInfo.vb (100%) create mode 100644 root_VS2022/programs/VB/Frameworks/Infrastructure/Business/app.config rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Frameworks/Infrastructure/Business/packages.config (66%) rename root_VS2015/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net46.sln => root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln (84%) rename root_VS2015/programs/VB/Frameworks/Infrastructure/Business_net46.sln => root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln (81%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.vb (100%) rename root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net46.vbproj => root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj (92%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CheckResult.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Function/ListItem.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/ICheck.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.vb (100%) create mode 100644 root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.Designer.vb rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.vb (100%) rename root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.vbproj => root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj (61%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.vb (100%) create mode 100644 root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.Designer.vb rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config (68%) rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Frameworks/Infrastructure/CustomControl/packages.config (70%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj (77%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.vb (100%) create mode 100644 root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.Designer.vb rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/MyExtensions/MyWebExtension.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb (93%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb (95%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.settings (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config (89%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/app.config (93%) create mode 100644 root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config (92%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/Module1.vb (100%) create mode 100644 root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.Designer.vb rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln (82%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj (94%) rename {root_VS2015 => root_VS2022}/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.vb (100%) rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj (94%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.vb (100%) rename {root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample => root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample}/MSGDefinition.xml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb (100%) rename {root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample => root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample}/SPDefinition.xml (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config (90%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj (94%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.vb (100%) rename {root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample => root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample}/MSGDefinition.xml (100%) rename {root_VS2015/programs/VB/Frameworks/Infrastructure/Business => root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Program.vb (100%) rename {root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample => root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample}/SPDefinition.xml (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.vb (100%) rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Samples/2CS_sample/2CSClientWin_sample/app.config (95%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln (88%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/Readme.txt rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj (97%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/MyExtensions/MyWpfExtension.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj (97%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/Bean.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln (82%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj (97%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/AssemblyInfo.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Readme.txt rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.vbproj (96%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/AssemblyInfo.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config (85%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/AssemblyInfo.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Readme.txt create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln (82%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj (98%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config (81%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Program.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj (95%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Samples/Bat_sample/RerunnableBatch_sample/app.config (94%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/readme.txt rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Program.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj (95%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Samples/Bat_sample/RerunnableBatch_sample2/app.config (94%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Program.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj (95%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Samples/Bat_sample/RerunnableBatch_sample3/app.config (94%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Module1.vb (100%) rename {root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient => root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/AssemblyInfo.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj (95%) rename {root_VS2015/programs/CS => root_VS2022/programs/VB}/Samples/Bat_sample/SimpleBatch_sample/app.config (94%) create mode 100644 root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/readme.txt rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln (95%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj (96%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config (96%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml rename {root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl => root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.vb (100%) rename root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx => root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj (97%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config (88%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml rename {root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient => root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.vb (100%) create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml create mode 100644 root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln (94%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj (96%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config (95%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config (71%) rename {root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample => root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSIFType_sample/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSIFType_sample/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj (95%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/Business/LayerB.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/Dao/LayerD.vb (100%) rename {root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample => root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample}/My Project/Application.Designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.myapp (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln (89%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj (94%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln (82%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.vb (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample => root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample}/Content/app/Site.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj (95%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js rename {root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample => root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample}/Scripts/touryo/else.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config (92%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample => root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample}/images/touryo/loading.gif (100%) rename {root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample => root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample}/images/touryo/logo.png (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config (63%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln (83%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/My Project/AssemblyInfo.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj (96%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.vb (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico (100%) create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif create mode 100644 root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico (100%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config (59%) rename {root_VS2015 => root_VS2022}/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config (99%) rename {root_VS2015 => root_VS2022}/programs/VB/_Please run with a double-click to build bat file here.txt (100%) rename {root_VS2015 => root_VS2022}/programs/VB/z_Common.bat (62%) rename {root_VS2015 => root_VS2022}/programs/VB/z_Common2.bat (100%) rename {root_VS2015 => root_VS2022}/programs/nuget.exe (100%) diff --git a/root_VS2015/programs/CS/0_ExecAllBat.bat b/root_VS2015/programs/CS/0_ExecAllBat.bat deleted file mode 100644 index 152a75203..000000000 --- a/root_VS2015/programs/CS/0_ExecAllBat.bat +++ /dev/null @@ -1,22 +0,0 @@ -echo | call 1_DeleteDir.bat -echo | call 1_DeleteFile.bat - -@echo on -timeout 5 - -echo | call 3_Build_Business_net46.bat -echo | call 3_Build_BusinessRichClient_net46.bat - -@echo on -timeout 5 - -echo | call 4_Build_Framework_Tool.bat -echo | call 5_Build_Bat_sample.bat -echo | call 5_Build_2CS_sample.bat -echo | call 6_Build_WSSrv_sample.bat -echo | call 7_Build_Framework_WS.bat -echo | call 8_Build_WSClnt_sample.bat -echo | call 10_Build_WebApp_sample.bat - -@echo on -timeout 5 diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/app.config b/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/app.config deleted file mode 100644 index 12be8ecf4..000000000 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/app.config +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config b/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config deleted file mode 100644 index 44769429d..000000000 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config b/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config deleted file mode 100644 index 44769429d..000000000 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config deleted file mode 100644 index 635cd04c1..000000000 --- a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config deleted file mode 100644 index 34ea09e91..000000000 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config deleted file mode 100644 index 2717f7840..000000000 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config deleted file mode 100644 index 2a4b84d98..000000000 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config deleted file mode 100644 index b90c83aa9..000000000 --- a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb deleted file mode 100644 index 88dd01c78..000000000 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb b/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb deleted file mode 100644 index 88dd01c78..000000000 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb b/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb deleted file mode 100644 index 88dd01c78..000000000 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb b/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb deleted file mode 100644 index 88dd01c78..000000000 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/root_VS2015/README.md b/root_VS2022/README.md similarity index 70% rename from root_VS2015/README.md rename to root_VS2022/README.md index d0a69f43a..056e92649 100644 --- a/root_VS2015/README.md +++ b/root_VS2022/README.md @@ -1,17 +1,16 @@ -# Open Touryo Template Base for Visual Studio 2015 +# Open Touryo Template Base for Visual Studio 2019 *Open Touryo Template Base* is the *foundation* of the development infrastructure (project template) of the programs using Open Touryo. Click [here](Readme.ja.md) for Japanese version of this file. ## Running sample application tasks -You can run the sample application bundled with Open Touryo Template Base for Visual Studio 2015 according to the following steps. +You can run the sample application bundled with Open Touryo Template Base for Visual Studio 2019 according to the following steps. Notation *Optional*: Open Touryo supports the following DBMSs and data providers. But the data providers, having the notation *optional*, are not included in the programs of Open Touryo. When using the DBMSs and data providers having the notation *optional*, download the data provider manually, and modify [the data access project of Open Touryo, that is DamXXX.csproj](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/develop/root/programs/CS/Frameworks/Infrastructure/Public/Db), to refer the data provider. ### Install prerequisites -Install Visual Studio 2015 beforehand. -If you develop for .NET Standard or .NET Core, please use [Open Touryo Template Base for Visual Studio 2017](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2017). +Install Visual Studio 2019 beforehand. In addition, Open Touryo template base supports the following DBMS by default. If necessary, install the DBMS to use. - SQL Server @@ -23,8 +22,8 @@ In addition, Open Touryo template base supports the following DBMS by default. I - PostgreSQL ### Deploy Open Touryo Template Base -Copy *root_VS2015* folder to just under C drive, and rename *root_VS2015* folder to *root*. -If not copying *root_VS2015* folder to just under C drive, the build may fail for the Windows maximum path length limitation. +Copy *root_VS2019* folder to just under C drive, and rename *root_VS2019* folder to *root*. +If not copying *root_VS2019* folder to just under C drive, the build may fail for the Windows maximum path length limitation. ### Obtain and deploy data providers The correspondence between the DBMSs and the data providers is as follows. @@ -41,7 +40,7 @@ The correspondence between the DBMSs and the data providers is as follows. - MySql.Data.dll - PostgreSQL - Npgsql.dll - + ### Set up sample database #### SQL Server Sample application requires *Northwind* database. @@ -121,68 +120,131 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. 4 -3_Build_Business_net47.bat -Build a framework (base class 2, library part) of Business namespace that targets .NET Framework 4.7. +3_Build_Business_net48.bat +Build a framework (base class 2, library part) of Business namespace that targets .NET Framework 4.8. ○ 5 -3_Build_BusinessRichClient_net47.bat -Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Framework 4.7. +3_Build_BusinessRichClient_net48.bat +Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Framework 4.8. ○*2 6 +3_Build_Business_netcore30.bat +Build a framework (base class 2, library part) of Business namespace that targets .NET Core 3.0. +○*3 +－ + + +7 +3_Build_BusinessRichClient_netcore30.bat +Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Core 3.0. +○*2, *3 +－ + + +8 4_Build_Framework_Tool.bat Build the .NET Framework-based tools bundled with Open Touryo. ○ － -7 +9 +4_Build_Framework_ToolCore.bat +Build the .NET Core-based tools bundled with Open Touryo. +○*3 +－ + + +10 5_Build_Bat_sample.bat Build the .NET Framework-based sample application. (Batch application) ○*4 -8 +11 +5_Build_BatCore_sample.bat +Build the .NET Core-based sample application. (Batch application) +○*3, *4 +－ + + +12 5_Build_2CS_sample.bat Build the .NET Framework-based sample application. (Two-tier client server application) ○*4 -9 +13 +5_Build_2CSCore_sample.bat +Build the .NET Core-based sample application. (Two-tier client server application) +○*3, *4 +－ + + +14 6_Build_WSSrv_sample.bat Build the .NET Framework-based sample application. (Web services (Server-side logic)) ○*4 -10 +15 +6_Build_WSSrvCore_sample.bat +Build the .NET Core-based sample application. (Web services (Server-side logic)) +○*3, *4 +－ + + +16 7_Build_Framework_WS.bat Build the .NET Framework-based framework. (Service interface) ○*4 -11 +17 +7_Build_Framework_WSCore.bat +Build the .NET Core-based framework. (Service interface) +○*3, *4 +－ + + +18 8_Build_WSClnt_sample.bat Build the .NET Framework-based sample application. (Web service client)  ○*4 -12 +19 +8_Build_WSClntCore_sample.bat +Build the .NET Core-based sample application. (Web service client)  +○*3, *4 +－ + + +20 10_Build_WebApp_sample.bat Build the sample web application. (ASP.NET) ○*4 -13 +21 +10_Build_WebAppCore_sample.bat +Build the sample web application. (ASP.NET Core) +○*3, *4 +－ + + +22 z_Common.bat Common settings (for MSBuild) ○ ○ -14 +23 z_Common2.bat Common settings (for Visual Studio) ○ @@ -192,12 +254,13 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
*1　Need to run when developing rich client application.
- *2　Select according to the actual architecture. + *2　Need to run when developing application that targets .NET Standard or .NET Core.
+ *3　Select according to the actual architecture.
- If necessary, revise the environment variable *BUILDFILEPATH* in z_Common.bat according to the build environment. -- The libraries which are used by Open Touryo Template Base for Visual Studio 2015 are downloaded by NuGet. NuGet libraries might not be downloaded normally under proxy environment. So, when using proxy environment, create environment variable *http_proxy* as follows: +- The libraries which are used by Open Touryo Template Base for Visual Studio 2019 are downloaded by NuGet. NuGet libraries might not be downloaded normally under proxy environment. So, when using proxy environment, create environment variable *http_proxy* as follows: - Open *C:\root\programs\CS\z_Common.bat* and *C:\root\programs\VB\z_Common.bat* in an editor. - By default, the code which creates environment variable *http_proxy* is commented. So, uncomment this code by removing '@rem'. @@ -237,7 +300,7 @@ Therefore, when deploying the web services on IIS, it is necessary to perform th ### Run the sample application Open the following file. -- Open web.config or app.config and revise the values in *connectionStrings* section according to the actual database environment. +- Open web.config or app.config (for .NET Core, appsettings.json) and revise the values in *connectionStrings* section according to the actual database environment. - Run the sample application. At the login screen, enter the arbitrary alphanumeric characters. (By default, the password authentication is not executed.) @@ -268,6 +331,27 @@ C:\root\programs\CS\Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSC - C:\root\programs\CS\Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln - C:\root\programs\VB\Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln +### .NET Core application + +#### Infrastructure: +- C# + - C:\root\programs\CS\Frameworks\Infrastructure + - C:\root\programs\CS\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore +- VB +... + +#### Tools: +- C# + - C:\root\programs\CS\Frameworks\Tools +- VB +... + +#### Sample application: +- C# + - C:\root\programs\CS\Samples4NetCore +- VB +... + ## Other items of note ### Copyright and license diff --git a/root_VS2015/Readme.ja.md b/root_VS2022/Readme.ja.md similarity index 72% rename from root_VS2015/Readme.ja.md rename to root_VS2022/Readme.ja.md index c4d42042e..c66547346 100644 --- a/root_VS2015/Readme.ja.md +++ b/root_VS2022/Readme.ja.md @@ -1,17 +1,16 @@ -# Open 棟梁テンプレート・ベース (Visual Studio 2015 用) +# Open 棟梁テンプレート・ベース (Visual Studio 2019 用) 「Open 棟梁テンプレート・ベース」とは、Open 棟梁を使用したシステムの開発基盤 (プロジェクトテンプレート) を作るための元になるものです。 このファイルの英語版は[こちら](README.md)から。 ## サンプルの実行手順 -Open 棟梁テンプレート・ベース (Visual Studio 2015 用) に同梱されるサンプルアプリケーションの実行手順は以下のとおりです。 +Open 棟梁テンプレート・ベース (Visual Studio 2019 用) に同梱されるサンプルアプリケーションの実行手順は以下のとおりです。 **Optional 表記:** 以下、optional 表記のある DBMS とデータプロバイダは、Open 棟梁でサポートされていますが、Open 棟梁のプログラムには含まれていません。そのため、optional 表記のある DBMS とデータプロバイダを使う場合、必要に応じてデータプロバイダを手動でダウンロードし、[Open 棟梁のデータアクセス用のプロジェクト (DamXXX.csproj)](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/develop/root/programs/CS/Frameworks/Infrastructure/Public/Db) から、当該データプロバイダに参照設定を張り直してください。 ### 前提ツールのインストール -あらかじめ、Visual Studio 2015 をインストールしておいてください。 -.NET Standard または .NET Core で開発する場合は、[Open 棟梁テンプレート・ベース (Visual Studio 2017 用)](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2017) を使用してください。 +あらかじめ、Visual Studio 2019 をインストールしておいてください。 また、Open 棟梁テンプレート・ベースは、既定で以下の DBMS をサポートしています。必要に応じて使用する DBMS をインストールしておいてください。 - SQL Server @@ -23,7 +22,7 @@ Open 棟梁テンプレート・ベース (Visual Studio 2015 用) に同梱さ - PostgreSQL ### Open 棟梁テンプレート・ベースの配置 -「root_VS2015」フォルダを、C ドライブ直下にコピーして「root」にリネームしてください。 +「root_VS2019」フォルダを、C ドライブ直下にコピーして「root」にリネームしてください。 C ドライブ直下以外にコピーすると、Windows のファイルパスの最大文字長の制限により、ビルドに失敗することがあります。 ### データプロバイダの取得と配置 @@ -118,68 +117,131 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま 4 -3_Build_Business_net47.bat -.NET Framework 4.7 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +3_Build_Business_net48.bat +.NET Framework 4.8 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 ○ 5 -3_Build_BusinessRichClient_net47.bat -.NET Framework 4.7 をターゲットとするBusiness名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +3_Build_BusinessRichClient_net48.bat +.NET Framework 4.8 をターゲットとするBusiness名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 ○*2 6 +3_Build_Business_netcore30.bat +.NET Core 3.0 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +○*3 +－ + + +7 +3_Build_BusinessRichClient_netcore30.bat +.NET Core 3.0 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +○*2, *3 +－ + + +8 4_Build_Framework_Tool.bat .NET Frameworkベースの付属ツールをビルドする。 ○ － -7 +9 +4_Build_Framework_ToolCore.bat +.NET Coreベースの付属ツールをビルドする。 +○*3 +－ + + +10 5_Build_Bat_sample.bat .NET Frameworkベースのサンプルアプリ (バッチ) をビルドする。 ○*4 -8 +11 +5_Build_BatCore_sample.bat +.NET Coreベースのサンプルアプリ (バッチ) をビルドする。 +○*3, *4 +－ + + +12 5_Build_2CS_sample.bat .NET Frameworkベースのサンプルアプリ (2 層 C/S) をビルドする。 ○*4 -9 +13 +5_Build_2CSCore_sample.bat +.NET Coreベースのサンプルアプリ (2 層 C/S) をビルドする。 +○*3, *4 +－ + + +14 6_Build_WSSrv_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 ○*4 -10 +15 +6_Build_WSSrvCore_sample.bat +.NET Coreベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 +○*3, *4 +－ + + +16 7_Build_Framework_WS.bat .NET Frameworkベースのフレームワーク (サービスインタフェース部分) をビルドする。  ○*4 -11 +17 +7_Build_Framework_WSCore.bat +.NET Coreベースのフレームワーク (サービスインタフェース部分) をビルドする。  +○*3, *4 +－ + + +18 8_Build_WSClnt_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービスクライアント) をビルドする。 ○*4 -12 +19 +8_Build_WSClntCore_sample.bat +.NET Coreベースのサンプルアプリ (Web サービスクライアント) をビルドする。 +○*3, *4 +－ + + +20 10_Build_WebApp_sample.bat サンプルWebアプリ (ASP.NET) をビルドする。  ○*4 -13 +21 +10_Build_WebAppCore_sample.bat +サンプルWebアプリ (ASP.NET Core) をビルドする。  +○*3, *4 +－ + + +22 z_Common.bat 共通設定 (MSBuild 用) ○ ○ -14 +23 z_Common2.bat 共通設定 (Visual Studio 用)  ○ @@ -189,12 +251,13 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま
*1　リッチクライアント アプリケーションを作成する場合は必須
- *2　実際のアプリケーションの形態に応じて選択してください + *2　.NET Standard、.NET Core ベースのアプリケーションを開発する場合は必須
+ *3　実際のアプリケーションの形態に応じて選択してください
- 必要であれば、環境に合わせて、z_Common.bat 内の BUILDFILEPATH を書き換えてください。 -- Open 棟梁 Visual Studio 2015 テンプレート・ベースが利用するライブラリは、NuGet 経由でダウンロードします。このため、プロキシ環境では、正常に NuGet ライブラリがダウンロードできないことがあります。プロキシ環境をお使いの場合は、以下のように http_proxy 環境変数を定義してください。 +- Open 棟梁 Visual Studio 2019 テンプレート・ベースが利用するライブラリは、NuGet 経由でダウンロードします。このため、プロキシ環境では、正常に NuGet ライブラリがダウンロードできないことがあります。プロキシ環境をお使いの場合は、以下のように http_proxy 環境変数を定義してください。 - C:\root\programs\CS\z_Common.bat および C:\root\programs\VB\z_Common.bat を、テキストエディタで開きます。 - 既定では、http_proxy 環境変数の定義部分はコメントアウトされていますので、"@rem" を削除して、このコメントを解除します。 - http_proxy 環境変数に、お使いのプロキシ情報を設定してください。 @@ -233,7 +296,8 @@ http://localhost/yyyy/Service.asmx (yyyy: IIS のアプリケーション名) ### サンプルの実行 以下のファイルを開いてください。 -- web.config を開き、 実際のデータベース環境に合わせて connectionString セクションの値を修正してください。 +- web.config または app.config (.NET Coreの場合は、appsettings.json) を開き、 +実際のデータベース環境に合わせて connectionString セクションの値を修正してください。 - サンプルアプリケーションを実行してください。 ログイン画面が出た場合は、任意の英数字を入力してください。(既定ではパスワード認証を行っていません) @@ -264,6 +328,27 @@ C:\root\programs\CS\Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSC - C:\root\programs\CS\Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln - C:\root\programs\VB\Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln +### .NET Core アプリケーション + +#### 基盤: +- C# + - C:\root\programs\CS\Frameworks\Infrastructure + - C:\root\programs\CS\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore +- VB +... + +#### ツール: +- C# + - C:\root\programs\CS\Frameworks\Tools +- VB +... + +#### Sample アプリケーション: +- C# + - C:\root\programs\CS\Samples4NetCore +- VB +... + ## その他 特記事項 ### 著作権、ライセンス diff --git a/root_VS2015/files/resource/Log/Examples of rolling of date+size.xml b/root_VS2022/files/resource/Log/Examples of rolling of date+size.xml similarity index 100% rename from root_VS2015/files/resource/Log/Examples of rolling of date+size.xml rename to root_VS2022/files/resource/Log/Examples of rolling of date+size.xml diff --git a/root_VS2015/files/resource/Log/Log4NetConfigTemplate.xml b/root_VS2022/files/resource/Log/Log4NetConfigTemplate.xml similarity index 100% rename from root_VS2015/files/resource/Log/Log4NetConfigTemplate.xml rename to root_VS2022/files/resource/Log/Log4NetConfigTemplate.xml diff --git a/root_VS2015/files/resource/Log/SampleLogConf.xml b/root_VS2022/files/resource/Log/SampleLogConf.xml similarity index 100% rename from root_VS2015/files/resource/Log/SampleLogConf.xml rename to root_VS2022/files/resource/Log/SampleLogConf.xml diff --git a/root_VS2015/files/resource/Log/SampleLogConf2CS.xml b/root_VS2022/files/resource/Log/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/files/resource/Log/SampleLogConf2CS.xml rename to root_VS2022/files/resource/Log/SampleLogConf2CS.xml diff --git a/root_VS2015/files/resource/Log/SampleLogConfMobile.xml b/root_VS2022/files/resource/Log/SampleLogConfMobile.xml similarity index 100% rename from root_VS2015/files/resource/Log/SampleLogConfMobile.xml rename to root_VS2022/files/resource/Log/SampleLogConfMobile.xml diff --git a/root_VS2015/files/resource/Log/SampleLogConfWebService.xml b/root_VS2022/files/resource/Log/SampleLogConfWebService.xml similarity index 100% rename from root_VS2015/files/resource/Log/SampleLogConfWebService.xml rename to root_VS2022/files/resource/Log/SampleLogConfWebService.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_D1_Insert.xml b/root_VS2022/files/resource/Sql/DaoCategories_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_D1_Insert.xml rename to root_VS2022/files/resource/Sql/DaoCategories_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_D2_Select.xml b/root_VS2022/files/resource/Sql/DaoCategories_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_D2_Select.xml rename to root_VS2022/files/resource/Sql/DaoCategories_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_D3_Update.xml b/root_VS2022/files/resource/Sql/DaoCategories_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_D3_Update.xml rename to root_VS2022/files/resource/Sql/DaoCategories_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_D4_Delete.xml b/root_VS2022/files/resource/Sql/DaoCategories_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_D4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoCategories_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/DaoCategories_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/DaoCategories_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_S1_Insert.sql b/root_VS2022/files/resource/Sql/DaoCategories_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_S1_Insert.sql rename to root_VS2022/files/resource/Sql/DaoCategories_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/DaoCategories_S2_Select.xml b/root_VS2022/files/resource/Sql/DaoCategories_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_S2_Select.xml rename to root_VS2022/files/resource/Sql/DaoCategories_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_S3_Update.xml b/root_VS2022/files/resource/Sql/DaoCategories_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_S3_Update.xml rename to root_VS2022/files/resource/Sql/DaoCategories_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoCategories_S4_Delete.xml b/root_VS2022/files/resource/Sql/DaoCategories_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoCategories_S4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoCategories_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/DaoProducts_D1_Insert.xml b/root_VS2022/files/resource/Sql/DaoProducts_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoProducts_D1_Insert.xml rename to root_VS2022/files/resource/Sql/DaoProducts_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/DaoProducts_S1_Insert.sql b/root_VS2022/files/resource/Sql/DaoProducts_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/DaoProducts_S1_Insert.sql rename to root_VS2022/files/resource/Sql/DaoProducts_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/DaoProducts_S2_Select.xml b/root_VS2022/files/resource/Sql/DaoProducts_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoProducts_S2_Select.xml rename to root_VS2022/files/resource/Sql/DaoProducts_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoProducts_S3_Update.xml b/root_VS2022/files/resource/Sql/DaoProducts_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoProducts_S3_Update.xml rename to root_VS2022/files/resource/Sql/DaoProducts_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoProducts_S4_Delete.xml b/root_VS2022/files/resource/Sql/DaoProducts_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoProducts_S4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoProducts_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_D1_Insert.xml b/root_VS2022/files/resource/Sql/DaoShippers_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_D1_Insert.xml rename to root_VS2022/files/resource/Sql/DaoShippers_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_D2_Select.xml b/root_VS2022/files/resource/Sql/DaoShippers_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_D2_Select.xml rename to root_VS2022/files/resource/Sql/DaoShippers_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_D3_Update.xml b/root_VS2022/files/resource/Sql/DaoShippers_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_D3_Update.xml rename to root_VS2022/files/resource/Sql/DaoShippers_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_D4_Delete.xml b/root_VS2022/files/resource/Sql/DaoShippers_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_D4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoShippers_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/DaoShippers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/DaoShippers_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_S1_Insert.sql b/root_VS2022/files/resource/Sql/DaoShippers_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_S1_Insert.sql rename to root_VS2022/files/resource/Sql/DaoShippers_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/DaoShippers_S2_Select.xml b/root_VS2022/files/resource/Sql/DaoShippers_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_S2_Select.xml rename to root_VS2022/files/resource/Sql/DaoShippers_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_S3_Update.xml b/root_VS2022/files/resource/Sql/DaoShippers_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_S3_Update.xml rename to root_VS2022/files/resource/Sql/DaoShippers_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoShippers_S4_Delete.xml b/root_VS2022/files/resource/Sql/DaoShippers_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoShippers_S4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoShippers_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_D1_Insert.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_D1_Insert.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_D2_Select.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_D2_Select.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_D3_Update.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_D3_Update.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_D4_Delete.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_D4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_S1_Insert.sql b/root_VS2022/files/resource/Sql/DaoSuppliers_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_S1_Insert.sql rename to root_VS2022/files/resource/Sql/DaoSuppliers_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_S2_Select.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_S2_Select.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_S3_Update.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_S3_Update.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/DaoSuppliers_S4_Delete.xml b/root_VS2022/files/resource/Sql/DaoSuppliers_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/DaoSuppliers_S4_Delete.xml rename to root_VS2022/files/resource/Sql/DaoSuppliers_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/ShipperCount.sql b/root_VS2022/files/resource/Sql/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperCount.sql rename to root_VS2022/files/resource/Sql/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/ShipperCount.xml b/root_VS2022/files/resource/Sql/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperCount.xml rename to root_VS2022/files/resource/Sql/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/ShipperDelete.sql b/root_VS2022/files/resource/Sql/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/ShipperDelete.xml b/root_VS2022/files/resource/Sql/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/ShipperInsert.sql b/root_VS2022/files/resource/Sql/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/ShipperSelect.sql b/root_VS2022/files/resource/Sql/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/ShipperSelect.xml b/root_VS2022/files/resource/Sql/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/db2/ShipperCount.sql b/root_VS2022/files/resource/Sql/db2/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperCount.sql rename to root_VS2022/files/resource/Sql/db2/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/db2/ShipperCount.xml b/root_VS2022/files/resource/Sql/db2/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperCount.xml rename to root_VS2022/files/resource/Sql/db2/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/db2/ShipperDelete.sql b/root_VS2022/files/resource/Sql/db2/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/db2/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/db2/ShipperDelete.xml b/root_VS2022/files/resource/Sql/db2/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/db2/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/db2/ShipperInsert.sql b/root_VS2022/files/resource/Sql/db2/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/db2/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/db2/ShipperSelect.sql b/root_VS2022/files/resource/Sql/db2/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/db2/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/db2/ShipperSelect.xml b/root_VS2022/files/resource/Sql/db2/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/db2/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/db2/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/db2/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/db2/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/db2/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/db2/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/db2/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/db2/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/db2/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/db2/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/db2/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/db2/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/db2/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/db2/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/db2/TestTable.txt b/root_VS2022/files/resource/Sql/db2/TestTable.txt similarity index 100% rename from root_VS2015/files/resource/Sql/db2/TestTable.txt rename to root_VS2022/files/resource/Sql/db2/TestTable.txt diff --git a/root_VS2015/files/resource/Sql/hirdb/TestTable.txt b/root_VS2022/files/resource/Sql/hirdb/TestTable.txt similarity index 100% rename from root_VS2015/files/resource/Sql/hirdb/TestTable.txt rename to root_VS2022/files/resource/Sql/hirdb/TestTable.txt diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperCount.sql b/root_VS2022/files/resource/Sql/mysql/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperCount.sql rename to root_VS2022/files/resource/Sql/mysql/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperCount.xml b/root_VS2022/files/resource/Sql/mysql/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperCount.xml rename to root_VS2022/files/resource/Sql/mysql/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperDelete.sql b/root_VS2022/files/resource/Sql/mysql/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/mysql/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperDelete.xml b/root_VS2022/files/resource/Sql/mysql/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/mysql/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperInsert.sql b/root_VS2022/files/resource/Sql/mysql/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/mysql/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperSelect.sql b/root_VS2022/files/resource/Sql/mysql/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/mysql/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperSelect.xml b/root_VS2022/files/resource/Sql/mysql/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/mysql/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/mysql/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/mysql/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/mysql/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/mysql/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/mysql/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/mysql/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/mysql/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/mysql/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/mysql/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/mysql/TestTable.txt b/root_VS2022/files/resource/Sql/mysql/TestTable.txt similarity index 100% rename from root_VS2015/files/resource/Sql/mysql/TestTable.txt rename to root_VS2022/files/resource/Sql/mysql/TestTable.txt diff --git a/root_VS2015/files/resource/Sql/ole_odbc/Configuration steps ODBC.txt b/root_VS2022/files/resource/Sql/ole_odbc/Configuration steps ODBC.txt similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/Configuration steps ODBC.txt rename to root_VS2022/files/resource/Sql/ole_odbc/Configuration steps ODBC.txt diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D1_Insert.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D1_Insert.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D2_Select.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D2_Select.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D3_Update.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D3_Update.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D4_Delete.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D4_Delete.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S1_Insert.sql b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S1_Insert.sql rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S2_Select.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S2_Select.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S3_Update.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S3_Update.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S4_Delete.xml b/root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/DaoShippers_S4_Delete.xml rename to root_VS2022/files/resource/Sql/ole_odbc/DaoShippers_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperCount.sql b/root_VS2022/files/resource/Sql/ole_odbc/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperCount.sql rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperCount.xml b/root_VS2022/files/resource/Sql/ole_odbc/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperCount.xml rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperDelete.sql b/root_VS2022/files/resource/Sql/ole_odbc/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperDelete.xml b/root_VS2022/files/resource/Sql/ole_odbc/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperInsert.sql b/root_VS2022/files/resource/Sql/ole_odbc/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperSelect.sql b/root_VS2022/files/resource/Sql/ole_odbc/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperSelect.xml b/root_VS2022/files/resource/Sql/ole_odbc/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/ole_odbc/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/ole_odbc/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/ole_odbc/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/ole_odbc/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/ole_odbc/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/ole_odbc/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/ole_odbc/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables.csv b/root_VS2022/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables.csv similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables.csv rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables.csv diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv b/root_VS2022/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv b/root_VS2022/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2DataSet.xsd b/root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2DataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2DataSet.xsd rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2DataSet.xsd diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.cs b/root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.cs rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.cs diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.vb b/root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.vb rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/ORDERS2Entity.vb diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSDataSet.xsd b/root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSDataSet.xsd rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.cs b/root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.cs rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.cs diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.vb b/root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.vb rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/DTO/SHIPPERSEntity.vb diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.cs b/root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.cs similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.cs rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.cs diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.vb b/root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.vb similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.vb rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoORDERS2.vb diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.cs b/root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.cs similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.cs rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.cs diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.vb b/root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.vb similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.vb rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/Dao/DaoSHIPPERS.vb diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D1_Insert.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D1_Insert.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D2_Select.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D2_Select.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D3_Update.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D3_Update.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D4_Delete.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D4_Delete.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S1_Insert.sql b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S1_Insert.sql rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S2_Select.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S2_Select.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S3_Update.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S3_Update.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S4_Delete.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S4_Delete.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoORDERS2_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert_org.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert_org.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert_org.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D1_Insert_org.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D2_Select.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D2_Select.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D3_Update.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D3_Update.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D4_Delete.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D4_Delete.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert.sql b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert.sql rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S2_Select.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S2_Select.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S3_Update.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S3_Update.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S4_Delete.xml b/root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S4_Delete.xml rename to root_VS2022/files/resource/Sql/oracle/Automatic generation/SQL/DaoSHIPPERS_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/oracle/SCOTT.sql b/root_VS2022/files/resource/Sql/oracle/SCOTT.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/SCOTT.sql rename to root_VS2022/files/resource/Sql/oracle/SCOTT.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperCount.sql b/root_VS2022/files/resource/Sql/oracle/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperCount.sql rename to root_VS2022/files/resource/Sql/oracle/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperCount.xml b/root_VS2022/files/resource/Sql/oracle/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperCount.xml rename to root_VS2022/files/resource/Sql/oracle/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperDelete.sql b/root_VS2022/files/resource/Sql/oracle/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/oracle/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperDelete.xml b/root_VS2022/files/resource/Sql/oracle/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/oracle/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperInsert.sql b/root_VS2022/files/resource/Sql/oracle/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/oracle/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperSelect.sql b/root_VS2022/files/resource/Sql/oracle/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/oracle/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperSelect.xml b/root_VS2022/files/resource/Sql/oracle/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/oracle/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/oracle/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/oracle/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/oracle/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/oracle/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/oracle/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/oracle/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/oracle/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/oracle/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/oracle/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/oracle/TestTable.txt b/root_VS2022/files/resource/Sql/oracle/TestTable.txt similarity index 100% rename from root_VS2015/files/resource/Sql/oracle/TestTable.txt rename to root_VS2022/files/resource/Sql/oracle/TestTable.txt diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperCount.sql b/root_VS2022/files/resource/Sql/pstgrs/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperCount.sql rename to root_VS2022/files/resource/Sql/pstgrs/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperCount.xml b/root_VS2022/files/resource/Sql/pstgrs/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperCount.xml rename to root_VS2022/files/resource/Sql/pstgrs/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperDelete.sql b/root_VS2022/files/resource/Sql/pstgrs/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/pstgrs/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperDelete.xml b/root_VS2022/files/resource/Sql/pstgrs/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/pstgrs/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperInsert.sql b/root_VS2022/files/resource/Sql/pstgrs/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/pstgrs/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperSelect.sql b/root_VS2022/files/resource/Sql/pstgrs/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/pstgrs/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperSelect.xml b/root_VS2022/files/resource/Sql/pstgrs/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/pstgrs/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/pstgrs/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/pstgrs/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/pstgrs/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/pstgrs/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/pstgrs/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/pstgrs/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/pstgrs/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/pstgrs/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/pstgrs/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/pstgrs/TestTable.txt b/root_VS2022/files/resource/Sql/pstgrs/TestTable.txt similarity index 100% rename from root_VS2015/files/resource/Sql/pstgrs/TestTable.txt rename to root_VS2022/files/resource/Sql/pstgrs/TestTable.txt diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/1.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/1.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/1.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/1.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/2.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/2.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/2.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/2.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/3.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/3.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/3.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/3.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/A.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/A.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/A.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/A.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/B.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/B.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/B.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/B.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/C.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/C.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/C.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/CreateTable/C.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DBTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DBTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DBTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DBTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DotNetTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DotNetTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DotNetTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_rand_DotNetTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DBTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DBTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DBTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DBTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DotNetTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DotNetTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DotNetTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/D layer definition information/tstest_timestamp_DotNetTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1DataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1DataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1DataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1DataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table1Entity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2DataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2DataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2DataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2DataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table2Entity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3DataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3DataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3DataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3DataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_table3Entity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableADataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableADataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableADataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableADataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableAEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableBEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/DTO/ts_test_tableCEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table1.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table2.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_table3.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableA.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableB.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/Dao/Daots_test_tableC.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table1_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table2_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_table3_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableA_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableB_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation(TimeStamp/SQL/Daots_test_tableC_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DBTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/D layer definition information/AllTables_DotNetTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CategoriesEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/CustomersEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeeTerritoriesEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/EmployeesEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Order_DetailsEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2DataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2DataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2DataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2DataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/Orders2Entity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/OrdersEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ProductsEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/RegionEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/ShippersEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/SuppliersEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesDataSet.xsd b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesDataSet.xsd similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesDataSet.xsd rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesDataSet.xsd diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/DTO/TerritoriesEntity.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCategories.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoCustomers.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployeeTerritories.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoEmployees.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrder_Details.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoOrders2.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoProducts.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoRegion.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoShippers.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoSuppliers.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.cs b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.cs similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.cs rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.cs diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.vb b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.vb similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.vb rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/Dao/DaoTerritories.vb diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCategories_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoCustomers_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployeeTerritories_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoEmployees_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrder_Details_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoOrders_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoProducts_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoRegion_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoShippers_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert_org.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert_org.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert_org.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S1_Insert_org.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoSuppliers_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Automatic generation/SQL/DaoTerritories_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/ScreenAutoGen/CreateTable.sql b/root_VS2022/files/resource/Sql/sqlserver/ScreenAutoGen/CreateTable.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ScreenAutoGen/CreateTable.sql rename to root_VS2022/files/resource/Sql/sqlserver/ScreenAutoGen/CreateTable.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/CreateTable.sql b/root_VS2022/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/CreateTable.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/CreateTable.sql rename to root_VS2022/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/CreateTable.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/DaoTABL2_TABL1_JOIN_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/DaoTABL2_TABL1_JOIN_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/DaoTABL2_TABL1_JOIN_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/ScreenAutoGen_FreeSQL/DaoTABL2_TABL1_JOIN_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperCount.sql b/root_VS2022/files/resource/Sql/sqlserver/ShipperCount.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperCount.sql rename to root_VS2022/files/resource/Sql/sqlserver/ShipperCount.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperCount.xml b/root_VS2022/files/resource/Sql/sqlserver/ShipperCount.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperCount.xml rename to root_VS2022/files/resource/Sql/sqlserver/ShipperCount.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperDelete.sql b/root_VS2022/files/resource/Sql/sqlserver/ShipperDelete.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperDelete.sql rename to root_VS2022/files/resource/Sql/sqlserver/ShipperDelete.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperDelete.xml b/root_VS2022/files/resource/Sql/sqlserver/ShipperDelete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperDelete.xml rename to root_VS2022/files/resource/Sql/sqlserver/ShipperDelete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperInsert.sql b/root_VS2022/files/resource/Sql/sqlserver/ShipperInsert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperInsert.sql rename to root_VS2022/files/resource/Sql/sqlserver/ShipperInsert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperSelect.sql b/root_VS2022/files/resource/Sql/sqlserver/ShipperSelect.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperSelect.sql rename to root_VS2022/files/resource/Sql/sqlserver/ShipperSelect.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperSelect.xml b/root_VS2022/files/resource/Sql/sqlserver/ShipperSelect.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperSelect.xml rename to root_VS2022/files/resource/Sql/sqlserver/ShipperSelect.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperSelectOrder.sql b/root_VS2022/files/resource/Sql/sqlserver/ShipperSelectOrder.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperSelectOrder.sql rename to root_VS2022/files/resource/Sql/sqlserver/ShipperSelectOrder.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperSelectOrder.xml b/root_VS2022/files/resource/Sql/sqlserver/ShipperSelectOrder.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperSelectOrder.xml rename to root_VS2022/files/resource/Sql/sqlserver/ShipperSelectOrder.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperUpdate.sql b/root_VS2022/files/resource/Sql/sqlserver/ShipperUpdate.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperUpdate.sql rename to root_VS2022/files/resource/Sql/sqlserver/ShipperUpdate.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/ShipperUpdate.xml b/root_VS2022/files/resource/Sql/sqlserver/ShipperUpdate.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/ShipperUpdate.xml rename to root_VS2022/files/resource/Sql/sqlserver/ShipperUpdate.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/TestTable.txt b/root_VS2022/files/resource/Sql/sqlserver/TestTable.txt similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/TestTable.txt rename to root_VS2022/files/resource/Sql/sqlserver/TestTable.txt diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_User_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoM_Workflow_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_CurrentWorkflow_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_WorkflowHistory_S4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D1_Insert.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D1_Insert.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D1_Insert.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D1_Insert.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D4_Delete.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D4_Delete.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D4_Delete.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D4_Delete.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D5_SelCnt.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D5_SelCnt.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D5_SelCnt.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_D5_SelCnt.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S1_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S1_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S1_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S1_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S2_Select.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S2_Select.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S2_Select.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S2_Select.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S3_Update.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S3_Update.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S3_Update.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/DaoT_Workflow_S3_Update.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/ddef.csv b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/ddef.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/ddef.csv rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/ddef.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DBTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DBTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DBTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DBTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DotNetTypeInfo.csv b/root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DotNetTypeInfo.csv similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DotNetTypeInfo.csv rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/Gen/ddef_DotNetTypeInfo.csv diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetProcessingWfRequest.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetProcessingWfRequest.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetProcessingWfRequest.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetProcessingWfRequest.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyToUser.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyToUser.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyToUser.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyToUser.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyWorkflow.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyWorkflow.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyWorkflow.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetReplyWorkflow.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackToUser.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackToUser.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackToUser.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackToUser.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow2.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow2.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow2.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetTurnBackWorkflow2.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetWfRequest.xml b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetWfRequest.xml similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetWfRequest.xml rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/GetWfRequest.xml diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Count.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Count.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Count.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Count.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Move.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Move.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Move.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Select/RequestApproval_Move.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_ALL TABLE.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_ALL TABLE.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_ALL TABLE.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_ALL TABLE.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_WF_DEF.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_WF_DEF.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_WF_DEF.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/Check/SELECT_WF_DEF.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User(sample).sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User(sample).sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User(sample).sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User(sample).sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User_Insert(sample).sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User_Insert(sample).sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User_Insert(sample).sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_User_Insert(sample).sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow_Insert.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow_Insert.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow_Insert.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/M_Workflow_Insert.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_CurrentWorkflow.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_CurrentWorkflow.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_CurrentWorkflow.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_CurrentWorkflow.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_Workflow.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_Workflow.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_Workflow.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_Workflow.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_WorkflowHistory.sql b/root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_WorkflowHistory.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_WorkflowHistory.sql rename to root_VS2022/files/resource/Sql/sqlserver/Workflow/SQL/Table/T_WorkflowHistory.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/instnwnd.sql b/root_VS2022/files/resource/Sql/sqlserver/instnwnd.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/instnwnd.sql rename to root_VS2022/files/resource/Sql/sqlserver/instnwnd.sql diff --git a/root_VS2015/files/resource/Sql/sqlserver/instpubs.sql b/root_VS2022/files/resource/Sql/sqlserver/instpubs.sql similarity index 100% rename from root_VS2015/files/resource/Sql/sqlserver/instpubs.sql rename to root_VS2022/files/resource/Sql/sqlserver/instpubs.sql diff --git a/root_VS2015/files/resource/X509/GenDsaCertByOpenSSL.bat b/root_VS2022/files/resource/X509/GenDsaCertByOpenSSL.bat similarity index 100% rename from root_VS2015/files/resource/X509/GenDsaCertByOpenSSL.bat rename to root_VS2022/files/resource/X509/GenDsaCertByOpenSSL.bat diff --git a/root_VS2015/files/resource/X509/GenECDsaCertByOpenSSL.bat b/root_VS2022/files/resource/X509/GenECDsaCertByOpenSSL.bat similarity index 100% rename from root_VS2015/files/resource/X509/GenECDsaCertByOpenSSL.bat rename to root_VS2022/files/resource/X509/GenECDsaCertByOpenSSL.bat diff --git a/root_VS2015/files/resource/X509/GenRsaCertByOpenSSL.bat b/root_VS2022/files/resource/X509/GenRsaCertByOpenSSL.bat similarity index 100% rename from root_VS2015/files/resource/X509/GenRsaCertByOpenSSL.bat rename to root_VS2022/files/resource/X509/GenRsaCertByOpenSSL.bat diff --git a/root_VS2015/files/resource/X509/SHA256DSA.cer b/root_VS2022/files/resource/X509/SHA256DSA.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256DSA.cer rename to root_VS2022/files/resource/X509/SHA256DSA.cer diff --git a/root_VS2015/files/resource/X509/SHA256DSA.pfx b/root_VS2022/files/resource/X509/SHA256DSA.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256DSA.pfx rename to root_VS2022/files/resource/X509/SHA256DSA.pfx diff --git a/root_VS2015/files/resource/X509/SHA256ECDSA.cer b/root_VS2022/files/resource/X509/SHA256ECDSA.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256ECDSA.cer rename to root_VS2022/files/resource/X509/SHA256ECDSA.cer diff --git a/root_VS2015/files/resource/X509/SHA256ECDSA.pfx b/root_VS2022/files/resource/X509/SHA256ECDSA.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256ECDSA.pfx rename to root_VS2022/files/resource/X509/SHA256ECDSA.pfx diff --git a/root_VS2015/files/resource/X509/SHA256ECDSA_Client.cer b/root_VS2022/files/resource/X509/SHA256ECDSA_Client.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256ECDSA_Client.cer rename to root_VS2022/files/resource/X509/SHA256ECDSA_Client.cer diff --git a/root_VS2015/files/resource/X509/SHA256ECDSA_Client.pfx b/root_VS2022/files/resource/X509/SHA256ECDSA_Client.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256ECDSA_Client.pfx rename to root_VS2022/files/resource/X509/SHA256ECDSA_Client.pfx diff --git a/root_VS2015/files/resource/X509/SHA256ECDSA_Server.cer b/root_VS2022/files/resource/X509/SHA256ECDSA_Server.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256ECDSA_Server.cer rename to root_VS2022/files/resource/X509/SHA256ECDSA_Server.cer diff --git a/root_VS2015/files/resource/X509/SHA256ECDSA_Server.pfx b/root_VS2022/files/resource/X509/SHA256ECDSA_Server.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256ECDSA_Server.pfx rename to root_VS2022/files/resource/X509/SHA256ECDSA_Server.pfx diff --git a/root_VS2015/files/resource/X509/SHA256RSA.cer b/root_VS2022/files/resource/X509/SHA256RSA.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSA.cer rename to root_VS2022/files/resource/X509/SHA256RSA.cer diff --git a/root_VS2015/files/resource/X509/SHA256RSA.pfx b/root_VS2022/files/resource/X509/SHA256RSA.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSA.pfx rename to root_VS2022/files/resource/X509/SHA256RSA.pfx diff --git a/root_VS2015/files/resource/X509/SHA256RSAClientCert.pfx b/root_VS2022/files/resource/X509/SHA256RSAClientCert.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSAClientCert.pfx rename to root_VS2022/files/resource/X509/SHA256RSAClientCert.pfx diff --git a/root_VS2015/files/resource/X509/SHA256RSA_Client.cer b/root_VS2022/files/resource/X509/SHA256RSA_Client.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSA_Client.cer rename to root_VS2022/files/resource/X509/SHA256RSA_Client.cer diff --git a/root_VS2015/files/resource/X509/SHA256RSA_Client.pfx b/root_VS2022/files/resource/X509/SHA256RSA_Client.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSA_Client.pfx rename to root_VS2022/files/resource/X509/SHA256RSA_Client.pfx diff --git a/root_VS2015/files/resource/X509/SHA256RSA_Server.cer b/root_VS2022/files/resource/X509/SHA256RSA_Server.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSA_Server.cer rename to root_VS2022/files/resource/X509/SHA256RSA_Server.cer diff --git a/root_VS2015/files/resource/X509/SHA256RSA_Server.pfx b/root_VS2022/files/resource/X509/SHA256RSA_Server.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA256RSA_Server.pfx rename to root_VS2022/files/resource/X509/SHA256RSA_Server.pfx diff --git a/root_VS2015/files/resource/X509/SHA384ECDSA.cer b/root_VS2022/files/resource/X509/SHA384ECDSA.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA384ECDSA.cer rename to root_VS2022/files/resource/X509/SHA384ECDSA.cer diff --git a/root_VS2015/files/resource/X509/SHA384ECDSA.pfx b/root_VS2022/files/resource/X509/SHA384ECDSA.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA384ECDSA.pfx rename to root_VS2022/files/resource/X509/SHA384ECDSA.pfx diff --git a/root_VS2015/files/resource/X509/SHA521ECDSA.cer b/root_VS2022/files/resource/X509/SHA521ECDSA.cer similarity index 100% rename from root_VS2015/files/resource/X509/SHA521ECDSA.cer rename to root_VS2022/files/resource/X509/SHA521ECDSA.cer diff --git a/root_VS2015/files/resource/X509/SHA521ECDSA.pfx b/root_VS2022/files/resource/X509/SHA521ECDSA.pfx similarity index 100% rename from root_VS2015/files/resource/X509/SHA521ECDSA.pfx rename to root_VS2022/files/resource/X509/SHA521ECDSA.pfx diff --git a/root_VS2015/files/resource/Xml/MSGDefinition.xml b/root_VS2022/files/resource/Xml/MSGDefinition.xml similarity index 100% rename from root_VS2015/files/resource/Xml/MSGDefinition.xml rename to root_VS2022/files/resource/Xml/MSGDefinition.xml diff --git a/root_VS2015/files/resource/Xml/MSGDefinition_ja.xml b/root_VS2022/files/resource/Xml/MSGDefinition_ja.xml similarity index 100% rename from root_VS2015/files/resource/Xml/MSGDefinition_ja.xml rename to root_VS2022/files/resource/Xml/MSGDefinition_ja.xml diff --git a/root_VS2015/files/resource/Xml/MSGDefinition_zh-CN.xml b/root_VS2022/files/resource/Xml/MSGDefinition_zh-CN.xml similarity index 100% rename from root_VS2015/files/resource/Xml/MSGDefinition_zh-CN.xml rename to root_VS2022/files/resource/Xml/MSGDefinition_zh-CN.xml diff --git a/root_VS2015/files/resource/Xml/SCDefinition.xml b/root_VS2022/files/resource/Xml/SCDefinition.xml similarity index 100% rename from root_VS2015/files/resource/Xml/SCDefinition.xml rename to root_VS2022/files/resource/Xml/SCDefinition.xml diff --git a/root_VS2015/files/resource/Xml/SPDefinition.xml b/root_VS2022/files/resource/Xml/SPDefinition.xml similarity index 100% rename from root_VS2015/files/resource/Xml/SPDefinition.xml rename to root_VS2022/files/resource/Xml/SPDefinition.xml diff --git a/root_VS2015/files/resource/Xml/TCDefinition.xml b/root_VS2022/files/resource/Xml/TCDefinition.xml similarity index 100% rename from root_VS2015/files/resource/Xml/TCDefinition.xml rename to root_VS2022/files/resource/Xml/TCDefinition.xml diff --git a/root_VS2015/files/resource/Xml/TMInProcessDefinition.xml b/root_VS2022/files/resource/Xml/TMInProcessDefinition.xml similarity index 100% rename from root_VS2015/files/resource/Xml/TMInProcessDefinition.xml rename to root_VS2022/files/resource/Xml/TMInProcessDefinition.xml diff --git a/root_VS2015/files/resource/Xml/TMProtocolDefinition.xml b/root_VS2022/files/resource/Xml/TMProtocolDefinition.xml similarity index 100% rename from root_VS2015/files/resource/Xml/TMProtocolDefinition.xml rename to root_VS2022/files/resource/Xml/TMProtocolDefinition.xml diff --git a/root_VS2015/files/resource/Xml/TMProtocolDefinition2.xml b/root_VS2022/files/resource/Xml/TMProtocolDefinition2.xml similarity index 100% rename from root_VS2015/files/resource/Xml/TMProtocolDefinition2.xml rename to root_VS2022/files/resource/Xml/TMProtocolDefinition2.xml diff --git a/root_VS2015/files/tools/DGenTemplates/ConditionalSearch.aspx b/root_VS2022/files/tools/DGenTemplates/ConditionalSearch.aspx similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/ConditionalSearch.aspx rename to root_VS2022/files/tools/DGenTemplates/ConditionalSearch.aspx diff --git a/root_VS2015/files/tools/DGenTemplates/ConditionalSearch.aspx.cs b/root_VS2022/files/tools/DGenTemplates/ConditionalSearch.aspx.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/ConditionalSearch.aspx.cs rename to root_VS2022/files/tools/DGenTemplates/ConditionalSearch.aspx.cs diff --git a/root_VS2015/files/tools/DGenTemplates/ConditionalSearch.aspx.vb b/root_VS2022/files/tools/DGenTemplates/ConditionalSearch.aspx.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/ConditionalSearch.aspx.vb rename to root_VS2022/files/tools/DGenTemplates/ConditionalSearch.aspx.vb diff --git a/root_VS2015/files/tools/DGenTemplates/DaoTemplate.cs b/root_VS2022/files/tools/DGenTemplates/DaoTemplate.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DaoTemplate.cs rename to root_VS2022/files/tools/DGenTemplates/DaoTemplate.cs diff --git a/root_VS2015/files/tools/DGenTemplates/DaoTemplate.vb b/root_VS2022/files/tools/DGenTemplates/DaoTemplate.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DaoTemplate.vb rename to root_VS2022/files/tools/DGenTemplates/DaoTemplate.vb diff --git a/root_VS2015/files/tools/DGenTemplates/DaoTemplate2.cs b/root_VS2022/files/tools/DGenTemplates/DaoTemplate2.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DaoTemplate2.cs rename to root_VS2022/files/tools/DGenTemplates/DaoTemplate2.cs diff --git a/root_VS2015/files/tools/DGenTemplates/DaoTemplate2.vb b/root_VS2022/files/tools/DGenTemplates/DaoTemplate2.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DaoTemplate2.vb rename to root_VS2022/files/tools/DGenTemplates/DaoTemplate2.vb diff --git a/root_VS2015/files/tools/DGenTemplates/DaoTemplate3.cs b/root_VS2022/files/tools/DGenTemplates/DaoTemplate3.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DaoTemplate3.cs rename to root_VS2022/files/tools/DGenTemplates/DaoTemplate3.cs diff --git a/root_VS2015/files/tools/DGenTemplates/DaoTemplate3.vb b/root_VS2022/files/tools/DGenTemplates/DaoTemplate3.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DaoTemplate3.vb rename to root_VS2022/files/tools/DGenTemplates/DaoTemplate3.vb diff --git a/root_VS2015/files/tools/DGenTemplates/DataSetTemplate.xsd b/root_VS2022/files/tools/DGenTemplates/DataSetTemplate.xsd similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/DataSetTemplate.xsd rename to root_VS2022/files/tools/DGenTemplates/DataSetTemplate.xsd diff --git a/root_VS2015/files/tools/DGenTemplates/Detail.aspx b/root_VS2022/files/tools/DGenTemplates/Detail.aspx similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/Detail.aspx rename to root_VS2022/files/tools/DGenTemplates/Detail.aspx diff --git a/root_VS2015/files/tools/DGenTemplates/Detail.aspx.cs b/root_VS2022/files/tools/DGenTemplates/Detail.aspx.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/Detail.aspx.cs rename to root_VS2022/files/tools/DGenTemplates/Detail.aspx.cs diff --git a/root_VS2015/files/tools/DGenTemplates/Detail.aspx.vb b/root_VS2022/files/tools/DGenTemplates/Detail.aspx.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/Detail.aspx.vb rename to root_VS2022/files/tools/DGenTemplates/Detail.aspx.vb diff --git a/root_VS2015/files/tools/DGenTemplates/EntityTemplate.cs b/root_VS2022/files/tools/DGenTemplates/EntityTemplate.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/EntityTemplate.cs rename to root_VS2022/files/tools/DGenTemplates/EntityTemplate.cs diff --git a/root_VS2015/files/tools/DGenTemplates/EntityTemplate.vb b/root_VS2022/files/tools/DGenTemplates/EntityTemplate.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/EntityTemplate.vb rename to root_VS2022/files/tools/DGenTemplates/EntityTemplate.vb diff --git a/root_VS2015/files/tools/DGenTemplates/EntityTemplate_bk.cs b/root_VS2022/files/tools/DGenTemplates/EntityTemplate_bk.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/EntityTemplate_bk.cs rename to root_VS2022/files/tools/DGenTemplates/EntityTemplate_bk.cs diff --git a/root_VS2015/files/tools/DGenTemplates/EntityTemplate_bk.vb b/root_VS2022/files/tools/DGenTemplates/EntityTemplate_bk.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/EntityTemplate_bk.vb rename to root_VS2022/files/tools/DGenTemplates/EntityTemplate_bk.vb diff --git a/root_VS2015/files/tools/DGenTemplates/SearchAndUpdate.aspx b/root_VS2022/files/tools/DGenTemplates/SearchAndUpdate.aspx similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/SearchAndUpdate.aspx rename to root_VS2022/files/tools/DGenTemplates/SearchAndUpdate.aspx diff --git a/root_VS2015/files/tools/DGenTemplates/SearchAndUpdate.aspx.cs b/root_VS2022/files/tools/DGenTemplates/SearchAndUpdate.aspx.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/SearchAndUpdate.aspx.cs rename to root_VS2022/files/tools/DGenTemplates/SearchAndUpdate.aspx.cs diff --git a/root_VS2015/files/tools/DGenTemplates/SearchAndUpdate.aspx.vb b/root_VS2022/files/tools/DGenTemplates/SearchAndUpdate.aspx.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/SearchAndUpdate.aspx.vb rename to root_VS2022/files/tools/DGenTemplates/SearchAndUpdate.aspx.vb diff --git a/root_VS2015/files/tools/DGenTemplates/TableAdapter.cs b/root_VS2022/files/tools/DGenTemplates/TableAdapter.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/TableAdapter.cs rename to root_VS2022/files/tools/DGenTemplates/TableAdapter.cs diff --git a/root_VS2015/files/tools/DGenTemplates/TableAdapter.vb b/root_VS2022/files/tools/DGenTemplates/TableAdapter.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/TableAdapter.vb rename to root_VS2022/files/tools/DGenTemplates/TableAdapter.vb diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx b/root_VS2022/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx rename to root_VS2022/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.cs b/root_VS2022/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.cs rename to root_VS2022/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.cs diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.vb b/root_VS2022/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.vb rename to root_VS2022/files/tools/DGenTemplates/_Screen_ConditionalSearch.aspx.vb diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_Detail.aspx b/root_VS2022/files/tools/DGenTemplates/_Screen_Detail.aspx similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_Detail.aspx rename to root_VS2022/files/tools/DGenTemplates/_Screen_Detail.aspx diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_Detail.aspx.cs b/root_VS2022/files/tools/DGenTemplates/_Screen_Detail.aspx.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_Detail.aspx.cs rename to root_VS2022/files/tools/DGenTemplates/_Screen_Detail.aspx.cs diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_Detail.aspx.vb b/root_VS2022/files/tools/DGenTemplates/_Screen_Detail.aspx.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_Detail.aspx.vb rename to root_VS2022/files/tools/DGenTemplates/_Screen_Detail.aspx.vb diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx b/root_VS2022/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx rename to root_VS2022/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.cs b/root_VS2022/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.cs similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.cs rename to root_VS2022/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.cs diff --git a/root_VS2015/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.vb b/root_VS2022/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.vb similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.vb rename to root_VS2022/files/tools/DGenTemplates/_Screen_SearchAndUpdate.aspx.vb diff --git a/root_VS2015/files/tools/DGenTemplates/d1_DynInsTemplate.xml b/root_VS2022/files/tools/DGenTemplates/d1_DynInsTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/d1_DynInsTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/d1_DynInsTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/d2_DynSelTemplate.xml b/root_VS2022/files/tools/DGenTemplates/d2_DynSelTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/d2_DynSelTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/d2_DynSelTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/d3_DynUpdTemplate.xml b/root_VS2022/files/tools/DGenTemplates/d3_DynUpdTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/d3_DynUpdTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/d3_DynUpdTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/d4_DynDelTemplate.xml b/root_VS2022/files/tools/DGenTemplates/d4_DynDelTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/d4_DynDelTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/d4_DynDelTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/d5_DynSelCntTemplate.xml b/root_VS2022/files/tools/DGenTemplates/d5_DynSelCntTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/d5_DynSelCntTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/d5_DynSelCntTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/s1_InsertTemplate.sql b/root_VS2022/files/tools/DGenTemplates/s1_InsertTemplate.sql similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/s1_InsertTemplate.sql rename to root_VS2022/files/tools/DGenTemplates/s1_InsertTemplate.sql diff --git a/root_VS2015/files/tools/DGenTemplates/s2_SelectTemplate.xml b/root_VS2022/files/tools/DGenTemplates/s2_SelectTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/s2_SelectTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/s2_SelectTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/s3_UpdateTemplate.xml b/root_VS2022/files/tools/DGenTemplates/s3_UpdateTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/s3_UpdateTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/s3_UpdateTemplate.xml diff --git a/root_VS2015/files/tools/DGenTemplates/s4_DeleteTemplate.xml b/root_VS2022/files/tools/DGenTemplates/s4_DeleteTemplate.xml similarity index 100% rename from root_VS2015/files/tools/DGenTemplates/s4_DeleteTemplate.xml rename to root_VS2022/files/tools/DGenTemplates/s4_DeleteTemplate.xml diff --git a/root_VS2015/files/tools/Doxyfile/doxygen.zip b/root_VS2022/files/tools/Doxyfile/doxygen.zip similarity index 100% rename from root_VS2015/files/tools/Doxyfile/doxygen.zip rename to root_VS2022/files/tools/Doxyfile/doxygen.zip diff --git a/root_VS2015/files/tools/Doxyfile/readme.txt b/root_VS2022/files/tools/Doxyfile/readme.txt similarity index 100% rename from root_VS2015/files/tools/Doxyfile/readme.txt rename to root_VS2022/files/tools/Doxyfile/readme.txt diff --git a/root_VS2015/files/tools/WinMergeFilters/touryo.flt b/root_VS2022/files/tools/WinMergeFilters/touryo.flt similarity index 100% rename from root_VS2015/files/tools/WinMergeFilters/touryo.flt rename to root_VS2022/files/tools/WinMergeFilters/touryo.flt diff --git a/root_VS2015/files/tools/WinMergeFilters/touryofull.flt b/root_VS2022/files/tools/WinMergeFilters/touryofull.flt similarity index 100% rename from root_VS2015/files/tools/WinMergeFilters/touryofull.flt rename to root_VS2022/files/tools/WinMergeFilters/touryofull.flt diff --git a/root_VS2022/programs/CS/0_ExecAllBat.bat b/root_VS2022/programs/CS/0_ExecAllBat.bat new file mode 100644 index 000000000..f3266ada0 --- /dev/null +++ b/root_VS2022/programs/CS/0_ExecAllBat.bat @@ -0,0 +1,37 @@ +echo | call 1_DeleteDir.bat +echo | call 1_DeleteFile.bat + +@echo on +timeout 5 + +echo | call 3_Build_Business_net48.bat +echo | call 3_Build_Business_netcore50.bat +echo | call 3_Build_BusinessRichClient_net48.bat +echo | call 3_Build_BusinessRichClient_netcore50.bat + +@echo on +timeout 5 + +echo | call 4_Build_Framework_Tool.bat +echo | call 4_Build_Framework_ToolCore.bat + +echo | call 5_Build_2CS_sample.bat +echo | call 5_Build_2CSCore_sample.bat + +echo | call 5_Build_Bat_sample.bat +echo | call 5_Build_BatCore_sample.bat + +echo | call 6_Build_WSSrv_sample.bat +echo | call 6_Build_WSSrvCore_sample.bat + +echo | call 7_Build_Framework_WS.bat +echo | call 7_Build_Framework_WSCore.bat + +echo | call 8_Build_WSClnt_sample.bat +echo | call 8_Build_WSClntCore_sample.bat + +echo | call 10_Build_WebApp_sample.bat +echo | call 10_Build_WebAppCore_sample.bat + +@echo on +timeout 5 diff --git a/root_VS2022/programs/CS/10_Build_WebAppCore_sample.bat b/root_VS2022/programs/CS/10_Build_WebAppCore_sample.bat new file mode 100644 index 000000000..56e4393c1 --- /dev/null +++ b/root_VS2022/programs/CS/10_Build_WebAppCore_sample.bat @@ -0,0 +1,35 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of MVC_Sample. +rem -------------------------------------------------- + +set CURRENTDIR=%cd% +cd "Samples4NetCore\Backend\MVC_Sample\MVC_Sample" +if exist "node_modules" rd /s /q "node_modules" +call RestoreLib1.bat +call RestoreLib2.bat +cd %CURRENTDIR% + +dotnet restore "Samples4NetCore\Backend\MVC_Sample\MVC_Sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Backend\MVC_Sample\MVC_Sample.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2015/programs/CS/10_Build_WebApp_sample.bat b/root_VS2022/programs/CS/10_Build_WebApp_sample.bat similarity index 100% rename from root_VS2015/programs/CS/10_Build_WebApp_sample.bat rename to root_VS2022/programs/CS/10_Build_WebApp_sample.bat diff --git a/root_VS2015/programs/CS/1_DeleteDir.bat b/root_VS2022/programs/CS/1_DeleteDir.bat similarity index 100% rename from root_VS2015/programs/CS/1_DeleteDir.bat rename to root_VS2022/programs/CS/1_DeleteDir.bat diff --git a/root_VS2015/programs/CS/1_DeleteFile.bat b/root_VS2022/programs/CS/1_DeleteFile.bat similarity index 100% rename from root_VS2015/programs/CS/1_DeleteFile.bat rename to root_VS2022/programs/CS/1_DeleteFile.bat diff --git a/root_VS2015/programs/VB/3_Build_BusinessRichClient_net46.bat b/root_VS2022/programs/CS/3_Build_BusinessRichClient_net48.bat similarity index 95% rename from root_VS2015/programs/VB/3_Build_BusinessRichClient_net46.bat rename to root_VS2022/programs/CS/3_Build_BusinessRichClient_net48.bat index 339080b58..2430b8a85 100644 --- a/root_VS2015/programs/VB/3_Build_BusinessRichClient_net46.bat +++ b/root_VS2022/programs/CS/3_Build_BusinessRichClient_net48.bat @@ -19,8 +19,8 @@ rem -------------------------------------------------- rem Build the Infrastructures rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\BusinessRichClient_net46.sln" -%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_net46.sln" +..\nuget.exe restore "Frameworks\Infrastructure\BusinessRichClient_net48.sln" +%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_net48.sln" pause diff --git a/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat b/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat new file mode 100644 index 000000000..80730d81c --- /dev/null +++ b/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Build the batch Infrastructure +rem -------------------------------------------------- +call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore50.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore50.sln" + +pause + +rem ------------------------------------------------------- +endlocal \ No newline at end of file diff --git a/root_VS2015/programs/CS/3_Build_Business_net46.bat b/root_VS2022/programs/CS/3_Build_Business_net48.bat similarity index 91% rename from root_VS2015/programs/CS/3_Build_Business_net46.bat rename to root_VS2022/programs/CS/3_Build_Business_net48.bat index ad5310ee2..39ccf9e81 100644 --- a/root_VS2015/programs/CS/3_Build_Business_net46.bat +++ b/root_VS2022/programs/CS/3_Build_Business_net48.bat @@ -19,8 +19,8 @@ rem -------------------------------------------------- rem Build the Infrastructures rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\Business_net46.sln" -%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Business_net46.sln" +..\nuget.exe restore "Frameworks\Infrastructure\Business_net48.sln" +%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Business_net48.sln" pause diff --git a/root_VS2022/programs/CS/3_Build_Business_netcore50.bat b/root_VS2022/programs/CS/3_Build_Business_netcore50.bat new file mode 100644 index 000000000..372a64a01 --- /dev/null +++ b/root_VS2022/programs/CS/3_Build_Business_netcore50.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Build the batch Infrastructure +rem -------------------------------------------------- +call dotnet restore "Frameworks\Infrastructure\Business_netcore50.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore50.sln" + +pause + +rem ------------------------------------------------------- +endlocal \ No newline at end of file diff --git a/root_VS2015/programs/CS/4_Build_Framework_Tool.bat b/root_VS2022/programs/CS/4_Build_Framework_Tool.bat similarity index 100% rename from root_VS2015/programs/CS/4_Build_Framework_Tool.bat rename to root_VS2022/programs/CS/4_Build_Framework_Tool.bat diff --git a/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat b/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat new file mode 100644 index 000000000..a33ae808e --- /dev/null +++ b/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat @@ -0,0 +1,35 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of DPQuery_Tool. +rem -------------------------------------------------- +call dotnet restore "Frameworks\Tools\DPQuery_Tool\DPQuery_ToolCore.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DPQuery_Tool\DPQuery_ToolCore.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of DaoGen_Tool. +rem -------------------------------------------------- +call dotnet restore "Frameworks\Tools\DaoGen_Tool\DaoGen_ToolCore.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DaoGen_Tool\DaoGen_ToolCore.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2022/programs/CS/5_Build_2CSCore_sample.bat b/root_VS2022/programs/CS/5_Build_2CSCore_sample.bat new file mode 100644 index 000000000..f42958565 --- /dev/null +++ b/root_VS2022/programs/CS/5_Build_2CSCore_sample.bat @@ -0,0 +1,57 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of 2CSClientWin_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" + +rem -------------------------------------------------- +rem Batch build of GenDaoAndBatUpd_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" + +rem -------------------------------------------------- +rem Batch build of TimeStamp_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" + +rem -------------------------------------------------- +rem Batch build of 2CSClientWPF_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" + +rem -------------------------------------------------- +rem Batch build of AsyncEvent_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\2CS_sample\AsyncEvent_sample\AsyncEvent_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\2CS_sample\AsyncEvent_sample\AsyncEvent_sample.sln" + +rem -------------------------------------------------- +rem Batch build of CustCtrl_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\2CS_sample\CustCtrl_sample\CustCtrl_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\2CS_sample\CustCtrl_sample\CustCtrl_sample.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2015/programs/CS/5_Build_2CS_sample.bat b/root_VS2022/programs/CS/5_Build_2CS_sample.bat similarity index 100% rename from root_VS2015/programs/CS/5_Build_2CS_sample.bat rename to root_VS2022/programs/CS/5_Build_2CS_sample.bat diff --git a/root_VS2022/programs/CS/5_Build_BatCore_sample.bat b/root_VS2022/programs/CS/5_Build_BatCore_sample.bat new file mode 100644 index 000000000..506fb69fb --- /dev/null +++ b/root_VS2022/programs/CS/5_Build_BatCore_sample.bat @@ -0,0 +1,51 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of SimpleBatch_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of RerunnableBatch_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of RerunnableBatch_sample2. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of RerunnableBatch_sample2. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2015/programs/CS/5_Build_Bat_sample.bat b/root_VS2022/programs/CS/5_Build_Bat_sample.bat similarity index 100% rename from root_VS2015/programs/CS/5_Build_Bat_sample.bat rename to root_VS2022/programs/CS/5_Build_Bat_sample.bat diff --git a/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat b/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat new file mode 100644 index 000000000..03c8065ca --- /dev/null +++ b/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat @@ -0,0 +1,36 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Make the Directory. +rem -------------------------------------------------- +md "Samples4NetCore\Legacy\WS_sample\Temp" +md "Samples4NetCore\Legacy\WS_sample\Build" + +rem -------------------------------------------------- +rem Batch build of WSServer_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln" + +xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0\" +xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Build\net5.0\" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2015/programs/CS/6_Build_WSSrv_sample.bat b/root_VS2022/programs/CS/6_Build_WSSrv_sample.bat similarity index 100% rename from root_VS2015/programs/CS/6_Build_WSSrv_sample.bat rename to root_VS2022/programs/CS/6_Build_WSSrv_sample.bat diff --git a/root_VS2015/programs/CS/7_Build_Framework_WS.bat b/root_VS2022/programs/CS/7_Build_Framework_WS.bat similarity index 100% rename from root_VS2015/programs/CS/7_Build_Framework_WS.bat rename to root_VS2022/programs/CS/7_Build_Framework_WS.bat diff --git a/root_VS2022/programs/CS/7_Build_Framework_WSCore.bat b/root_VS2022/programs/CS/7_Build_Framework_WSCore.bat new file mode 100644 index 000000000..ee60cc3b3 --- /dev/null +++ b/root_VS2022/programs/CS/7_Build_Framework_WSCore.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of ServiceInterface(ASPNETWebServiceCore). +rem -------------------------------------------------- +dotnet restore "Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore.sln" +dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2022/programs/CS/8_Build_WSClntCore_sample.bat b/root_VS2022/programs/CS/8_Build_WSClntCore_sample.bat new file mode 100644 index 000000000..6ed689dc2 --- /dev/null +++ b/root_VS2022/programs/CS/8_Build_WSClntCore_sample.bat @@ -0,0 +1,43 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of WSClientWin_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of WSClientWPF_sample. +rem -------------------------------------------------- +rem dotnet restore "Samples4NetCore\Legacy\WS_sample\WSClient_sample\WSClientWinWPF_sample\WSClientWinWPF_sample.sln" +rem dotnet msbuild "Samples4NetCore\Legacy\WS_sample\WSClient_sample\WSClientWinWPF_sample\WSClientWinWPF_sample.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of WSClientWin2_sample. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\WS_sample\WSClient_sample\WSClientWin2_sample\WSClientWin2_sample.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\WS_sample\WSClient_sample\WSClientWin2_sample\WSClientWin2_sample.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2015/programs/CS/8_Build_WSClnt_sample.bat b/root_VS2022/programs/CS/8_Build_WSClnt_sample.bat similarity index 100% rename from root_VS2015/programs/CS/8_Build_WSClnt_sample.bat rename to root_VS2022/programs/CS/8_Build_WSClnt_sample.bat index 708d68e18..1c62601cb 100644 --- a/root_VS2015/programs/CS/8_Build_WSClnt_sample.bat +++ b/root_VS2022/programs/CS/8_Build_WSClnt_sample.bat @@ -24,24 +24,24 @@ rem -------------------------------------------------- pause rem -------------------------------------------------- -rem Batch build of WSClientWin2_sample. +rem Batch build of WSClientWPF_sample. rem -------------------------------------------------- -%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWin2_sample\WSClientWin2_sample.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" pause rem -------------------------------------------------- -rem Batch build of WSClientWinCone_sample. +rem Batch build of WSClientWin2_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" -%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWin2_sample\WSClientWin2_sample.sln" pause rem -------------------------------------------------- -rem Batch build of WSClientWPF_sample. +rem Batch build of WSClientWinCone_sample. rem -------------------------------------------------- -%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" +..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" pause diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business/MyBaseLogic.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business/MyBaseLogic.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business/MyBaseLogic.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business/MyBaseLogic.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business/_3TierEngine.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business/_3TierEngine.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business/_3TierEngine.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business/_3TierEngine.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business_net46.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj similarity index 84% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business_net46.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj index 32376a394..c7b0faeb9 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Business_net46.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj @@ -18,7 +18,7 @@ - v4.6 + v4.8 2.0 @@ -46,21 +46,21 @@ true full false - ..\Build_net46\ - DEBUG;TRACE;NET46 + ..\Build_net48\ + DEBUG;TRACE;NET48 prompt 4 - ..\Build_net46\OpenTouryo.Business.XML + ..\Build_net48\OpenTouryo.Business.XML false pdbonly true - ..\Build_net46\ - TRACE;NET46 + ..\Build_net48\ + TRACE;NET48 prompt 4 - ..\Build_net46\OpenTouryo.Business.XML + ..\Build_net48\OpenTouryo.Business.XML false @@ -74,7 +74,7 @@ ..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll - ..\packages\jose-jwt.2.4.0\lib\net40\jose-jwt.dll + ..\packages\jose-jwt.2.4.0\lib\net461\jose-jwt.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll @@ -99,22 +99,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net46\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net48\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net46\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net48\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net46\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net48\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net46\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net48\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net46\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll @@ -124,35 +124,15 @@ True - - - - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll True - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - - ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll - - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll True @@ -182,7 +162,6 @@ True - diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj new file mode 100644 index 000000000..1a66abad3 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj @@ -0,0 +1,76 @@ + + + + net5.0 + Touryo.Infrastructure.Business + OpenTouryo.Business + true + + + + TRACE;DEBUG;NETCOREAPP + ..\Build_netcore50\ + ..\Build_netcore50\net5.0\OpenTouryo.Business.xml + full + true + 1701;1702;NU1701 + + + + TRACE;NETCOREAPP + ..\Build_netcore50\ + ..\Build_netcore50\net5.0\OpenTouryo.Business.xml + portable + true + 1701;1702;NU1701 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MuParameterValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MuParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MuParameterValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MuParameterValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MuReturnValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MuReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MuReturnValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MuReturnValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MyParameterValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MyParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MyParameterValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MyParameterValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MyReturnValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MyReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/MyReturnValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/MyReturnValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Dao/CmnDao.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Dao/CmnDao.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Dao/CmnDao.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Dao/CmnDao.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Dao/MyBaseDao.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Dao/MyBaseDao.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Dao/MyBaseDao.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Dao/MyBaseDao.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/AuthenticationFailureResult.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/AuthenticationFailureResult.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/AuthenticationFailureResult.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/AuthenticationFailureResult.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiController.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiController.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiController.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiController.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiControllerCore.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiControllerCore.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiControllerCore.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseAsyncApiControllerCore.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyMVCCoreFilterAttribute.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyMVCCoreFilterAttribute.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyMVCCoreFilterAttribute.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyMVCCoreFilterAttribute.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/ResultWithChallenge.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/ResultWithChallenge.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Presentation/ResultWithChallenge.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Presentation/ResultWithChallenge.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs similarity index 63% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs index ec2cdb203..bbb736bc0 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// このコードはツールによって生成されました。 +// ランタイム バージョン:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +// コードが再生成されるときに損失したりします。 // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace Touryo.Infrastructure.Business.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // このクラスは StronglyTypedResourceBuilder クラスが ResGen + // または Visual Studio のようなツールを使用して自動生成されました。 + // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に + // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class MyBusinessApplicationExceptionMessageResource { @@ -33,7 +33,7 @@ internal MyBusinessApplicationExceptionMessageResource() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -48,8 +48,8 @@ internal MyBusinessApplicationExceptionMessageResource() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします + /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -62,7 +62,7 @@ internal MyBusinessApplicationExceptionMessageResource() { } /// - /// Looks up a localized string similar to Message_SampleError . + /// Message_SampleError に類似しているローカライズされた文字列を検索します。 /// internal static string SAMPLE_ERROR { get { diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs similarity index 63% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs index afb9a628c..44ff66c94 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// このコードはツールによって生成されました。 +// ランタイム バージョン:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +// コードが再生成されるときに損失したりします。 // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace Touryo.Infrastructure.Business.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // このクラスは StronglyTypedResourceBuilder クラスが ResGen + // または Visual Studio のようなツールを使用して自動生成されました。 + // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に + // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class MyBusinessSystemExceptionMessageResource { @@ -33,7 +33,7 @@ internal MyBusinessSystemExceptionMessageResource() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -48,8 +48,8 @@ internal MyBusinessSystemExceptionMessageResource() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします + /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -62,7 +62,7 @@ internal MyBusinessSystemExceptionMessageResource() { } /// - /// Looks up a localized string similar to The error occurred in common Dao. :{0}. + /// The error occurred in common Dao. :{0} に類似しているローカライズされた文字列を検索します。 /// internal static string CMN_DAO_ERROR { get { @@ -71,7 +71,7 @@ internal static string CMN_DAO_ERROR { } /// - /// Looks up a localized string similar to The SQL file name or SQL text is not specified.. + /// The SQL file name or SQL text is not specified. に類似しているローカライズされた文字列を検索します。 /// internal static string CMN_DAO_ERROR_SQL { get { @@ -80,7 +80,7 @@ internal static string CMN_DAO_ERROR_SQL { } /// - /// Looks up a localized string similar to Message_SampleError. + /// Message_SampleError に類似しているローカライズされた文字列を検索します。 /// internal static string SAMPLE_ERROR { get { @@ -89,7 +89,7 @@ internal static string SAMPLE_ERROR { } /// - /// Looks up a localized string similar to The error occurred in workflow. :{0}. + /// The error occurred in workflow. :{0} に類似しているローカライズされた文字列を検索します。 /// internal static string WORKFLOW_ERROR { get { @@ -98,7 +98,7 @@ internal static string WORKFLOW_ERROR { } /// - /// Looks up a localized string similar to {0} argument is empty.. + /// {0} argument is empty. に類似しているローカライズされた文字列を検索します。 /// internal static string WORKFLOW_ERROR_CHECK_EMPTY { get { @@ -107,7 +107,7 @@ internal static string WORKFLOW_ERROR_CHECK_EMPTY { } /// - /// Looks up a localized string similar to {0} field is not contained in the {1} argument.. + /// {0} field is not contained in the {1} argument. に類似しているローカライズされた文字列を検索します。 /// internal static string WORKFLOW_ERROR_CHECK_FIELD_ISNT_CONTAINED { get { diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj similarity index 51% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj index 51197bc10..935589f2a 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj @@ -10,7 +10,7 @@ Properties Touryo.Infrastructure.Business.RichClient OpenTouryo.Business.RichClient - v4.6 + v4.8 512 @@ -45,62 +45,44 @@ true full false - ..\..\Build_net46\ - DEBUG;TRACE;NET46 + ..\..\Build_net48\ + DEBUG;TRACE;NET48 prompt 4 - ..\..\Build_net46\OpenTouryo.Business.RichClient.XML + ..\..\Build_net48\OpenTouryo.Business.RichClient.XML false pdbonly true - ..\..\Build_net46\ - TRACE;NET46 + ..\..\Build_net48\ + TRACE;NET48 prompt 4 - ..\..\Build_net46\OpenTouryo.Business.RichClient.XML + ..\..\Build_net48\OpenTouryo.Business.RichClient.XML false - - ..\..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\Build_net46\OpenTouryo.Business.dll + ..\..\Build_net48\OpenTouryo.Business.dll - ..\..\Build_net46\OpenTouryo.DamManagedOdp.dll + ..\..\Build_net48\OpenTouryo.DamManagedOdp.dll - ..\..\Build_net46\OpenTouryo.DamMySQL.dll + ..\..\Build_net48\OpenTouryo.DamMySQL.dll - ..\..\Build_net46\OpenTouryo.DamPstGrS.dll + ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - - ..\..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net46\OpenTouryo.Framework.dll + + ..\..\Build_net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net46\OpenTouryo.Framework.RichClient.dll - - - ..\..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll + + ..\..\Build_net48\OpenTouryo.Public.dll 3.0 @@ -111,24 +93,6 @@ - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll - diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj new file mode 100644 index 000000000..f355f0e00 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj @@ -0,0 +1,64 @@ + + + + Library + net5.0-windows + true + true + OpenTouryo.Business.RichClient + Touryo.Infrastructure.Business.RichClient + true + + + + TRACE;NETCOREAPP + ..\..\Build_netcore50\ + ..\..\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.xml + full + true + 1701;1702;NU1701 + + + + TRACE;NETCOREAPP + ..\..\Build_netcore50\ + ..\..\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.xml + portable + true + 1701;1702;NU1701 + + + + + + + + + ..\..\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\Build_netcore50\net5.0\OpenTouryo.DamManagedOdp.dll + + + ..\..\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + ..\..\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config similarity index 68% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index c702b9867..f6612f4ab 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -1,15 +1,15 @@  - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/GMTMaster.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/GMTMaster.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/GMTMaster.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/GMTMaster.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyAttribute.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyAttribute.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyAttribute.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyAttribute.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyCmnFunction.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyCmnFunction.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyCmnFunction.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyCmnFunction.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyLiteral.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyLiteral.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyLiteral.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyLiteral.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MySubsysInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MySubsysInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MySubsysInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MySubsysInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZone.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZone.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZone.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZone.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyUserInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyUserInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/Util/MyUserInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Util/MyUserInfo.cs diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/app.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/app.config similarity index 80% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/app.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/app.config index ba867b15d..2b8aab4c4 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/app.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/app.config @@ -6,15 +6,6 @@ - - - - - - - - - @@ -27,13 +18,21 @@ + + + + + + + + - - + + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config similarity index 66% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/packages.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config index c0d6da3bc..109e0ecc0 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -1,29 +1,29 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net46.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln similarity index 81% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net46.sln rename to root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln index 3a3a6fc62..6e5953df8 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net46.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net46.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net48.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net46.csproj", "{85861BE7-A77E-46BE-9FFE-330654571C32}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net48.csproj", "{85861BE7-A77E-46BE-9FFE-330654571C32}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {1E62166E-41DD-4BBE-B9ED-F0CE531B9638} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln new file mode 100644 index 000000000..f01183333 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore30", "Business\RichClient\Business.RichClient_netcore50.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore30", "CustomControl\RichClient\CustomControl.RichClient_netcore50.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7518B624-536C-4F4B-8E73-E5421EDCF1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7518B624-536C-4F4B-8E73-E5421EDCF1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7518B624-536C-4F4B-8E73-E5421EDCF1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7518B624-536C-4F4B-8E73-E5421EDCF1DD}.Release|Any CPU.Build.0 = Release|Any CPU + {7F43B77D-7B02-4C18-94CC-4B1348CDEB57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F43B77D-7B02-4C18-94CC-4B1348CDEB57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F43B77D-7B02-4C18-94CC-4B1348CDEB57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F43B77D-7B02-4C18-94CC-4B1348CDEB57}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F8E24A69-525F-46B8-B01A-3223411B148E} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business_net46.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln similarity index 81% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business_net46.sln rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln index f50f28e08..af760c2c0 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business_net46.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business_net46.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business_net48.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl", "CustomControl\CustomControl_net46.csproj", "{2C6108F5-DEB1-4821-8CE0-E80619A06E03}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl", "CustomControl\CustomControl_net48.csproj", "{2C6108F5-DEB1-4821-8CE0-E80619A06E03}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F2A26B17-FB2B-4B35-8547-AAF71DFFF621} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln new file mode 100644 index 000000000..b9f8c8748 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business", "Business\Business_netcore50.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {87C03805-26A4-452B-97C7-2C8598722DDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87C03805-26A4-452B-97C7-2C8598722DDE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87C03805-26A4-452B-97C7-2C8598722DDE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87C03805-26A4-452B-97C7-2C8598722DDE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2FF75561-B8E7-4F22-A5F7-E967511FD51B} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net46.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj similarity index 92% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net46.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj index e7596bbcb..b58b5a458 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net46.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj @@ -18,7 +18,7 @@ - v4.6 + v4.8 2.0 @@ -44,21 +44,21 @@ true full false - ..\Build_net46\ - DEBUG;TRACE;NET46 + ..\Build_net48\ + DEBUG;TRACE;NET48 prompt 4 - ..\Build_net46\OpenTouryo.CustomControl.XML + ..\Build_net48\OpenTouryo.CustomControl.XML false pdbonly true - ..\Build_net46\ - TRACE;NET46 + ..\Build_net48\ + TRACE;NET48 prompt 4 - ..\Build_net46\OpenTouryo.CustomControl.XML + ..\Build_net48\OpenTouryo.CustomControl.XML false @@ -72,7 +72,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CheckResult.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CheckResult.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CheckResult.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CheckResult.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/ListItem.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/ListItem.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Function/ListItem.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Function/ListItem.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/ICheck.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/ICheck.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/ICheck.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/ICheck.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj similarity index 56% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj index 67861f145..2b8281ece 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj @@ -13,18 +13,8 @@ 3.5 - - - - - - - - - - true - v4.6 + v4.8 http://localhost/CustomControl.RichClient/ true @@ -45,73 +35,37 @@ true full false - ..\..\Build_net46\ - DEBUG;TRACE;NET46 + ..\..\Build_net48\ + DEBUG;TRACE;NET48 prompt 4 - ..\..\Build_net46\OpenTouryo.CustomControl.RichClient.XML + ..\..\Build_net48\OpenTouryo.CustomControl.RichClient.XML false pdbonly true - ..\..\Build_net46\ - TRACE;NET46 + ..\..\Build_net48\ + TRACE;NET48 prompt 4 - ..\..\Build_net46\OpenTouryo.CustomControl.RichClient.XML + ..\..\Build_net48\OpenTouryo.CustomControl.RichClient.XML false - - ..\..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net46\OpenTouryo.Framework.dll + + ..\..\Build_net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net46\OpenTouryo.Framework.RichClient.dll - - - ..\..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll + + ..\..\Build_net48\OpenTouryo.Public.dll - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll - diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj new file mode 100644 index 000000000..baf256b98 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj @@ -0,0 +1,52 @@ + + + + Library + net5.0-windows + true + true + OpenTouryo.CustomControl.RichClient + Touryo.Infrastructure.CustomControl.RichClient + true + + + + TRACE;NETCOREAPP + ..\..\Build_netcore50\ + ..\..\Build_netcore50\net5.0-windows\OpenTouryo.CustomControl.RichClient.xml + full + true + 1701;1702;NU1701 + + + + TRACE;NETCOREAPP + ..\..\Build_netcore50\ + ..\..\Build_netcore50\net5.0-windows\OpenTouryo.CustomControl.RichClient.xml + portable + true + 1701;1702;NU1701 + + + + + + + + + + + + + ..\..\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.cs diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config similarity index 68% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index c702b9867..f6612f4ab 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -1,15 +1,15 @@  - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/app.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/app.config similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/app.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/app.config diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config similarity index 70% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config index be424691f..a2b25f722 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln similarity index 83% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln index 99fae8e60..f443e20db 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebService", "ASPNETWebService\ASPNETWebService.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {590C9521-A19B-49AF-BA23-F732300C83E5} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj similarity index 72% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj index 6066ac1ea..0b58cdfc3 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj @@ -1,6 +1,5 @@  - - + Debug @@ -14,8 +13,9 @@ Properties ASPNETWebService ASPNETWebService - v4.6 + v4.8 true + @@ -23,7 +23,7 @@ - + true True @@ -47,94 +47,66 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + + ..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\..\..\Build_net46\OpenTouryo.Business.dll + ..\..\..\Build_net48\OpenTouryo.Business.dll - ..\..\..\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Build_net48\OpenTouryo.Framework.dll + + + ..\..\..\Build_net48\OpenTouryo.Public.dll - ..\packages\Owin.1.0\lib\net40\Owin.dll - True - - ..\..\..\Build_net46\OpenTouryo.Public.dll - - - - - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - - ..\packages\Microsoft.AspNet.Cors.5.2.6\lib\net45\System.Web.Cors.dll + + ..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll - - - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.Cors.5.2.6\lib\net45\System.Web.Http.Cors.dll + + ..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.6\lib\net45\System.Web.Http.WebHost.dll + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - ..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll + - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - - True - ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll - - - ..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll ..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -145,11 +117,37 @@ ..\..\..\..\..\Samples\WS_sample\Build\WSServer_sample.dll - - - + + + + + + + + + + + + + + + + + + + + + True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + + + + True + ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + @@ -157,14 +155,16 @@ Designer - - - + Web.config - - + + Web.config - + + + Designer + + @@ -181,7 +181,9 @@ WCFHTTPSvcForFx.svc - + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -189,6 +191,9 @@ + + + @@ -207,17 +212,10 @@ - - - このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。 - - - + --> \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config similarity index 91% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index a2bc5a24c..3e35fbeee 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -34,7 +34,7 @@ - + - + @@ -244,44 +244,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/app.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/app.config similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/app.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/app.config diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config new file mode 100644 index 000000000..cea4c5d2c --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln new file mode 100644 index 000000000..3075dcd3b --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASPNETWebServiceCore", "ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3DC00DE5-BB95-47DA-8FBE-BBEEF24C887D} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj new file mode 100644 index 000000000..f05ed04fe --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj @@ -0,0 +1,46 @@ + + + + net5.0 + true + + + + + + + + + + + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.DamManagedOdp.dll + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + + + ..\..\..\..\..\Samples4NetCore\Legacy\WS_sample\Build\net5.0\WSIFType_sample.dll + + + ..\..\..\..\..\Samples4NetCore\Legacy\WS_sample\Build\net5.0\WSServer_sample.dll + + + + diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs new file mode 100644 index 000000000..5db728269 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs @@ -0,0 +1,385 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +#region Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +//********************************************************************************** +//* クラス名 ：FxController +//* クラス日本語名 ：ASP.NET WebAPI JSON-RPCの.NETオブジェクトの +//* バイナリ転送用メソッドを公開するサービス インターフェイス基盤 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 2017/08/18 西野 大介 新規作成 +//* 2019/11/18 西野 大介 .NET Core化 +//* 2021/05/18 西野 大介 ASP.NET WebAPI（JSON）の例外処理の問題を修正 +//********************************************************************************** + +using System; +//using System.Data; +using System.Collections.Generic; +using System.Threading.Tasks; +using System.Diagnostics; +using System.Runtime.ExceptionServices; + +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Cors; + +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Framework.Transmission; +using Touryo.Infrastructure.Framework.Authentication; +using Touryo.Infrastructure.Framework.Exceptions; +using Touryo.Infrastructure.Framework.Common; +using Touryo.Infrastructure.Framework.Util; + +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Log; +using Touryo.Infrastructure.Public.Str; +using Touryo.Infrastructure.Public.Util; +using Touryo.Infrastructure.Public.Reflection; + +namespace ASPNETWebService.Controllers +{ + /// + /// ASP.NET WebAPI JSON-RPCの.NETオブジェクトの + /// バイナリ転送用メソッドを公開するサービス インターフェイス基盤 + /// + [EnableCors] + //[ApiController] + public class FxController : ControllerBase + { + #region 疎通テスト用 + + /// + /// 疎通テスト用 + /// http(s)://hostName:portNum/testで疎通テスト可能。 + /// + /// Dictionary(string, string) + [HttpGet] + [Route("test")] + public Dictionary test() + { + Dictionary dic = new Dictionary(); + dic.Add("AAA", "aaa"); + dic.Add("BBB", "bbb"); + dic.Add("CCC", "ccc"); + + return dic; + } + + #endregion + + #region グローバル変数 + + /// インプロセス呼び出しの名前解決シングルトン クラス + /// + /// 初期化は起動時の１回のみであり、 + /// 読み取り専用のデータを保持する場合 + /// のみに適用するデザインパターンとする。 + /// + private static InProcessNameService IPR_NS = new InProcessNameService(); + + #endregion + + #region ASP.NET WebAPI JSON-RPCの.NETオブジェクトのバイナリ転送用メソッド + + /// + /// ASP.NET WebAPI JSON-RPCの.NETオブジェクトのバイナリ転送用メソッド + /// + /// + /// 引数：Dictionary(string, string) + /// ・ServiceName + /// ・ContextObject + /// ・ParameterValueObject + /// + /// + /// 戻り値：Dictionary(string, string) + /// ・Return + /// ・ContextObject + /// ・ReturnValueObject + /// + [HttpPost] + //[Route("WebAPIControllerForFx")] → Startup.cs へ + public async Task> DotNETOnlineWebAPI([FromBody] Dictionary paramDic) + { + // 引数 + string serviceName = paramDic["ServiceName"]; + byte[] contextObject = CustomEncode.FromBase64String(paramDic["ContextObject"]); + byte[] parameterValueObject = CustomEncode.FromBase64String(paramDic["ParameterValueObject"]); + + // 戻り値 + byte[] ret = null; + byte[] returnValueObject = null; + Dictionary returnDic = new Dictionary(); + + // ステータス + string status = "－"; + + // 初期化のため + returnValueObject = null; + + #region 呼出し制御関係の変数 + + // アセンブリ名 + string assemblyName = ""; + + // クラス名 + string className = ""; + + #endregion + + #region 引数・戻り値関係の変数 + + // コンテキスト情報 + object context; // 2009/09/29-この行 + + // 引数・戻り値の.NETオブジェクト + BaseParameterValue parameterValue = null; + BaseReturnValue returnValue = null; + + // エラー情報（クライアント側で復元するため） + WSErrorInfo wsErrorInfo = new WSErrorInfo(); + + // エラー情報（ログ出力用） + string errorType = ""; // 2009/09/15-この行 + string errorMessageID = ""; + string errorMessage = ""; + string errorToString = ""; + + #endregion + + try + { + // 開始ログの出力 + LogIF.InfoLog("SERVICE-IF", FxLiteral.SIF_STATUS_START); + + #region 名前解決 + + // ★ + status = FxLiteral.SIF_STATUS_NAME_SERVICE; + + // 名前解決（インプロセス） + FxController.IPR_NS.NameResolution(serviceName, out assemblyName, out className); + + #endregion + + #region 引数のデシリアライズ + + // ★ + status = FxLiteral.SIF_STATUS_DESERIALIZE; + + // コンテキストクラスの.NETオブジェクト化 + context = BinarySerialize.BytesToObject(contextObject); // 2009/09/29-この行 + // ※ コンテキストの利用方法は任意だが、サービスインターフェイス上での利用に止める。 + + // 引数クラスの.NETオブジェクト化 + parameterValue = (BaseParameterValue)BinarySerialize.BytesToObject(parameterValueObject); + + // 引数クラスをパラメタ セットに格納 + object[] paramSet = new object[] { parameterValue, DbEnum.IsolationLevelEnum.User }; + + #endregion + + #region 認証処理のＵＯＣ + + // ★ + status = FxLiteral.SIF_STATUS_AUTHENTICATION; + + if (context is string) + { + // System.Stringの場合 + string access_token = (string)context; + if (!string.IsNullOrEmpty(access_token)) + { + string sub = ""; + List roles = null; + List scopes = null; + JObject jobj = null; + + if (AccessToken.Verify(access_token, out sub, out roles, out scopes, out jobj)) + { + // 認証成功 + Debug.WriteLine("認証成功"); + } + else + { + // 認証失敗（認証必須ならエラーにする。 + } + } + else + { + // 認証失敗（認証必須ならエラーにする。 + } + } + else + { + // MyUserInfoの場合 + } + + //contextObject = BinarySerialize.ObjectToBytes(hogehoge); // 更新可能だが...。 + + #endregion + + #region Ｂ層・Ｄ層呼出し + + // ★ + status = FxLiteral.SIF_STATUS_INVOKE; + + // #17-start + try + { + // Ｂ層・Ｄ層呼出し + Task result = (Task)Latebind.InvokeMethod( + assemblyName, className, + FxLiteral.TRANSMISSION_INPROCESS_ASYNC_METHOD_NAME, paramSet); + returnValue = await result; + } + catch (System.Reflection.TargetInvocationException rtEx) + { + //// InnerExceptionを投げなおす。 + //throw rtEx.InnerException; + + // スタックトレースを保って InnerException を throw + ExceptionDispatchInfo.Capture(rtEx.InnerException).Throw(); + } + // #17-end + + #endregion + + #region 戻り値のシリアライズ + + // ★ + status = FxLiteral.SIF_STATUS_SERIALIZE; + + returnValueObject = BinarySerialize.ObjectToBytes(returnValue); + + #endregion + + // ★ + status = ""; + + // 戻り値を返す。 + ret = BinarySerialize.ObjectToBytes(""); + } + catch (BusinessSystemException bsEx) + { + // システム例外 + + // エラー情報を設定する。 + wsErrorInfo.ErrorType = FxEnum.ErrorType.BusinessSystemException; + wsErrorInfo.ErrorMessageID = bsEx.messageID; + wsErrorInfo.ErrorMessage = bsEx.Message; + + // ログ出力用の情報を保存 + errorType = FxEnum.ErrorType.BusinessSystemException.ToString(); // 2009/09/15-この行 + errorMessageID = bsEx.messageID; + errorMessage = bsEx.Message; + + errorToString = bsEx.ToString(); + + // エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo); + } + catch (FrameworkException fxEx) + { + // フレームワーク例外 + // ★ インナーエクセプション情報は消失 + + // エラー情報を設定する。 + wsErrorInfo.ErrorType = FxEnum.ErrorType.FrameworkException; + wsErrorInfo.ErrorMessageID = fxEx.messageID; + wsErrorInfo.ErrorMessage = fxEx.Message; + + // ログ出力用の情報を保存 + errorType = FxEnum.ErrorType.FrameworkException.ToString(); // 2009/09/15-この行 + errorMessageID = fxEx.messageID; + errorMessage = fxEx.Message; + + errorToString = fxEx.ToString(); + + // エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo); + } + catch (Exception ex) + { + // エラー情報を設定する。 + wsErrorInfo.ErrorType = FxEnum.ErrorType.ElseException; + //wsErrorInfo.ErrorMessageID = fxEx.messageID; + wsErrorInfo.ErrorMessage = ex.Message; + + // ログ出力用の情報を保存 + errorType = FxEnum.ErrorType.ElseException.ToString(); // 2009/09/15-この行 + errorMessageID = "－"; + errorMessage = ex.Message; + + errorToString = ex.ToString(); + + //throw; // SoapExceptionになって伝播しない + + // エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo); + } + finally + { + //// Sessionステートレス + //Session.Clear(); + //Session.Abandon(); + + // 終了ロクの出力 + if (status == "") + { + // 終了ログ出力 + LogIF.InfoLog("SERVICE-IF", "正常終了"); + } + else + { + // 終了ログ出力 + LogIF.ErrorLog("SERVICE-IF", + "異常終了" + + "：" + status + "\r\n" + + "エラー タイプ：" + errorType + "\r\n" // 2009/09/15-この行 + + "エラー メッセージID：" + errorMessageID + "\r\n" + + "エラー メッセージ：" + errorMessage + "\r\n" + + errorToString); + } + } + + returnDic.Add("Return", CustomEncode.ToBase64String(ret)); + returnDic.Add("ContextObject", CustomEncode.ToBase64String(contextObject)); + if (returnValueObject != null) + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)); + } + else + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(BinarySerialize.ObjectToBytes(""))); + } + + return returnDic; + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/ValuesController.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/ValuesController.cs new file mode 100644 index 000000000..35278ba54 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/ValuesController.cs @@ -0,0 +1,44 @@ +//********************************************************************************** +//* テスト・コントローラー +//********************************************************************************** + +// テスト・コントローラーなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ValuesController +//* クラス日本語名 ：疎通確認用 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 2018/09/07 西野 大介 新規作成 +//********************************************************************************** + +using System.Collections.Generic; + +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Cors; + +namespace ASPNETWebServiceCore.Controllers +{ + [EnableCors] + [ApiController] + [Route("api/[controller]/[action]")] + public class ValuesController : ControllerBase + { + /// + /// GET api/values/get + /// + /// + /// IEnumerable(string) + /// + [HttpGet] + public IEnumerable get() + { + return new string[] { "value1", "value2" }; + } + } +} diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Program.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Program.cs new file mode 100644 index 000000000..d4e142b62 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Program.cs @@ -0,0 +1,55 @@ +//********************************************************************************** +//* テンプレート +//********************************************************************************** + +// サンプル中のテンプレートなので、必要に応じて使用して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：Program +//* +//* 作成日時 ：－ +//* 作成者 ：－ +//* 更新履歴 ：－ +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Net.Http; + +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; + +using Touryo.Infrastructure.Framework.Authentication; + +namespace ASPNETWebServiceCore +{ + /// Program + public class Program + { + /// + /// Main（エントリポイント） + /// コマンドライン引数 + public static void Main(string[] args) + { + // JwkSet取得用 + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + + // BuildWebHostが返すIWebHostをRunする。 + // 呼び出し元スレッドは終了までブロックされる。 + Program.CreateHostBuilder(args).Build().Run(); + } + + /// CreateHostBuilder + /// コマンドライン引数 + /// IWebHost + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } +} diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Properties/launchSettings.json b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Properties/launchSettings.json new file mode 100644 index 000000000..03012eaef --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8888/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "ASPNETWebService": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:8888/" + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Startup.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Startup.cs new file mode 100644 index 000000000..df06c2849 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Startup.cs @@ -0,0 +1,159 @@ +//********************************************************************************** +//* テンプレート +//********************************************************************************** + +// サンプル中のテンプレートなので、必要に応じて使用して下さい。 + +//********************************************************************************** +//* クラス名 ：Startup +//* クラス日本語名 ：Startup +//* +//* 作成日時 ：－ +//* 作成者 ：－ +//* 更新履歴 ：－ +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.HttpsPolicy; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +// using Microsoft.AspNetCore.Mvc.Cors.Internal; + +using Touryo.Infrastructure.Framework.StdMigration; +using Touryo.Infrastructure.Public.Util; + +namespace ASPNETWebServiceCore +{ + /// + /// Startup + /// ミドルウェア /サービス / フレームワークを + /// Startupクラスのメソッドで注入することにより、活用できるようになる。 + /// + public class Startup + { + #region mem & prop & constructor + + /// Configuration + public IConfiguration Configuration { get; } + + /// constructor + /// IConfiguration + public Startup(IConfiguration configuration) + { + Configuration = configuration; + + // ライブラリにも設定 + GetConfigParameter.InitConfiguration(configuration); + // Dockerで埋め込まれたリソースを使用する場合、 + // 以下のコメントアウトを解除し、appsettings.jsonのappSettings sectionに、 + // "Azure": "既定の名前空間" を指定し、設定ファイルを埋め込まれたリソースに変更する。 + //Touryo.Infrastructure.Business.Dao.MyBaseDao.UseEmbeddedResource = true; + } + + #endregion + + #region Configure & ConfigureServices + + /// + /// This method gets called by the runtime. + /// Use this method to configure the HTTP request pipeline. + /// + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + else + { + // The default HSTS value is 30 days. + // You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } + + // HttpContextのマイグレーション用 + app._UseHttpContextAccessor(); + + app.UseHttpsRedirection(); + + app.UseRouting(); + + //app.UseAuthentication(); + //app.UseAuthorization(); + + app.UseCors( //認証・認可の後ろ + builder => builder + .AllowAnyOrigin() + .AllowAnyMethod() + .AllowAnyHeader()); + + //.AllowCredentials()); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllerRoute( + name: "DotNETOnlineWebAPI", + pattern: "WebAPIControllerForFx", + defaults: new { controller = "Fx", action = "DotNETOnlineWebAPI" }); + + endpoints.MapControllerRoute( + name: "hoge", + pattern: "hogehoge", + defaults: new { controller = "Fx", action = "hoge" }); + + endpoints.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); + }); + } + + /// + /// This method gets called by the runtime. + /// Use this method to add services to the container. + /// + /// IServiceCollection + public void ConfigureServices(IServiceCollection services) + { + // 構成情報から、AppConfiguration SectionをAppConfiguration Classへバインドするようなケース。 + //services.Configure(Configuration.GetSection("AppConfiguration")); + + // HttpContextのマイグレーション用 + services._AddHttpContextAccessor(); + + // Core 3.0のテンプレートではUseMvcの + // 代わりにこれらを使用するようになった。 + services + .AddControllers()// WebAPI + .AddNewtonsoftJson();// JSON シリアライザの変更 + + //services.AddControllersWithViews(); // MVC & WebAPI + // services.AddRazorPages(); // Razor Page + + // AddMvc + services.AddMvc(); + + // AddCors + services.AddCors( + o => o.AddPolicy("AllowAllOrigins", + builder => + { + builder + .AllowAnyOrigin() + .AllowAnyMethod() + .AllowAnyHeader(); + })); + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.Development.json b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.Development.json new file mode 100644 index 000000000..fa8ce71a9 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.Development.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json new file mode 100644 index 000000000..3a7af5d27 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json @@ -0,0 +1,86 @@ +{ + // 簡易ログの設定 + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } + } + }, + + // Here is where you can supply custom configuration settings, Since it is is JSON, + // everything is represented as key: value pairs. Name of section is your choice. + "AppConfiguration": { + "XXXX": "xxxx", + "YYYY": "yyyy" + }, + + // 以下は*.configから移行されたsection + + // connectionStrings section + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + + // appSettings section + "appSettings": { + // Webサービス用 + + // フレームワークの使用するパラメータ - start + + // 共有情報定義へのパス + "FxXMLSPDefinition": "C:/root/files/resource/XML/SPDefinition.xml", + // メッセージ定義へのパス + "FxXMLMSGDefinition": "C:/root/files/resource/XML/MSGDefinition.xml", + // トランザクション制御定義へのパス + "FxXMLTCDefinition": "C:/root/files/resource/XML/TCDefinition.xml", + // 名前解決定義へのパス + "FxXMLTMInProcessDefinition": "C:/root/files/resource/XML/TMInProcessDefinition.xml", + + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + + // Log4Netのコンフィグファイルへのパス + "FxLog4NetConfFile": "C:/root/files/resource/Log/SampleLogConfWebService.xml", + // 共通部品の使用するパラメータ - end + // Ｄ層のパフォーマンスログ出力機能のon・off" "-->", + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定", + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + + // OAuth2, OIDC認証 + "SpRp_Isser": "https://ssoauth.opentouryo.com", + "OAuth2AndOidcClientIDs": [ + "67d328bfe8604aae83fb15fa44780d8b", + "f53469c17c5a432f86ce563b7805ab89", + "b6b393fe861b430eb4ee061006826b03", + "f374a155909d486a9234693c34e94479" + ], + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", + + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "C:/root/files/resource/Sql" + + // アプリケーションの使用するパラメータ - end + } +} diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config similarity index 94% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 3430a8bc5..75d9fd5df 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -1,4 +1,4 @@ - + @@ -26,14 +26,14 @@ - + - - + + @@ -87,6 +87,10 @@ + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Program.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Program.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Program.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj similarity index 93% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj index 20e2b67f1..6b2afcab5 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj @@ -10,7 +10,7 @@ Properties WCFService WCFService - v4.6 + v4.8 512 @@ -54,13 +54,13 @@ packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\..\Build_net46\OpenTouryo.Business.dll + ..\..\Build_net48\OpenTouryo.Business.dll - ..\..\Build_net46\OpenTouryo.Framework.dll + ..\..\Build_net48\OpenTouryo.Framework.dll - ..\..\Build_net46\OpenTouryo.Public.dll + ..\..\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln similarity index 82% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln index c8e71d94b..cac0a7415 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCFService", "WCFService.csproj", "{096A202A-72E4-41D8-8B61-970E48E38135}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5B8E6501-ABEA-4DDE-A17E-9E26FB99B543} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.cs b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.cs rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.cs diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config similarity index 91% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config rename to root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config index 5aa7713b5..8667cec0a 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Readme.txt b/root_VS2022/programs/CS/Frameworks/Readme.txt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Readme.txt rename to root_VS2022/programs/CS/Frameworks/Readme.txt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/CheckException.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/CheckException.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/CheckException.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/CheckException.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/CmnMethods.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/CmnMethods.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/CmnMethods.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/CmnMethods.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj similarity index 93% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj index be6b5f701..17d56aff5 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.csproj @@ -10,7 +10,7 @@ Properties DPQuery_Tool OpenTouryo.DPQuery_Tool - v4.6 + v4.8 512 true DPQuery_Tool.Program @@ -64,28 +64,28 @@ - ..\..\Infrastructure\Build_net46\OpenTouryo.DamManagedOdp.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.DamManagedOdp.dll - ..\..\Infrastructure\Build_net46\OpenTouryo.DamMySQL.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.DamMySQL.dll - ..\..\Infrastructure\Build_net46\OpenTouryo.DamPstGrS.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.DamPstGrS.dll False - ..\..\Infrastructure\Build_net46\MySql.Data.dll + ..\..\Infrastructure\Build_net48\MySql.Data.dll False - ..\..\Infrastructure\Build_net46\Npgsql.dll + ..\..\Infrastructure\Build_net48\Npgsql.dll - ..\..\Infrastructure\Build_net46\Oracle.ManagedDataAccess.dll + ..\..\Infrastructure\Build_net48\Oracle.ManagedDataAccess.dll False - ..\..\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln similarity index 82% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln index 08289e34c..45323617e 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPQuery_Tool", "DPQuery_Tool.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C453BD38-1345-469B-A9AD-97B5AB25A9F4} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj new file mode 100644 index 000000000..dcef11020 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj @@ -0,0 +1,77 @@ + + + + WinExe + net5.0-windows + true + + + DPQuery_Tool + OpenTouryo.DPQuery_Tool + + + + TRACE;NETCOREAPP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamManagedOdp.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamMySQL.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamPstGrS.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + True + True + Resource.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + + + + Always + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln new file mode 100644 index 000000000..8190fe20f --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPQuery_Tool", "DPQuery_ToolCore.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1A31B69C-1DA9-4F0F-AC19-E52929285EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A31B69C-1DA9-4F0F-AC19-E52929285EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A31B69C-1DA9-4F0F-AC19-E52929285EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A31B69C-1DA9-4F0F-AC19-E52929285EB3}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DummyDaps.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DummyDaps.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/DummyDaps.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DummyDaps.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form1.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form2.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Form3.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/InputDialog.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Literal.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Literal.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Literal.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Literal.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Program.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Program.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Program.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Properties/Resources.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.resx b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/Resources/Resource.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config similarity index 97% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config index 0424b27c2..6e9617cba 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/app.config @@ -224,6 +224,10 @@ + + + + diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json new file mode 100644 index 000000000..fda86d366 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/appsettings.json @@ -0,0 +1,222 @@ +{ + // appSettings section + "appSettings": { + + // 共通部品の使用するパラメータ - start + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のSQLのCommandTimeout値を指定 + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // フォルダ + "InputFilesRoot": "C:/", + "OutputFilesRoot": "C:/", + + // 利用者名 + "FamilyName": "日立", + "PersonalName": "太郎", + + // ★入力項目（テンプレート） + + // Daoクラス テンプレート ファイル（拡張子を除く） + "DaoTemplateFileName": "DaoTemplate", + + // Entityクラス テンプレート ファイル（拡張子を除く） + "EntityTemplateFileName": "EntityTemplate", + // DataSetクラス テンプレート ファイル + "DataSetTemplateFileName": "DataSetTemplate.xsd", + + // メンテナンス画面 テンプレート ファイル + "TableAdapterTemplateFileName": "TableAdapter", + "JoinConditionalSearchTemplateFileName": "_Screen_ConditionalSearch.aspx", + "JoinSearchAndUpdateTemplateFileName": "_Screen_SearchAndUpdate.aspx", + "JoinDetailTemplateFileName": "_Screen_Detail.aspx", + + // SQL テンプレート ファイル + // 静的 + "InsertTemplateFileName": "s1_InsertTemplate.sql", + "SelectTemplateFileName": "s2_SelectTemplate.xml", + "UpdateTemplateFileName": "s3_UpdateTemplate.xml", + "DeleteTemplateFileName": "s4_DeleteTemplate.xml", + + // 動的 + "DynInsTemplateFileName": "d1_DynInsTemplate.xml", + "DynSelTemplateFileName": "d2_DynSelTemplate.xml", + "DynUpdTemplateFileName": "d3_DynUpdTemplate.xml", + "DynDelTemplateFileName": "d4_DynDelTemplate.xml", + + // 拡張メソッド用 + "DynSelCntTemplateFileName": "d5_DynSelCntTemplate.xml", + + // ★出力項目 + // Daoクラス ファイルのヘッダ・フッタ + // Daoクラス名のヘッダ・フッタ + "DaoClassNameHeader": "Dao", + "DaoClassNameFooter": "", + + // Entityクラス ファイルのヘッダ・フッタ + // Entityクラス名のヘッダ・フッタ + "EntityClassNameHeader": "", + "EntityClassNameFooter": "Entity", + + // DataSetクラス ファイルのヘッダ・フッタ + // DataSetクラス名のヘッダ・フッタ + "DataSetClassNameHeader": "", + "DataSetClassNameFooter": "DataSet", + + // DataTableクラスのヘッダ・フッタ + // DataTableクラス名のヘッダ・フッタ + "DataTableClassNameHeader": "", + "DataTableClassNameFooter": "DataTable", + + // メソッド名のCRUD名 + "MethodLabel_Ins": "1_Insert", + "MethodLabel_Sel": "2_Select", + "MethodLabel_Upd": "3_Update", + "MethodLabel_Del": "4_Delete", + "MethodLabel_SelCnt": "5_SelCnt", + + // メソッド名のヘッダ・フッタ（静的） + "MethodNameHeaderS": "S", + "MethodNameFooterS": "", + + // メソッド名のヘッダ・フッタ（動的） + "MethodNameHeaderD": "D", + "MethodNameFooterD": "", + + // Updateのパラメタ名のヘッダ・フッタ + "UpdateParamHeader": "Set_", + "UpdateParamFooter": "_forUPD", + + // Likeのパラメタ名のヘッダ・フッタ + "LikeParamHeader": "", + "LikeParamFooter": "_Like", + + // SQLファイルのヘッダ・フッタ + // ※　SQLファイル名は、Daoクラス名＋メソッド名とする。 + + // 内部データ項目 + // テンプレート上の置換文字列 + + // 共通 + "RpFileName": "_FileName_", + "RpTimeStamp": "_TimeStamp_", + "RpUserName": "_UserName_", + + "RpTableName": "_TableName_", + "RpColumnName": "_ColumnName_", + + "RpJoinTableName": "_JoinTableName_", + "RpJoinColumnName": "_JoinColumnName_", + "RpJoinTextboxColumnName": "_JoinTextboxColumnName_", + + "RpAllColumnList": "_AllColumnList_", + "RpPKColumnList": "_PKColumnList_", + + "CcLoopStart_PKColumn": "ControlComment:LoopStart-PKColumn", + "CcLoopEnd_PKColumn": "ControlComment:LoopEnd-PKColumn", + + "CcLoopStart_JoinTables": "ControlComment:LoopStart-JoinTables", + "CcLoopEnd_JoinTables": "ControlComment:LoopEnd-JoinTables", + + "CcLoopStart_ElseColumn": "ControlComment:LoopStart-ElseColumn", + "CcLoopEnd_ElseColumn": "ControlComment:LoopEnd-ElseColumn", + + "CcIsRequired_TimeStamp": "ControlComment:IsRequired-TimeStamp", + + // SQL + "RpXMLEncoding": "_XMLEncoding_", + + "RpAllColumnListSQL": "_AllColumnListSQL_", + "RpPKColumnListSQL": "_PKColumnListSQL_", + + "RpAllColumnListTableAdapterSQL": "_AllColumnListTableAdapterSQL_", + "RpTimeStampColName": "_TimeStampColName_", + + "RpColumnsCondition": "_ColumnsCondition_", + "RpDynColsCondition": "_DynColsCondition_", + "RpDynColsCondition_Like": "_DynColsConditionLike_", + + // "RpInsertColumns": "_InsertColumns_", + "RpDynInsColumns": "_DynInsColumns_", + + "RpInsertParameters": "_InsertParameters_", + "RpDynInsParameters": "_DynInsParameters_", + + // "RpUpdateParameters": "_UpdateParameters_", + "RpDynUpdParameters": "_DynUpdParameters_", + + // Dao（ファイル）名 + "RpDaoClassName": "_DaoClassName_", + + // プロパティ プロシージャ生成 + "CcLoopStart_PPUpdSet": "ControlComment:LoopStart-PPUpdSet", + "CcLoopEnd_PPUpdSet": "ControlComment:LoopEnd-PPUpdSet", + + "CcLoopStart_PPLike": "ControlComment:LoopStart-PPLike", + "CcLoopEnd_PPLike": "ControlComment:LoopEnd-PPLike", + + // メソッド名 + "RpInsertMethodName": "_InsertMethodName_", + "RpDynInsMethodName": "_DynInsMethodName_", + + "RpSelectMethodName": "_SelectMethodName_", + "RpDynSelMethodName": "_DynSelMethodName_", + + "RpUpdateMethodName": "_UpdateMethodName_", + "RpDynUpdMethodName": "_DynUpdMethodName_", + + "RpDeleteMethodName": "_DeleteMethodName_", + "RpDynDelMethodName": "_DynDelMethodName_", + + // 拡張メソッド名 + "RpDynSelCntMethodName": "_DynSelCntMethodName_", + + // Entityクラス（ファイル）名 + "RpEntityClassName": "_EntityClassName_", + "RpEntityTypeInfo": "_EntityTypeInfo_", + + // DataSetクラス（ファイル）名 + "RpDataSetClassName": "_DataSetClassName_", + "RpDataTableClassName": "_DataTableClassName_", + "RpXSDTypeInfo": "_XSDTypeInfo_", + + // SQLファイル名 + "RpInsertFileName": "_InsertFileName_", + "RpDynInsFileName": "_DynInsFileName_", + + "RpSelectFileName": "_SelectFileName_", + "RpDynSelFileName": "_DynSelFileName_", + + "RpUpdateFileName": "_UpdateFileName_", + "RpDynUpdFileName": "_DynUpdFileName_", + + "RpDeleteFileName": "_DeleteFileName_", + "RpDynDelFileName": "_DynDelFileName_", + + // 拡張メソッド用ファイル名 + "RpDynSelCntFileName": "_DynSelCntFileName_", + + // ASPX + "RpCodebehindLanguage": "_CodebehindLanguage_", + "RpClassTemplateFileExtension": "_ClassTemplateFileExtension_", + + // CODE + "RpCommentOut": "_CommentOut_", + "RpPKFirstColumn": "_PKFirstColumn_", + // GridView Header Column Number + "RpColumnNmbr": "_ColumnNmbr_", + // For Internationalization Test + "DefaultCulture": "ja-JP", + + // Add Data Providers from tool + "RpDBMS": "_DBMS_", + "RpDAP": "_DAP_" + } +} \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/demo.txt b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/demo.txt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DPQuery_Tool/demo.txt rename to root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/demo.txt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CColumn.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CColumn.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CColumn.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CColumn.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CTable.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CTable.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CTable.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CTable.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CheckException.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CheckException.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CheckException.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CheckException.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CmnMethods.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CmnMethods.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/CmnMethods.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/CmnMethods.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj similarity index 95% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj index 47fa5d4b3..07b09fd17 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.csproj @@ -10,7 +10,7 @@ Properties DaoGen_Tool OpenTouryo.DaoGen_Tool - v4.6 + v4.8 512 @@ -63,18 +63,18 @@ False - ..\..\Infrastructure\Build_net46\MySql.Data.dll + ..\..\Infrastructure\Build_net48\MySql.Data.dll False - ..\..\Infrastructure\Build_net46\Npgsql.dll + ..\..\Infrastructure\Build_net48\Npgsql.dll - ..\..\Infrastructure\Build_net46\Oracle.ManagedDataAccess.dll + ..\..\Infrastructure\Build_net48\Oracle.ManagedDataAccess.dll False - ..\..\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln similarity index 82% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln index 18eda9ae9..3743d80f7 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaoGen_Tool", "DaoGen_Tool.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {68A0C5C4-8CF3-4AB2-956E-3FDD50C35468} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj new file mode 100644 index 000000000..9bc713625 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj @@ -0,0 +1,77 @@ + + + + WinExe + net5.0-windows + true + + + DaoGen_Tool + OpenTouryo.DaoGen_Tool + + + + TRACE;NETCOREAPP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamManagedOdp.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamMySQL.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamPstGrS.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + True + True + Resource.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + + + + Always + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln new file mode 100644 index 000000000..1e294ac6a --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaoGen_Tool", "DaoGen_ToolCore.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5CC42F99-B80D-485B-9623-EE2DD59A6EDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5CC42F99-B80D-485B-9623-EE2DD59A6EDB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5CC42F99-B80D-485B-9623-EE2DD59A6EDB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5CC42F99-B80D-485B-9623-EE2DD59A6EDB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form1.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Form2.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/downarrow.PNG b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/downarrow.PNG similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/downarrow.PNG rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/downarrow.PNG diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/like.PNG b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/like.PNG similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/like.PNG rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/like.PNG diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/rightarrow.PNG b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/rightarrow.PNG similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/rightarrow.PNG rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Img/rightarrow.PNG diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Program.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Program.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Program.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/Resources/Resource.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SetPrimaryKeyWindow.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.cs b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.resx b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/SimpleTextBoxWindow.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config similarity index 97% rename from root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config rename to root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config index 09d11ce58..c70041f49 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/app.config @@ -227,6 +227,10 @@ + + + + diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json new file mode 100644 index 000000000..af4c4a6e3 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json @@ -0,0 +1,216 @@ +{ + // appSettings section + "appSettings": { + + // ★入力項目（初期化） + + // 接続文字列 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;", + + // フォルダ + "InputFilesRoot": "C:/", + "OutputFilesRoot": "C:/", + + // 利用者名 + "FamilyName": "日立", + "PersonalName": "太郎", + + // ★入力項目（テンプレート） + + // Daoクラス テンプレート ファイル（拡張子を除く） + "DaoTemplateFileName": "DaoTemplate", + + // Entityクラス テンプレート ファイル（拡張子を除く） + "EntityTemplateFileName": "EntityTemplate", + // DataSetクラス テンプレート ファイル + "DataSetTemplateFileName": "DataSetTemplate.xsd", + + // メンテナンス画面 テンプレート ファイル + "TableAdapterTemplateFileName": "TableAdapter", + "ConditionalSearchTemplateFileName": "ConditionalSearch.aspx", + "SearchAndUpdateTemplateFileName": "SearchAndUpdate.aspx", + "DetailTemplateFileName": "Detail.aspx", + + // SQL テンプレート ファイル + // 静的 + "InsertTemplateFileName": "s1_InsertTemplate.sql", + "SelectTemplateFileName": "s2_SelectTemplate.xml", + "UpdateTemplateFileName": "s3_UpdateTemplate.xml", + "DeleteTemplateFileName": "s4_DeleteTemplate.xml", + + // 動的 + "DynInsTemplateFileName": "d1_DynInsTemplate.xml", + "DynSelTemplateFileName": "d2_DynSelTemplate.xml", + "DynUpdTemplateFileName": "d3_DynUpdTemplate.xml", + "DynDelTemplateFileName": "d4_DynDelTemplate.xml", + + // 拡張メソッド用 + "DynSelCntTemplateFileName": "d5_DynSelCntTemplate.xml", + + // ★出力項目 + // Daoクラス ファイルのヘッダ・フッタ + // Daoクラス名のヘッダ・フッタ + "DaoClassNameHeader": "Dao", + "DaoClassNameFooter": "", + + // Entityクラス ファイルのヘッダ・フッタ + // Entityクラス名のヘッダ・フッタ + "EntityClassNameHeader": "", + "EntityClassNameFooter": "Entity", + + // DataSetクラス ファイルのヘッダ・フッタ + // DataSetクラス名のヘッダ・フッタ + "DataSetClassNameHeader": "", + "DataSetClassNameFooter": "DataSet", + + // DataTableクラスのヘッダ・フッタ + // DataTableクラス名のヘッダ・フッタ + "DataTableClassNameHeader": "", + "DataTableClassNameFooter": "DataTable", + + // メソッド名のCRUD名 + "MethodLabel_Ins": "1_Insert", + "MethodLabel_Sel": "2_Select", + "MethodLabel_Upd": "3_Update", + "MethodLabel_Del": "4_Delete", + "MethodLabel_SelCnt": "5_SelCnt", + + // メソッド名のヘッダ・フッタ（静的） + "MethodNameHeaderS": "S", + "MethodNameFooterS": "", + + // メソッド名のヘッダ・フッタ（動的） + "MethodNameHeaderD": "D", + "MethodNameFooterD": "", + + // Updateのパラメタ名のヘッダ・フッタ + "UpdateParamHeader": "Set_", + "UpdateParamFooter": "_forUPD", + + // Likeのパラメタ名のヘッダ・フッタ + "LikeParamHeader": "", + "LikeParamFooter": "_Like", + + // SQLファイルのヘッダ・フッタ + // ※　SQLファイル名は、Daoクラス名＋メソッド名とする。 + + // 内部データ項目 + // テンプレート上の置換文字列 + + // 共通 + "RpFileName": "_FileName_", + "RpTimeStamp": "_TimeStamp_", + "RpUserName": "_UserName_", + + "RpTableName": "_TableName_", + "RpColumnName": "_ColumnName_", + + "RpAllColumnList": "_AllColumnList_", + "RpPKColumnList": "_PKColumnList_", + + "CcLoopStart_PKColumn": "ControlComment:LoopStart-PKColumn", + "CcLoopEnd_PKColumn": "ControlComment:LoopEnd-PKColumn", + + "CcLoopStart_ElseColumn": "ControlComment:LoopStart-ElseColumn", + "CcLoopEnd_ElseColumn": "ControlComment:LoopEnd-ElseColumn", + + "CcIsRequired_TimeStamp": "ControlComment:IsRequired-TimeStamp", + + // SQL + "RpXMLEncoding": "_XMLEncoding_", + + "RpAllColumnListSQL": "_AllColumnListSQL_", + "RpPKColumnListSQL": "_PKColumnListSQL_", + + "RpAllColumnListTableAdapterSQL": "_AllColumnListTableAdapterSQL_", + "RpTimeStampColName": "_TimeStampColName_", + + "RpColumnsCondition": "_ColumnsCondition_", + "RpDynColsCondition": "_DynColsCondition_", + "RpDynColsCondition_Like": "_DynColsConditionLike_", + + // "RpInsertColumns": "_InsertColumns_", + "RpDynInsColumns": "_DynInsColumns_", + + "RpInsertParameters": "_InsertParameters_", + "RpDynInsParameters": "_DynInsParameters_", + + // "RpUpdateParameters": "_UpdateParameters_", + "RpDynUpdParameters": "_DynUpdParameters_", + + // Dao（ファイル）名 + "RpDaoClassName": "_DaoClassName_", + + // プロパティ プロシージャ生成 + "CcLoopStart_PPUpdSet": "ControlComment:LoopStart-PPUpdSet", + "CcLoopEnd_PPUpdSet": "ControlComment:LoopEnd-PPUpdSet", + + "CcLoopStart_PPLike": "ControlComment:LoopStart-PPLike", + "CcLoopEnd_PPLike": "ControlComment:LoopEnd-PPLike", + + // メソッド名 + "RpInsertMethodName": "_InsertMethodName_", + "RpDynInsMethodName": "_DynInsMethodName_", + + "RpSelectMethodName": "_SelectMethodName_", + "RpDynSelMethodName": "_DynSelMethodName_", + + "RpUpdateMethodName": "_UpdateMethodName_", + "RpDynUpdMethodName": "_DynUpdMethodName_", + + "RpDeleteMethodName": "_DeleteMethodName_", + "RpDynDelMethodName": "_DynDelMethodName_", + + // 拡張メソッド名 + "RpDynSelCntMethodName": "_DynSelCntMethodName_", + + // Entityクラス（ファイル）名 + "RpEntityClassName": "_EntityClassName_", + "RpEntityTypeInfo": "_EntityTypeInfo_", + + // DataSetクラス（ファイル）名 + "RpDataSetClassName": "_DataSetClassName_", + "RpDataTableClassName": "_DataTableClassName_", + "RpXSDTypeInfo": "_XSDTypeInfo_", + + // SQLファイル名 + "RpInsertFileName": "_InsertFileName_", + "RpDynInsFileName": "_DynInsFileName_", + + "RpSelectFileName": "_SelectFileName_", + "RpDynSelFileName": "_DynSelFileName_", + + "RpUpdateFileName": "_UpdateFileName_", + "RpDynUpdFileName": "_DynUpdFileName_", + + "RpDeleteFileName": "_DeleteFileName_", + "RpDynDelFileName": "_DynDelFileName_", + + // 拡張メソッド用ファイル名 + "RpDynSelCntFileName": "_DynSelCntFileName_", + + // ASPX + "RpCodebehindLanguage": "_CodebehindLanguage_", + "RpClassTemplateFileExtension": "_ClassTemplateFileExtension_", + + // CODE + "RpCommentOut": "_CommentOut_", + "RpPKFirstColumn": "_PKFirstColumn_", + // GridView Header Column Number + "RpColumnNmbr": "_ColumnNmbr_", + // For Internationalization Test + "DefaultCulture": "ja-JP", + + // Add Data Providers from tool + "RpDBMS": "_DBMS_", + "RpDAP": "_DAP_", + + // Get Document from tool + "LnkHelpDoc_En": "https://github.com/OpenTouryoProject/OpenTouryoDocuments/blob/master/documents/1_User_Guide/en/5_User_Guide(D_Layer_Automatic_Generation)_EN.doc", + "LnkHelpDoc_Ja": "https://github.com/OpenTouryoProject/OpenTouryoDocuments/blob/master/documents/1_User_Guide/ja-JP/5_User_Guide(D_Layer_Automatic_Generation).doc" + } +} \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj similarity index 95% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj index 99ba93569..588a96a6d 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj @@ -23,7 +23,7 @@ 3.5 - v4.6 + v4.8 true @@ -72,19 +72,19 @@ False - ..\..\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln similarity index 83% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln index 80bace3af..cb380778f 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployZipPackWithHTTP", "DeployZipPackWithHTTP.csproj", "{F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {70C98F1B-54AD-4AFD-B670-98D383EF1BEE} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config similarity index 84% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config index 8861ae81c..295eaf797 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config @@ -21,6 +21,10 @@ + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico diff --git a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config similarity index 95% rename from root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config rename to root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config index ebef17951..f57231acf 100644 --- a/root_VS2015/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj similarity index 93% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj index a871f8a80..7229952cf 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj @@ -10,7 +10,7 @@ Properties _2CSClientWPF_sample 2CSClientWPF_sample - v4.6 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -57,23 +57,23 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln new file mode 100644 index 000000000..8dc0efe58 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8FEFD99F-3DEF-41B6-B5E4-0E5438CAFC53} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/App.xaml.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config new file mode 100644 index 000000000..043cb08b7 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj similarity index 93% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj index 4b881d62a..67d7095c6 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj @@ -10,7 +10,7 @@ Properties _2CSClientWin_sample 2CSClientWin_sample - v4.6 + v4.8 2.0 @@ -54,23 +54,23 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln similarity index 90% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index d1b5dca28..6760b6a32 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject @@ -29,6 +29,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {33DC7E64-D418-4BAD-9646-5242FA55C1C5} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.resx b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.resx b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Login.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Program.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Program.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.cs b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.resx b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/Splash.resx diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config similarity index 86% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config rename to root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config index f08c308ca..bbb20eb62 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -70,4 +70,18 @@ + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln new file mode 100644 index 000000000..8472fb7f9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication", "WpfApplication\WpfApplication.csproj", "{14296AF4-CB38-44B9-A42D-C104FE16CE33}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {17284ADF-2F82-412E-8D83-02E5C1606F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17284ADF-2F82-412E-8D83-02E5C1606F53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17284ADF-2F82-412E-8D83-02E5C1606F53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17284ADF-2F82-412E-8D83-02E5C1606F53}.Release|Any CPU.Build.0 = Release|Any CPU + {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B5541FFE-01E0-43DD-B15F-BA2012933B8D} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/Readme.txt b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/Readme.txt rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/Readme.txt diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj index 2f6909b90..b3c6922c1 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj @@ -10,7 +10,7 @@ Properties WindowsFormsApplication WindowsFormsApplication - v4.6 + v4.8 512 @@ -55,11 +55,11 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj index c5fb7b78a..67d012c5e 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj @@ -10,7 +10,7 @@ Properties WpfApplication WpfApplication - v4.6 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -57,11 +57,11 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat rename to root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Bean.cs b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Bean.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Bean.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Bean.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj index 6c0068337..9887a1eb9 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj @@ -10,7 +10,7 @@ Properties CustCtrl_sample CustCtrl_sample - v4.6 + v4.8 512 @@ -55,7 +55,7 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.CustomControl.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.CustomControl.RichClient.dll diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln new file mode 100644 index 000000000..c171c93f6 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BA15CF85-A95B-4EA9-977B-0BE5EB739E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA15CF85-A95B-4EA9-977B-0BE5EB739E72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA15CF85-A95B-4EA9-977B-0BE5EB739E72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA15CF85-A95B-4EA9-977B-0BE5EB739E72}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B96C6273-E568-4C62-9CE6-6C8810AE7E7F} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.cs b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.resx b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Program.cs b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Program.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Readme.txt b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/Readme.txt rename to root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/Readme.txt diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj index 043db8fe1..7fe783501 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj @@ -10,7 +10,7 @@ Properties GenDaoAndBatUpd_sample GenDaoAndBatUpd_sample - v4.6 + v4.8 2.0 @@ -54,23 +54,23 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln new file mode 100644 index 000000000..11e71188d --- /dev/null +++ b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D40BC756-8E12-4020-8486-99F482E35DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D40BC756-8E12-4020-8486-99F482E35DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D40BC756-8E12-4020-8486-99F482E35DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D40BC756-8E12-4020-8486-99F482E35DCD}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DFBE51DA-D521-43A4-B5E0-A6321D6F8840} + EndGlobalSection + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Program.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Program.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.resx b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config new file mode 100644 index 000000000..6aec46c06 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.resx b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Program.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Program.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Readme.txt b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/Readme.txt rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/Readme.txt diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj similarity index 97% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj index 8db2d0f04..1ddd5e744 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj +++ b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj @@ -10,7 +10,7 @@ Properties TimeStamp_sample TimeStamp_sample - v4.6 + v4.8 2.0 @@ -54,15 +54,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln similarity index 90% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 463f94c69..4e96633bd 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject @@ -29,6 +29,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DFE53623-888A-47C5-BCC6-0573F2A542FC} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config similarity index 54% rename from root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config rename to root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config index a46cd99ee..9a32d9c6f 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config @@ -1,39 +1,39 @@ - + - + - + - + - - - - - - - - - - + + + + + + + + + + - + - + @@ -42,6 +42,10 @@ + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Program.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Program.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj similarity index 95% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj index 90004543c..0a4487e0e 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj @@ -10,7 +10,7 @@ Properties RerunnableBatch_sample RerunnableBatch_sample - v4.6 + v4.8 2.0 @@ -39,15 +39,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln similarity index 83% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 674484c03..98f8229fa 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FB12B276-C5AE-475A-B0F6-8618D9F42C32} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config new file mode 100644 index 000000000..06d84e6fe --- /dev/null +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/readme.txt b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/readme.txt rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/readme.txt diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Program.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Program.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Program.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj similarity index 95% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj index 4a87aedb3..2fa190e6b 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj @@ -10,7 +10,7 @@ Properties RerunnableBatch_sample2 RerunnableBatch_sample2 - v4.6 + v4.8 2.0 @@ -39,15 +39,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln similarity index 83% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index fcfa7adec..51b36b587 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3DF4AAC8-22E8-45B7-BFB7-28EAE3CFD904} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config new file mode 100644 index 000000000..695444ebd --- /dev/null +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Program.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Program.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Program.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj similarity index 95% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj index c41b71cc6..4097f644d 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj @@ -10,7 +10,7 @@ Properties RerunnableBatch_sample3 RerunnableBatch_sample3 - v4.6 + v4.8 2.0 @@ -39,15 +39,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln similarity index 83% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 389db2e21..2abf219c0 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C79FE6A1-8EEE-4971-A053-01A5CB720CB6} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config new file mode 100644 index 000000000..b10a6c20f --- /dev/null +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt rename to root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Program.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Program.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj similarity index 94% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj index a51415d9b..20de03f52 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj +++ b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj @@ -10,7 +10,7 @@ Properties SimpleBatch_sample SimpleBatch_sample - v4.6 + v4.8 2.0 @@ -54,15 +54,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln similarity index 83% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index effa44db0..74b1e7d9f 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8C7BFBAC-0114-49B0-8645-63A7B8E588BE} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config similarity index 86% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config index 4f3aa738d..54b942c9b 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -1,6 +1,6 @@ - + @@ -24,12 +24,13 @@ + - - + + @@ -39,7 +40,7 @@ - + @@ -49,14 +50,14 @@ - + - + - + @@ -67,6 +68,10 @@ + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/readme.txt b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/readme.txt rename to root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/readme.txt diff --git a/root_VS2022/programs/CS/Samples/WS_sample/ASPNETWebService/README.md b/root_VS2022/programs/CS/Samples/WS_sample/ASPNETWebService/README.md new file mode 100644 index 000000000..00c5ea578 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/WS_sample/ASPNETWebService/README.md @@ -0,0 +1,4 @@ +Moved to the following repository. + +- OpenTouryoProject/ResourceServerTemplates +https://github.com/OpenTouryoProject/ResourceServerTemplates/tree/master/root/programs/ASPNETWebService \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj index 9215dad09..c424483b7 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj @@ -10,7 +10,7 @@ Properties WSClientWPF_sample WSClientWPF_sample - v4.6 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -58,23 +58,23 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln similarity index 94% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 18d0e984f..449f467aa 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject @@ -45,4 +45,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {42A7FC95-F4B4-4A42-83C2-6F2850B5E271} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj index 2576542a0..7d56b8026 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj @@ -10,7 +10,7 @@ Properties WSClientWin2_sample WSClientWin2_sample - v4.6 + v4.8 2.0 @@ -55,23 +55,23 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln new file mode 100644 index 000000000..ec1408fea --- /dev/null +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin2_sample", "WSClientWin2_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|.NET = Debug|.NET + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Release|.NET = Release|.NET + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|.NET.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|.NET.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.Build.0 = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F6765C45-7CE5-4C7B-AA9E-635D97A59874} + EndGlobalSection + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/AsyncFunc.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/AsyncFunc.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/AsyncFunc.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/AsyncFunc.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Login.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Program.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Program.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/app.manifest b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/app.manifest similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/app.manifest rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Properties/app.manifest diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/Splash.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition2.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition2.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/TMProtocolDefinition2.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj index 0585689b8..0a711472a 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj @@ -17,7 +17,7 @@ true false WSClientWinCone_sample_TemporaryKey.pfx - v4.6 + v4.8 2.0 @@ -70,19 +70,19 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll packages\Owin.1.0\lib\net40\Owin.dll @@ -90,7 +90,7 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln similarity index 96% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln index 6d1640ae4..fe6e87885 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWinCone_sample", "WSClientWinCone_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject @@ -71,6 +71,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9996DAE6-10EB-4758-9B5A-D7ADCA608F93} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config similarity index 71% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config index 01670b67c..b2bf84b2a 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj similarity index 96% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj index bec1d2c04..dfd8e6dd9 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj @@ -10,7 +10,7 @@ Properties WSClientWin_sample WSClientWin_sample - v4.6 + v4.8 2.0 @@ -64,19 +64,19 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll packages\Owin.1.0\lib\net40\Owin.dll @@ -84,7 +84,7 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln similarity index 96% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 61c361e35..85a35a5b8 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject @@ -71,6 +71,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4D94A190-BB00-46AC-A6BD-2170B510AD86} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config similarity index 71% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config rename to root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config index 01670b67c..b2bf84b2a 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj b/root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj similarity index 94% rename from root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj rename to root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj index c60e77f33..06612f2d9 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj @@ -10,7 +10,7 @@ Properties WSIFType_sample WSIFType_sample - v4.6 + v4.8 2.0 @@ -54,11 +54,11 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Common/Shipper.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Common/Shipper.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Common/Shipper.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Common/Shipper.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Common/WebApiParams.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Common/WebApiParams.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Common/WebApiParams.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Common/WebApiParams.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Dao/LayerD.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Dao/LayerD.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Dao/LayerD.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj similarity index 94% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj index c815f5109..a06d5f8a7 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj @@ -10,7 +10,7 @@ Properties WSServer_sample WSServer_sample - v4.6 + v4.8 2.0 @@ -54,15 +54,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln similarity index 93% rename from root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln rename to root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index f4715985f..63c933109 100644 --- a/root_VS2015/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSServer_sample", "WSServer_sample.csproj", "{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}" EndProject @@ -41,6 +41,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {04A7AC1E-9D6D-4F8D-A134-1E18668BBF47} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln similarity index 82% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index 31fc8f071..bd63fac4e 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{4BA4D9DE-2656-4FBD-8F1F-31FC9583B5F5}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3339B5F1-A4EB-4E07-BE9E-BB36E21D91CC} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj similarity index 97% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj index 5c3a7c22e..839f21a06 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj @@ -1,5 +1,5 @@  - + @@ -14,7 +14,7 @@ Properties MVC_Sample MVC_Sample - v4.6 + v4.8 false true @@ -63,16 +63,16 @@ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.Security.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.Security.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -339,4 +339,10 @@ + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config similarity index 97% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index 065d0cf87..2208533a7 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -31,11 +31,7 @@ - - - - - + @@ -184,7 +180,7 @@ http://msdn2.microsoft.com/ja-jp/library/e1f13641.aspx http://msdn2.microsoft.com/ja-jp/library/e1f13641(VS.80).aspx --> - + diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config similarity index 63% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config index 7c6e581ea..bad64536e 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config @@ -1,41 +1,41 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/Readme.txt b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/Readme.txt similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/MVC_Sample/Readme.txt rename to root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/Readme.txt diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln similarity index 83% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln index 9d1d86749..6aa8b40c9 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebForms_Sample", "WebForms_Sample\WebForms_Sample.csproj", "{74CCC7E1-12DB-4BEB-8003-6261A6C2C7FA}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0FC4462C-196E-4494-A87F-17543B946D89} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Properties/AssemblyInfo.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Properties/AssemblyInfo.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Properties/AssemblyInfo.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config similarity index 99% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config index ea44717c3..f3bb15552 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config @@ -33,7 +33,7 @@ - + - + diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj similarity index 98% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj index 525a0dfac..67812cc12 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj @@ -1,5 +1,5 @@  - + @@ -14,7 +14,8 @@ Properties WebForms_Sample WebForms_Sample - v4.6 + v4.8 + false true 44333 @@ -66,41 +67,41 @@ ..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\MySql.Data.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\MySql.Data.dll ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\Npgsql.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\Npgsql.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.CustomControl.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.CustomControl.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.Security.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.Security.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\Oracle.ManagedDataAccess.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\Oracle.ManagedDataAccess.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -797,6 +798,9 @@ + + + @@ -820,6 +824,5 @@ - - --> + --> \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.cs b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.cs similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.cs rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.cs diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico similarity index 100% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico diff --git a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config similarity index 59% rename from root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config rename to root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config index 09872386a..596985d89 100644 --- a/root_VS2015/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config @@ -1,29 +1,29 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln new file mode 100644 index 000000000..e390def6b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{A50D383C-5135-445D-924C-E3B851F13CBE}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A50D383C-5135-445D-924C-E3B851F13CBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A50D383C-5135-445D-924C-E3B851F13CBE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A50D383C-5135-445D-924C-E3B851F13CBE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A50D383C-5135-445D-924C-E3B851F13CBE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A1C91466-06CF-43CB-9DA9-A697B0126A10} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs new file mode 100644 index 000000000..b3b15e7c6 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.cs @@ -0,0 +1,603 @@ +//********************************************************************************** +//* サンプル アプリ・コントローラ +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Crud1Controller +//* クラス日本語名 ：Html.BeginForm用サンプル アプリ・コントローラ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Logic.Business; +using MVC_Sample.Logic.Common; +using MVC_Sample.Models.ViewModels; + +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading.Tasks; + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Microsoft.AspNetCore.Mvc; + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Dto; +using Touryo.Infrastructure.Public.Diagnostics; + +namespace MVC_Sample.Controllers +{ + /// + /// Html.BeginForm用サンプル アプリ・コントローラ + /// + [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)] + public class Crud1Controller : MyBaseMVControllerCore + { + /// + /// 画面の初期表示 + /// GET: /Crud2/ + /// + /// 初期表示状態の画面 (ViewResult) + [HttpGet] + public IActionResult Index(CrudViweModel model) + { + return View(model); + } + + /// + /// Shippers テーブルのレコード数をカウントする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectCount(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync(testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataTable として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DT(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataSet として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DS(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataReader として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DR(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を、動的 SQL を使用して取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DSQL(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = model.DdlOrderColumn; + testParameterValue.OrderSequence = model.DdlOrderSequence; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// ShipperId をキーにして Shippers テーブルのレコードを取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Select(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + ModelState.Clear(); // ErrorのClearをしないと何故か設定できない。 + + #region PocoToPocoのテストコード + + ShipperViweModel svm = null; + TestShipperViweModel tsvm = null; + + // テスト１ + svm = (ShipperViweModel)BinarySerialize.DeepClone(model.Shipper); + + if (testReturnValue.Obj2 != null) + { + PocoToPoco.Map( + (TestShipperViweModel)testReturnValue.Obj2, svm, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "ShipperID", "_ShipperID"}, + { "CompanyName", "_CompanyName"}, + { "Phone", "_Phone"} + }); + + Debug.WriteLine("svm:" + ObjectInspector.Inspect(svm)); + } + + // テスト２ + tsvm = PocoToPoco.Map( + (ShipperViweModel)testReturnValue.Obj, null, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "_ShipperID", "ShipperID"}, + { "_CompanyName", "CompanyName"}, + { "_Phone", "Phone"} + }); + Debug.WriteLine("tsvm:" + ObjectInspector.Inspect(tsvm)); + + #endregion + + model.Shipper = (ShipperViweModel)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを追加する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Insert(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件追加"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを更新する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Update(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件更新"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを削除する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Delete(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件削除"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Sleepを実行し二重送信防止機能をテストする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public ActionResult PreventDoubleSubmission(CrudViweModel model) + { + System.Threading.Thread.Sleep(5 * 1000); + + // メッセージを設定。 + + // 確認用のカウンタ + int? temp = HttpContext.Session.GetInt32("cnt"); + if (temp.HasValue) + { + HttpContext.Session.SetInt32("cnt", temp.Value + 1); + } + else + { + HttpContext.Session.SetInt32("cnt", 1); + } + temp = HttpContext.Session.GetInt32("cnt"); + + model.Message = "PreventDoubleSubmission:" + temp.Value.ToString(); + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// 画面遷移する + /// 画面遷移のためのRedirectResult + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult Transitions() + { + return Redirect(Url.Action("Index", "Crud2")); + } + + /// 分離レベルの設定 + private DbEnum.IsolationLevelEnum SelectIsolationLevel(string iso) + { + if (iso == "NC") + { + return DbEnum.IsolationLevelEnum.NotConnect; + } + else if (iso == "NT") + { + return DbEnum.IsolationLevelEnum.NoTransaction; + } + else if (iso == "RU") + { + return DbEnum.IsolationLevelEnum.ReadUncommitted; + } + else if (iso == "RC") + { + return DbEnum.IsolationLevelEnum.ReadCommitted; + } + else if (iso == "RR") + { + return DbEnum.IsolationLevelEnum.RepeatableRead; + } + else if (iso == "SZ") + { + return DbEnum.IsolationLevelEnum.Serializable; + } + else if (iso == "SS") + { + return DbEnum.IsolationLevelEnum.Snapshot; + } + else if (iso == "DF") + { + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + else + { + //throw new Exception("分離レベルの設定がおかしい"); + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs new file mode 100644 index 000000000..07fcb6a6f --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs @@ -0,0 +1,603 @@ +//********************************************************************************** +//* サンプル アプリ・コントローラ +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Crud1Controller +//* クラス日本語名 ：Html.BeginForm用サンプル アプリ・コントローラ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Logic.Business; +using MVC_Sample.Logic.Common; +using MVC_Sample.Models.ViewModels; + +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading.Tasks; + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Microsoft.AspNetCore.Mvc; + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Dto; +using Touryo.Infrastructure.Public.Diagnostics; + +namespace MVC_Sample.Controllers +{ + /// + /// Html.BeginForm用サンプル アプリ・コントローラ + /// + [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)] + public class Crud2Controller : MyBaseMVControllerCore + { + /// + /// 画面の初期表示 + /// GET: /Crud2/ + /// + /// 初期表示状態の画面 (ViewResult) + [HttpGet] + public IActionResult Index(CrudViweModel model) + { + return View(model); + } + + /// + /// Shippers テーブルのレコード数をカウントする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectCount(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync(testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataTable として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DT(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataSet として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DS(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を DataReader として取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DR(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルのレコード全件を、動的 SQL を使用して取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SelectAll_DSQL(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = model.DdlOrderColumn; + testParameterValue.OrderSequence = model.DdlOrderSequence; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + model.Shippers = (List)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// ShipperId をキーにして Shippers テーブルのレコードを取得する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Select(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + + // メッセージを設定。 + model.Message = message; + } + else + { + // 結果（正常系） + ModelState.Clear(); // ErrorのClearをしないと何故か設定できない。 + + #region PocoToPocoのテストコード + + ShipperViweModel svm = null; + TestShipperViweModel tsvm = null; + + // テスト１ + svm = (ShipperViweModel)BinarySerialize.DeepClone(model.Shipper); + + if (testReturnValue.Obj2 != null) + { + PocoToPoco.Map( + (TestShipperViweModel)testReturnValue.Obj2, svm, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "ShipperID", "_ShipperID"}, + { "CompanyName", "_CompanyName"}, + { "Phone", "_Phone"} + }); + + Debug.WriteLine("svm:" + ObjectInspector.Inspect(svm)); + } + + // テスト２ + tsvm = PocoToPoco.Map( + (ShipperViweModel)testReturnValue.Obj, null, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "_ShipperID", "ShipperID"}, + { "_CompanyName", "CompanyName"}, + { "_Phone", "Phone"} + }); + Debug.WriteLine("tsvm:" + ObjectInspector.Inspect(tsvm)); + + #endregion + + model.Shipper = (ShipperViweModel)testReturnValue.Obj; + } + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを追加する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Insert(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件追加"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを更新する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Update(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件更新"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Shippers テーブルに新規レコードを削除する + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public async Task Delete(CrudViweModel model) + { + if (ModelState.IsValid) + { + // 引数クラスを生成。下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue(this.ControllerName, "-", this.ActionName, + model.DdlDap + "%" + model.DdlMode1 + "%" + model.DdlMode2 + "%" + model.DdlExRollback, this.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.Shipper = model.Shipper; + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + TestReturnValue testReturnValue = (TestReturnValue)await layerB.DoBusinessLogicAsync( + testParameterValue, this.SelectIsolationLevel(model.DdlIso)); + + // 結果表示するメッセージ + string message = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + message = "ErrorMessageID:" + testReturnValue.ErrorMessageID + ";"; + message += "ErrorMessage:" + testReturnValue.ErrorMessage + ";"; + message += "ErrorInfo:" + testReturnValue.ErrorInfo; + } + else + { + // 結果（正常系） + message = testReturnValue.Obj.ToString() + "件削除"; + } + + // メッセージを設定。 + model.Message = message; + } + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// + /// Sleepを実行し二重送信防止機能をテストする + /// + /// CrudViweModel + /// 再描画（ViewResult） + [HttpPost] + [ValidateAntiForgeryToken] + public ActionResult PreventDoubleSubmission(CrudViweModel model) + { + System.Threading.Thread.Sleep(5 * 1000); + + // メッセージを設定。 + + // 確認用のカウンタ + int? temp = HttpContext.Session.GetInt32("cnt"); + if (temp.HasValue) + { + HttpContext.Session.SetInt32("cnt", temp.Value + 1); + } + else + { + HttpContext.Session.SetInt32("cnt", 1); + } + temp = HttpContext.Session.GetInt32("cnt"); + + model.Message = "PreventDoubleSubmission:" + temp.Value.ToString(); + + // 再表示（Html.BeginFormでは、全体更新。 + return View("Index", model); + } + + /// 画面遷移する + /// 画面遷移のためのRedirectResult + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult Transitions() + { + return Redirect(Url.Action("Index", "Crud1")); + } + + /// 分離レベルの設定 + private DbEnum.IsolationLevelEnum SelectIsolationLevel(string iso) + { + if (iso == "NC") + { + return DbEnum.IsolationLevelEnum.NotConnect; + } + else if (iso == "NT") + { + return DbEnum.IsolationLevelEnum.NoTransaction; + } + else if (iso == "RU") + { + return DbEnum.IsolationLevelEnum.ReadUncommitted; + } + else if (iso == "RC") + { + return DbEnum.IsolationLevelEnum.ReadCommitted; + } + else if (iso == "RR") + { + return DbEnum.IsolationLevelEnum.RepeatableRead; + } + else if (iso == "SZ") + { + return DbEnum.IsolationLevelEnum.Serializable; + } + else if (iso == "SS") + { + return DbEnum.IsolationLevelEnum.Snapshot; + } + else if (iso == "DF") + { + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + else + { + //throw new Exception("分離レベルの設定がおかしい"); + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs new file mode 100644 index 000000000..0b73a3b34 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/ErrorController.cs @@ -0,0 +1,85 @@ +//********************************************************************************** +//* サンプル アプリ・コントローラ +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ErrorController +//* クラス日本語名 ：ErrorController +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Models.ViewModels; + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading.Tasks; + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Microsoft.AspNetCore.Mvc; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Framework.StdMigration; +using Touryo.Infrastructure.Framework.Util; + +namespace MVC_Sample.Controllers +{ + [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)] + public class ErrorController : MyBaseMVControllerCore + { + /// + /// GET: Error/Index + /// + /// IActionResult + [HttpGet] + [AllowAnonymous] + public IActionResult Index() + { + ISession session = MyHttpContext.Current.Session; + int? flg = session.GetInt32(FxHttpContextIndex.SESSION_ABANDON_FLAG); + if (flg.HasValue) + { + if (Convert.ToBoolean(flg.Value)) + { + // セッション タイムアウト検出用Cookieを消去 + // ※ Removeが正常に動作しないため、値を空文字に設定 ＝ 消去とする + + // Set-Cookie HTTPヘッダをレスポンス + FxCmnFunction.DeleteCookieForSessionTimeoutDetection(); + + try + { + // セッションを消去 + session.Clear(); + } + catch (Exception ex) + { + // エラー発生時 + // このカバレージを通過する場合、 + // おそらく起動した画面のパスが間違っている。 + Console.WriteLine("このカバレージを通過する場合、おそらく起動した画面のパスが間違っている。"); + Console.WriteLine(ex.Message); + } + } + } + + return View(new ErrorViewModel + { + RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier + }); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/HomeController.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/HomeController.cs new file mode 100644 index 000000000..dc89a52ff --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/HomeController.cs @@ -0,0 +1,277 @@ +//********************************************************************************** +//* サンプル アプリ・コントローラ +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：HomeController +//* クラス日本語名 ：認証用サンプル アプリ・コントローラ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Models.ViewModels; + +using System; +using System.Linq; +using System.Collections.Generic; +using System.Threading.Tasks; +using System.Security.Claims; + +using System.Web; + +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Business.Presentation; +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Framework.Authentication; +using Touryo.Infrastructure.Framework.Util; +using Touryo.Infrastructure.Public.Str; +using Touryo.Infrastructure.Public.Security.Pwd; + +namespace MVC_Sample.Controllers +{ + [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)] + public class HomeController : MyBaseMVControllerCore + { + /// Nonce + public string Nonce + { + get + { + if (string.IsNullOrEmpty(HttpContext.Session.GetString("nonce"))) + { + HttpContext.Session.SetString("nonce", GetPassword.Base64UrlSecret(10)); + } + return HttpContext.Session.GetString("nonce"); + } + } + + /// State + public string State + { + get + { + if (string.IsNullOrEmpty(HttpContext.Session.GetString("state"))) + { + HttpContext.Session.SetString("state", GetPassword.Base64UrlSecret(10)); + } + return HttpContext.Session.GetString("state"); + } + } + + /// + /// GET: Home + /// + /// IActionResult + [HttpGet] + [AllowAnonymous] + public IActionResult Index() + { + return View(); + } + + /// + /// GET: /Home/Login + /// + /// IActionResult + [HttpGet] + [AllowAnonymous] + public IActionResult Login() + { + // Session消去 + //this.FxSessionAbandon(); + + return this.View(); + } + + /// + /// POST: /Home/Login + /// + /// LoginViewModel + /// IActionResultを非同期的に返す。 + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task Login(LoginViewModel model) + { + if (!Request.Form.Keys.Any(x => x == "external")) + { + // 通常ログイン + if (ModelState.IsValid) + { + if (!string.IsNullOrEmpty(model.UserName)) + { + // 認証情報を作成する。 + List claims = new List(); + claims.Add(new Claim(ClaimTypes.Name, model.UserName)); + + // 認証情報を保存する。 + ClaimsIdentity userIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); + ClaimsPrincipal userPrincipal = new ClaimsPrincipal(userIdentity); + + // サイン アップする。 + await AuthenticationHttpContextExtensions.SignInAsync( + this.HttpContext, CookieAuthenticationDefaults.AuthenticationScheme, userPrincipal); + + // 認証情報を保存する。 + MyUserInfo ui = new MyUserInfo(model.UserName, (new GetClientIpAddress()).GetAddress()); + UserInfoHandle.SetUserInformation(ui); + + //基盤に任せるのでリダイレクトしない。 + return View(model); + + } + else + { + // ユーザー認証 失敗 + this.ModelState.AddModelError(string.Empty, "指定されたユーザー名またはパスワードが正しくありません。"); + } + } + else + { + // LoginViewModelの検証に失敗 + } + + // Session消去 + //this.FxSessionAbandon(); + + // ポストバック的な + return this.View(model); + } + else + { + // 外部ログイン + return Redirect(string.Format( + CmnClientParams.SpRp_AuthRequestUri + + "?client_id=" + OAuth2AndOIDCParams.ClientID + + "&response_type=code" + + "&scope=profile%20email%20phone%20address%20openid" + + "&state={0}" + + "&nonce={1}" + + "&prompt=none" + + "&redirect_uri={2}", + this.State, this.Nonce, + CustomEncode.UrlEncode(CmnClientParams.SpRp_RedirectUri))); + } + } + + /// + /// Get: /Home/Scroll + /// + /// IActionResult + [HttpGet] + [AllowAnonymous] + public IActionResult Scroll() + { + return View(); + } + + /// + /// Get: /Home/Logout + /// + /// IActionResult + [HttpGet] + public async Task Logout() + { + //FormsAuthentication.SignOut(); + await AuthenticationHttpContextExtensions.SignOutAsync( + this.HttpContext, CookieAuthenticationDefaults.AuthenticationScheme); + + return this.Redirect(Url.Action("Index", "Home")); + } + + /// OAuth2AuthorizationCodeGrantClient + /// string + /// string + /// ActionResultを非同期的に返す + [HttpGet] + [AllowAnonymous] + public async Task OAuth2AuthorizationCodeGrantClient(string code, string state) + { + try + { + string response = ""; + + if (state == this.State) // CSRF(XSRF)対策のstateの検証は重要 + { + response = await OAuth2AndOIDCClient.GetAccessTokenByCodeAsync( + new Uri(CmnClientParams.SpRp_TokenRequestUri), + OAuth2AndOIDCParams.ClientID, OAuth2AndOIDCParams.ClientSecret, "", code); + + // 汎用認証サイトはOIDCをサポートしたのでid_tokenを取得し、検証可能。 + //Base64UrlTextEncoder base64UrlEncoder = new Base64UrlTextEncoder(); + Dictionary dic = JsonConvert.DeserializeObject>(response); + + // id_tokenの検証コード + if (dic.ContainsKey("id_token")) + { + string sub = ""; + string nonce = ""; + JObject jobj = null; + + if (IdToken.Verify(dic["id_token"], dic["access_token"], + code, state, out sub, out nonce, out jobj) && nonce == this.Nonce) + { + // ログインに成功 + + // /userinfoエンドポイントにアクセスする場合 + response = await OAuth2AndOIDCClient.GetUserInfoAsync( + new Uri(CmnClientParams.SpRp_UserInfoUri), dic["access_token"]); + + // 認証情報を作成する。 + List claims = new List(); + claims.Add(new Claim(ClaimTypes.Name, sub)); + + // 認証情報を保存する。 + ClaimsIdentity userIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); + ClaimsPrincipal userPrincipal = new ClaimsPrincipal(userIdentity); + + // サイン アップする。 + await AuthenticationHttpContextExtensions.SignInAsync( + this.HttpContext, CookieAuthenticationDefaults.AuthenticationScheme, userPrincipal); + + // 認証情報を保存する。 + MyUserInfo ui = new MyUserInfo(sub, (new GetClientIpAddress()).GetAddress()); + UserInfoHandle.SetUserInformation(ui); + + return this.Redirect(Url.Action("Index", "Home")); + } + + } + else { } + } + else { } + + // ログインに失敗 + return RedirectToAction("Login"); + } + finally + { + this.ClearExLoginsParams(); + } + } + + /// ClearExLoginsParam + private void ClearExLoginsParams() + { + HttpContext.Session.SetString("nonce", ""); + HttpContext.Session.SetString("state", ""); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/PingController.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/PingController.cs new file mode 100644 index 000000000..1add7ed8f --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/PingController.cs @@ -0,0 +1,54 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +#region Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +//********************************************************************************** +//* クラス名 ：PingController +//* クラス日本語名 ：Ping Controller for Html.BeginForm +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 2018/04/23 西野 大介 新規作成 +//********************************************************************************** + +using Microsoft.AspNetCore.Mvc; + +namespace MVC_Sample.Controllers +{ + /// + /// Ping Controller + /// + public class PingController : Controller + { + /// + /// 画面の初期表示 + /// GET: /Ping/ + /// + /// 空の結果を返す (EmptyResult) + [HttpGet] + public IActionResult Index() + { + return new EmptyResult(); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs new file mode 100644 index 000000000..912eab234 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Business/LayerB.cs @@ -0,0 +1,824 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Logic.Dao; +using MVC_Sample.Logic.Common; +using MVC_Sample.Models.ViewModels; + +using System; +using System.Data; +using System.Collections.Generic; + +using Touryo.Infrastructure.Business.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Framework.Exceptions; +using Touryo.Infrastructure.Public.Dto; + +namespace MVC_Sample.Logic.Business +{ + public class LayerB : MyFcBaseLogic + { + #region テンプレ + + /// 業務処理を実装 + /// 引数クラス + private void UOC_メソッド名(TestParameterValue testParameter) + { //メソッド引数にBaseParameterValueの派生の型を定義可能。 + + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + // 個別Dao + LayerD myDao = new LayerD(this.GetDam()); + //myDao.xxxx(testParameter, ref testReturn); + + // 共通Dao + CmnDao cmnDao = new CmnDao(this.GetDam()); + cmnDao.ExecSelectScalar(); + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #region UOCメソッド + + #region SelectCount + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectCount(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.xml"; + break; + } + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecSelectScalar(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D5_SelCnt(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectCount(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DT + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DT(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + List list = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // DataTableToList + list = DataToPoco.DataTableToList(dt); + + // 戻り値を設定 + testReturn.Obj = list; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // DataTableToList + list = DataToPoco.DataTableToList(dt); + + // 戻り値を設定 + testReturn.Obj = list; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DT(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DS + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DS(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataSet ds = null; + //DataTable dt = null; + List list = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 ds + ds = new DataSet(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DS(ds); + + // DataTableToList + list = DataToPoco.DataTableToList(ds.Tables[0]); + + // 戻り値を設定 + testReturn.Obj = list; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 ds + ds = new DataSet(); + ds.Tables.Add(new DataTable()); + + // 自動生成Daoを実行 + genDao.D2_Select(ds.Tables[0]); + + // DataTableToList + list = DataToPoco.DataTableToList(ds.Tables[0]); + + // 戻り値を設定 + testReturn.Obj = list; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DS(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DR + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DR(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + List list = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 共通Daoを実行 + IDataReader idr = cmnDao.ExecSelect_DR(); + + // DataReaderToList + list = DataToPoco.DataReaderToList(idr); + + // 終了したらクローズ + idr.Close(); + + // 戻り値を設定 + testReturn.Obj = list; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // DRのI/Fなし + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // DataTableToList + list = DataToPoco.DataTableToList(dt); + + // 戻り値を設定 + testReturn.Obj = list; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DR(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DSQL + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DSQL(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + List list = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.xml"; + break; + } + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + cmnDao.SetUserParameter("COLUMN", " " + orderColumn + " "); + cmnDao.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // DataTableToList + list = DataToPoco.DataTableToList(dt); + + // 自動生成Daoを実行 + testReturn.Obj = list; + + break; + + //case "generate": // 自動生成Daoを使用する。 + // // 当該SQLなし + // break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DSQL(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Select + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.Shipper.ShipperID); + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // DataTableToPOCO + testReturn.Obj = DataToPoco.DataTableToPOCO(dt); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.Shipper.ShipperID; + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.S2_Select(dt); + + // DataTableToPOCO + testReturn.Obj = DataToPoco.DataTableToPOCO(dt); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Select(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Insert + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + cmnDao.SQLFileName = "ShipperInsert.sql"; + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P2", testParameter.Shipper.CompanyName); + cmnDao.SetParameter("P3", testParameter.Shipper.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.CompanyName = testParameter.Shipper.CompanyName; + genDao.Phone = testParameter.Shipper.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D1_Insert(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Insert(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Update + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.Shipper.ShipperID); + cmnDao.SetParameter("P2", testParameter.Shipper.CompanyName); + cmnDao.SetParameter("P3", testParameter.Shipper.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.Shipper.ShipperID; + genDao.Set_CompanyName_forUPD = testParameter.Shipper.CompanyName; + genDao.Set_Phone_forUPD = testParameter.Shipper.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S3_Update(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Update(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Delete + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.Shipper.ShipperID); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.Shipper.ShipperID; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S4_Delete(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Delete(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #endregion + + #region ロールバックのテスト + + /// ロールバックのテスト + /// 引数クラス + private void TestRollback(TestParameterValue testParameter) + { + switch ((testParameter.ActionType.Split('%'))[3]) + { + + case "Business": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // 業務例外のスロー + throw new BusinessApplicationException( + "ロールバックのテスト", + "ロールバックのテスト", + "エラー情報"); + //break; // 到達できないためコメントアウト + + case "System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // システム例外のスロー + throw new BusinessSystemException( + "ロールバックのテスト", + "ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外のスロー + throw new Exception("ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other-Business": + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（業務例外へ振り替え）のスロー + throw new Exception("Other-Business"); + //break; // 到達できないためコメントアウト + + case "Other-System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（システム例外へ振り替え）のスロー + throw new Exception("Other-System"); + //break; // 到達できないためコメントアウト + } + } + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs new file mode 100644 index 000000000..5bdde0c35 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.cs @@ -0,0 +1,48 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（引数・戻り値） +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Models.ViewModels; +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace MVC_Sample.Logic.Common +{ + public class TestParameterValue : MyParameterValue + { + /// shipper + public ShipperViweModel Shipper { get; set; } + + /// OrderColumn + public string OrderColumn; + + /// OrderSequence + public string OrderSequence; + + #region コンストラクタ + + /// コンストラクタ + public TestParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs new file mode 100644 index 000000000..580d69cce --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.cs @@ -0,0 +1,33 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（引数・戻り値） +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using Touryo.Infrastructure.Business.Common; + +namespace MVC_Sample.Logic.Common +{ + public class TestReturnValue : MyReturnValue + { + /// 汎用エリア + public object Obj; + + /// テスト用エリア + public object Obj2; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs new file mode 100644 index 000000000..b5cb732cd --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.cs @@ -0,0 +1,409 @@ +//********************************************************************************** +//* Ｄ層 自動生成・テストクラス +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoShippers +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace MVC_Sample.Logic.Dao +{ + /// 自動生成Ｄａｏクラス + public class DaoShippers : MyBaseDao + { + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoShippers(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// ShipperID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_ShipperID + { + set + { + this.HtParameter["ShipperID"] = value; + } + get + { + return this.HtParameter["ShipperID"]; + } + } + + + + /// CompanyName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CompanyName + { + set + { + this.HtParameter["CompanyName"] = value; + } + get + { + return this.HtParameter["CompanyName"]; + } + } + + /// Phone列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Phone + { + set + { + this.HtParameter["Phone"] = value; + } + get + { + return this.HtParameter["Phone"]; + } + } + + + /// Set_ShipperID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipperID_forUPD + { + set + { + this.HtParameter["Set_ShipperID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipperID_forUPD"]; + } + } + + + /// Set_CompanyName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CompanyName_forUPD + { + set + { + this.HtParameter["Set_CompanyName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CompanyName_forUPD"]; + } + } + + + /// Set_Phone_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Phone_forUPD + { + set + { + this.HtParameter["Set_Phone_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Phone_forUPD"]; + } + } + + + + /// ShipperID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipperID_Like + { + set + { + this.HtParameter["ShipperID_Like"] = value; + } + get + { + return this.HtParameter["ShipperID_Like"]; + } + } + + + /// CompanyName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CompanyName_Like + { + set + { + this.HtParameter["CompanyName_Like"] = value; + } + get + { + return this.HtParameter["CompanyName_Like"]; + } + } + + + /// Phone_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Phone_Like + { + set + { + this.HtParameter["Phone_Like"] = value; + } + get + { + return this.HtParameter["Phone_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoShippers_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoShippers_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoShippers_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoShippers_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoShippers_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoShippers_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoShippers_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoShippers_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoShippers_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs new file mode 100644 index 000000000..92b05c1ee --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.cs @@ -0,0 +1,506 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerD +//* クラス日本語名 ：Ｄ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using MVC_Sample.Logic.Common; +using MVC_Sample.Models.ViewModels; + +using System.Data; +using System.Collections.Generic; +using System.Diagnostics; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Dto; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Diagnostics; + +namespace MVC_Sample.Logic.Dao +{ + public class LayerD : MyBaseDao + { + /// + /// コンストラクタ + /// + public LayerD(BaseDam dam) : base(dam) { } + + #region テンプレ + + /// テンプレ + /// 引数クラス + /// 戻り値クラス + public void テンプレ(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + // ● 下記のいづれかの方法でSQLを設定する。 + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ファイル名"); + + // -- 直接指定する場合。 + this.SetSqlByCommand("SQL文"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.Shipper.ShipperID); + + object obj; + + // -- 追加、更新、削除の場合（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // -- 先頭の１セル分の情報を返すSELECTクエリを実行する場合 + obj = this.ExecSelectScalar(); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データテーブル） + obj = new DataTable(); + this.ExecSelectFill_DT((DataTable)obj); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データセット） + obj = new DataSet(); + this.ExecSelectFill_DS((DataSet)obj); + + // -- データリーダを返す + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 参照系 + + #region 件数取得（SelectCount） + + /// 件数情報を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectCount(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperCount.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperCount.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + object obj; + + // -- 件数情報を返すSELECTクエリを実行する + obj = this.ExecSelectScalar(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 一覧取得（SelectAll） + + /// 一覧を返すSELECTクエリを実行する（DT） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DT(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // DataTableToList + List list = DataToPoco.DataTableToList(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = list; + } + + /// 一覧を返すSELECTクエリを実行する（DS） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DS(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 ds + DataSet ds = new DataSet(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DS(ds); + + // DataTableToList + List list = DataToPoco.DataTableToList(ds.Tables[0]); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = list; + } + + /// 一覧を返すSELECTクエリを実行する（DR） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DR(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // -- 一覧を返すSELECTクエリを実行する + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + // DataReaderToList + List list = DataToPoco.DataReaderToList(idr); + + // 終了したらクローズ + idr.Close(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = list; + } + + /// 一覧を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DSQL(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelectOrder.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelectOrder.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + this.SetUserParameter("COLUMN", " " + orderColumn + " "); + this.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + // DataTableToList + List list = DataToPoco.DataTableToList(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = list; + } + + #endregion + + #region 参照 + + /// １レコードを返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Select(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelect.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelect.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.Shipper.ShipperID); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- １レコードを返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 一部、DataToPocoのテストコード + ShipperViweModel svm = DataToPoco.DataTableToPOCO(dt); + Debug.WriteLine("svm:" + ObjectInspector.Inspect(svm)); + + TestShipperViweModel tsvm = DataToPoco.DataTableToPOCO(dt, + // mapの書き方は、Key-Valueでdst-srcのproperty field名を書く + new Dictionary() + { + { "_ShipperID", "ShipperID"}, + { "_CompanyName", "CompanyName"}, + { "_Phone", "Phone"} + }); + + Debug.WriteLine("tsvm:" + ObjectInspector.Inspect(tsvm)); + + testReturn.Obj = svm; + testReturn.Obj2 = tsvm; + } + + #endregion + + #endregion + + #region 更新系 + + #region 追加 + + /// Insertクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Insert(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ShipperInsert.sql"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P2", testParameter.Shipper.CompanyName); + this.SetParameter("P3", testParameter.Shipper.Phone); + + object obj; + + // -- 追加（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 更新 + + /// Updateクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Update(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperUpdate.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperUpdate.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.Shipper.ShipperID); + this.SetParameter("P2", testParameter.Shipper.CompanyName); + this.SetParameter("P3", testParameter.Shipper.Phone); + + object obj; + + // -- 更新（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 削除 + + /// Deleteクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Delete(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperDelete.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperDelete.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.Shipper.ShipperID); + + object obj; + + // -- 削除（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj new file mode 100644 index 000000000..b8fe67a73 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj @@ -0,0 +1,38 @@ + + + + net5.0 + true + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs new file mode 100644 index 000000000..6367b0207 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.cs @@ -0,0 +1,77 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +#region Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +//********************************************************************************** +//* クラス名 ：BaseViewModel +//* クラス日本語名 ：BaseViewModel +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; + +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Framework.StdMigration; +using Touryo.Infrastructure.Framework.Util; + +namespace MVC_Sample.Models.ViewModels +{ + /// BaseViewModel + [Serializable] + public class BaseViewModel + { + + /// UserName + public static string UserName + { + get + { + //MyUserInfo myUserInfo = (MyUserInfo)UserInfoHandle.GetUserInformation(); + + // ClaimsIdentityを使用できるようになったのでMyUserInfoは卒業。 + + AuthenticateResult authenticateInfo = + AuthenticationHttpContextExtensions.AuthenticateAsync( + MyHttpContext.Current, CookieAuthenticationDefaults.AuthenticationScheme).Result; + + string userName = authenticateInfo.Principal?.Identity?.Name; // null 条件演算子 + + if (string.IsNullOrEmpty(userName)) + { + return "anonymous"; + } + else + { + return userName; + } + + } + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs new file mode 100644 index 000000000..09025bb7b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.cs @@ -0,0 +1,176 @@ +//********************************************************************************** +//* サンプル アプリ・モデル +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：CrudViweModel +//* クラス日本語名 ：サンプル アプリ・モデル +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace MVC_Sample.Models.ViewModels +{ + /// + /// サンプル アプリ・モデル + /// + [Serializable] + public class CrudViweModel : BaseViewModel + { + /// shipper + public ShipperViweModel Shipper { get; set; } + + /// shippers + public List Shippers { get; set; } + + /// メッセージ + public string Message { get; set; } + + #region ドロップダウンリストに表示するアイテム + + /// データアクセス制御クラス（データプロバイダ） + public string DdlDap { get; set; } + + /// 個別、共通、自動生成のＤａｏ種別 + public string DdlMode1 { get; set; } + + /// 静的、動的のクエリ モード + public string DdlMode2 { get; set; } + + /// 分離レベル + public string DdlIso { get; set; } + + /// コミット、ロールバック + public string DdlExRollback { get; set; } + + /// コミット、ロールバック + public string DdlOrderColumn { get; set; } + + /// コミット、ロールバック + public string DdlOrderSequence { get; set; } + + /// データアクセス制御クラス（データプロバイダ） アイテムリスト + public List DdlDapItems + { + get + { + return new List() + { + new SelectListItem() { Text = "SQL Server / SQL Client", Value = "SQL", Selected = true }, + new SelectListItem() { Text = "Multi-DB / OLEDB.NET", Value = "OLE" }, + new SelectListItem() { Text = "Multi-DB / ODBC.NET", Value = "ODB" }, + new SelectListItem() { Text = "Oracle / ODP.NET", Value = "ODP" }, + new SelectListItem() { Text = "DB2 / DB2.NET", Value = "DB2" }, + new SelectListItem() { Text = "HiRDB / HiRDB-DP", Value = "HIR" }, + new SelectListItem() { Text = "MySQL Cnn/NET", Value = "MCN" }, + new SelectListItem() { Text = "PostgreSQL / Npgsql", Value = "NPS" } + }; + } + } + + /// 個別、共通、自動生成のＤａｏ種別 アイテムリスト + public List DdlMode1Items + { + get + { + return new List() + { + new SelectListItem() { Text = "個別Ｄａｏ", Value = "individual", Selected = true }, + new SelectListItem() { Text = "共通Ｄａｏ", Value = "common" }, + new SelectListItem() { Text = "自動生成Ｄａｏ（更新のみ）", Value = "generate" } + }; + } + } + + /// 静的、動的のクエリ モード アイテムリスト + public List DdlMode2Items + { + get + { + return new List() + { + new SelectListItem() { Text = "静的クエリ", Value = "static", Selected = true }, + new SelectListItem() { Text = "動的クエリ", Value = "dynamic" } + }; + } + } + + /// 分離レベル アイテムリスト + public List DdlIsoItems + { + get + { + return new List() + { + new SelectListItem() { Text = "ノットコネクト", Value = "NC" }, + new SelectListItem() { Text = "ノートランザクション", Value = "NT", Selected = true }, + new SelectListItem() { Text = "ダーティリード", Value = "RU" }, + new SelectListItem() { Text = "リードコミット", Value = "RC" }, + new SelectListItem() { Text = "リピータブルリード", Value = "RR" }, + new SelectListItem() { Text = "シリアライザブル", Value = "SZ" }, + new SelectListItem() { Text = "スナップショット", Value = "SS" }, + new SelectListItem() { Text = "デフォルト", Value = "DF" } + }; + } + } + + /// コミット、ロールバック アイテムリスト + public List DdlExRollbackItems + { + get + { + return new List() + { + new SelectListItem() { Text = "正常時", Value = "-", Selected = true }, + new SelectListItem() { Text = "業務例外", Value = "Business" }, + new SelectListItem() { Text = "システム例外", Value = "System" }, + new SelectListItem() { Text = "その他、一般的な例外", Value = "Other" }, + new SelectListItem() { Text = "業務例外への振替", Value = "Other-Business" }, + new SelectListItem() { Text = "システム例外への振替", Value = "Other-System" } + }; + } + } + + /// 並び替え対象列 アイテムリスト + public List DdlOrderColumnItems + { + get + { + return new List() + { + new SelectListItem() { Text = "c1", Value = "c1", Selected = true }, + new SelectListItem() { Text = "c2", Value = "c2" }, + new SelectListItem() { Text = "c3", Value = "c3" } + }; + } + } + + /// 昇順・降順 アイテムリスト + public List DdlOrderSequenceItems + { + get + { + return new List() + { + new SelectListItem() { Text = "ASC", Value = "A", Selected = true }, + new SelectListItem() { Text = "DESC", Value = "D" } + }; + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ErrorViewModel.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ErrorViewModel.cs new file mode 100644 index 000000000..3c206208f --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ErrorViewModel.cs @@ -0,0 +1,44 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +#region Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +//********************************************************************************** +//* クラス名 ：ErrorViewModel +//* クラス日本語名 ：ErrorViewModel +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; + +namespace MVC_Sample.Models.ViewModels +{ + public class ErrorViewModel + { + public string RequestId { get; set; } + + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs new file mode 100644 index 000000000..4b4c6cc9b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.cs @@ -0,0 +1,53 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +#region Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +//********************************************************************************** +//* クラス名 ：LoginViewModel +//* クラス日本語名 ：LoginViewModel +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.ComponentModel.DataAnnotations; + +namespace MVC_Sample.Models.ViewModels +{ + /// LoginViewModel + public class LoginViewModel + { + /// + /// UserName + /// + [Display(Name = "User name")] + public string UserName { get; set; } + + /// + /// PWDS + /// + [Display(Name = "Password")] + public string Password { get; set; } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs new file mode 100644 index 000000000..9d15bfdeb --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.cs @@ -0,0 +1,80 @@ +//********************************************************************************** +//* サンプル アプリ・モデル +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ShipperViweModel +//* クラス日本語名 ：サンプル アプリ・モデル +//* +//* 作成日時 ：2018/8/1 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; + +namespace MVC_Sample.Models.ViewModels +{ + /// 自動生成Entityクラス + [Serializable()] + public class ShipperViweModel + { + #region メンバ変数 + + /// メンバ変数：ShipperID + private System.Int64? _PK_ShipperID; // Oracle対応 32 -> 64 + + /// プロパティ：ShipperID + public System.Int64? ShipperID // Oracle対応 32 -> 64 + { + get + { + return this._PK_ShipperID; + } + set + { + this._PK_ShipperID = value; + } + } + + /// メンバ変数：CompanyName + private System.String _CompanyName; + + /// プロパティ：CompanyName + public System.String CompanyName + { + get + { + return this._CompanyName; + } + set + { + this._CompanyName = value; + } + } + /// メンバ変数：Phone + private System.String _Phone; + + /// プロパティ：Phone + public System.String Phone + { + get + { + return this._Phone; + } + set + { + this._Phone = value; + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs new file mode 100644 index 000000000..5d5147236 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.cs @@ -0,0 +1,39 @@ +//********************************************************************************** +//* サンプル アプリ・モデル +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestShipperViweModel +//* クラス日本語名 ：サンプル アプリ・モデル +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; + +namespace MVC_Sample.Models.ViewModels +{ + /// + /// サンプル アプリ・モデル + /// + public class TestShipperViweModel + { + /// ShipperID + public Int64 _ShipperID = 0; + + /// CompanyName + public string _CompanyName = ""; + + /// Phone + public string _Phone = ""; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs new file mode 100644 index 000000000..08125f4ea --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs @@ -0,0 +1,57 @@ +//********************************************************************************** +//* テンプレート +//********************************************************************************** + +// サンプル中のテンプレートなので、必要に応じて使用して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：Program +//* +//* 作成日時 ：－ +//* 作成者 ：－ +//* 更新履歴 ：－ +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Net.Http; + +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; + +using Touryo.Infrastructure.Framework.Authentication; + +namespace MVC_Sample +{ + /// Program + public class Program + { + /// + /// Main（エントリポイント） + /// コマンドライン引数 + public static void Main(string[] args) + { + // OpenID用 + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + + // BuildWebHostが返すIWebHostをRunする。 + // 呼び出し元スレッドは終了までブロックされる。 + Program.BuildWebHost(args).Run(); + } + + /// BuildWebHost + /// コマンドライン引数 + /// IWebHost + public static IWebHost BuildWebHost(string[] args) + { + // WebHost経由で、IWebHost, IWebHostBuilderにアクセスする。 + + return WebHost.CreateDefaultBuilder(args) // IWebHostBuilderを取得する。 + .UseStartup() // IWebHostBuilder.UseStartup メソッドにStartupクラスを指定。 + .Build(); // IWebHostBuilder.Build メソッドでIWebHostクラスインスタンスを返す。 + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Properties/launchSettings.json b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Properties/launchSettings.json new file mode 100644 index 000000000..2f9e034f6 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "https://localhost:44334/", + "sslPort": 44334 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "MVC_Sample": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:44334/" + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib1.bat b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib1.bat new file mode 100644 index 000000000..63b2a6027 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib1.bat @@ -0,0 +1,2 @@ +npm i +pause \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib2.bat b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib2.bat new file mode 100644 index 000000000..9d465be8a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/RestoreLib2.bat @@ -0,0 +1,2 @@ +npm run-script build +pause \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs new file mode 100644 index 000000000..ed128c91a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs @@ -0,0 +1,226 @@ +//********************************************************************************** +//* テンプレート +//********************************************************************************** + +// サンプル中のテンプレートなので、必要に応じて使用して下さい。 + +//********************************************************************************** +//* クラス名 ：Startup +//* クラス日本語名 ：Startup +//* +//* 作成日時 ：－ +//* 作成者 ：－ +//* 更新履歴 ：－ +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.IO; + +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.HttpsPolicy; +using Microsoft.AspNetCore.CookiePolicy; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.DataProtection; + +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Microsoft.Extensions.Caching.Memory; + +//using Microsoft.AspNetCore.Mvc.Cors.Internal; + +using Touryo.Infrastructure.Framework.StdMigration; +using Touryo.Infrastructure.Public.Util; + + +namespace MVC_Sample +{ + /// + /// Startup + /// ミドルウェア /サービス / フレームワークを + /// Startupクラスのメソッドで注入することにより、活用できるようになる。 + /// + public class Startup + { + #region mem & prop & constructor + + /// Configuration + public IConfiguration Configuration { get; } + + /// constructor + /// IConfiguration + public Startup(IConfiguration configuration) + { + Configuration = configuration; + + // ライブラリにも設定 + GetConfigParameter.InitConfiguration(configuration); + // Dockerで埋め込まれたリソースを使用する場合、 + // 以下のコメントアウトを解除し、appsettings.jsonのappSettings sectionに、 + // "Azure": "既定の名前空間" を指定し、設定ファイルを埋め込まれたリソースに変更する。 + //Touryo.Infrastructure.Business.Dao.MyBaseDao.UseEmbeddedResource = true; + } + + #endregion + + #region Configure & ConfigureServices + + /// + /// This method gets called by the runtime. + /// Use this method to configure the HTTP request pipeline. + /// + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + else + { + app.UseExceptionHandler("/Home/Error"); + + // The default HSTS value is 30 days. + // You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + //app.UseHttpsRedirection(); + } + + // HttpContextのマイグレーション用 + app._UseHttpContextAccessor(); + + // /wwwroot（既定の）の + // 静的ファイルをパイプラインに追加 + app.UseStaticFiles(); + + // Cookieを使用する。 + app.UseCookiePolicy(new CookiePolicyOptions() + { + HttpOnly = HttpOnlyPolicy.Always, + MinimumSameSitePolicy = SameSiteMode.Strict, + //Secure= CookieSecurePolicy.Always + }); + + // Sessionを使用する。 + app.UseSession(new SessionOptions() + { + IdleTimeout = TimeSpan.FromMinutes(30), // ここで調整 + IOTimeout = TimeSpan.FromSeconds(30), + Cookie = new CookieBuilder() + { + Expiration = TimeSpan.FromDays(1), // 効かない + HttpOnly = true, + Name = "mvc_session", + Path = "/", + SameSite = SameSiteMode.Strict, + SecurePolicy = CookieSecurePolicy.SameAsRequest + } + }); + + // Routing + app.UseRouting(); + + // Identity + // Identityではなく、CookieAuthentication + app.UseAuthentication(); + app.UseAuthorization(); + + // Routingの設定 + app.UseEndpoints(endpoints => + { + endpoints.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); + endpoints.MapRazorPages(); + }); + } + + /// + /// This method gets called by the runtime. + /// Use this method to add services to the container. + /// + /// IServiceCollection + public void ConfigureServices(IServiceCollection services) + { + // 構成情報から、AppConfiguration SectionをAppConfiguration Classへバインドするようなケース。 + //services.Configure(Configuration.GetSection("AppConfiguration")); + + // HttpContextのマイグレーション用 + services._AddHttpContextAccessor(); + + services.Configure(options => + { + // This lambda determines whether user consent + // for non-essential cookies is needed for a given request. + options.CheckConsentNeeded = context => true; + }); + + // Sessionのモード + services.AddDistributedMemoryCache(); // 開発用 + //services.AddDistributedSqlServerCache(); + //services.AddDistributedRedisCache(); + + // Sessionを使用する。 + services.AddSession(); + + // Core 3.0のテンプレートではUseMvcの + // 代わりにこれらを使用するようになった。 + services + .AddControllersWithViews()// MVC & WebAPI + .AddNewtonsoftJson();// JSON シリアライザの変更 + + #region Add Frameworks + + // 一般的な Webアプリでは、 + // EF, Identity, MVC などのミドルウェア サービスを登録する。 + // ミドルウェアの実行順序は、IStartupFilter の登録順に設定される。 + + // EF + //services.AddDbContext(options => + // options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection"))); + + // Identity + //services.AddIdentity() + // .AddEntityFrameworkStores() + // .AddDefaultTokenProviders(); + + // Add application services. + //services.AddTransient(); + //services.AddTransient(); + + services.AddMvc(); + + // Forms認証 + services.AddAuthentication(options => + { + options.DefaultChallengeScheme = CookieAuthenticationDefaults.AuthenticationScheme; + options.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; + options.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme; + }) + .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme, options => + { + options.LoginPath = new PathString("/Home/Login"); + //options.LogoutPath = new PathString("/Home/Logout"); + options.AccessDeniedPath = new PathString(GetConfigParameter.GetConfigValue("FxErrorScreenPath")); + options.ReturnUrlParameter = "ReturnUrl"; + options.ExpireTimeSpan = TimeSpan.FromHours(1); + options.SlidingExpiration = true; + options.Cookie.HttpOnly = true; + //options.DataProtectionProvider = DataProtectionProvider.Create(new DirectoryInfo(@"C:\artifacts")); + }); + + #endregion + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml new file mode 100644 index 000000000..6cfae25bc --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml @@ -0,0 +1,124 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Index + //* クラス日本語名 ：CRUDサンプル（Html.BeginForm） + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@{ + // ページタイトル + ViewBag.Title = "CRUDサンプル（Html.BeginForm）"; +} + +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +@* 本文レイアウト（RenderBodyに出力されます） *@ +@* Html.BeginFormは従来の全体方式、Ajax.BeginFormは部分更新方式（UpdateTargetIdの範囲を部分更新） *@ +@using (Html.BeginForm(null, null, FormMethod.Post, new { id = "form1", onsubmit = "Fx_OnSubmit();" })) +{ + @Html.AntiForgeryToken() + +
+
+
+ + @Html.DropDownListFor(model => model.DdlDap, Model.DdlDapItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode1, Model.DdlMode1Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode2, Model.DdlMode2Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlIso, Model.DdlIsoItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlExRollback, Model.DdlExRollbackItems, new { @class = "form-control" }) +
+
+
+
+ + @Html.TextBoxFor(model => model.Shipper.ShipperID, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.CompanyName, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.Phone, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderColumn, Model.DdlOrderColumnItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderSequence, Model.DdlOrderSequenceItems, new { @class = "form-control" }) +
+ 処理結果： +
@await Html.PartialAsync("_MessageView")
+
+
+
@await Html.PartialAsync("_ChartView")
+ +
+
+
+ + + + + +
+
+ + + + +
+
+ + + +
+} + +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml rename to root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml rename to root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml new file mode 100644 index 000000000..6cfae25bc --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml @@ -0,0 +1,124 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Index + //* クラス日本語名 ：CRUDサンプル（Html.BeginForm） + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@{ + // ページタイトル + ViewBag.Title = "CRUDサンプル（Html.BeginForm）"; +} + +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +@* 本文レイアウト（RenderBodyに出力されます） *@ +@* Html.BeginFormは従来の全体方式、Ajax.BeginFormは部分更新方式（UpdateTargetIdの範囲を部分更新） *@ +@using (Html.BeginForm(null, null, FormMethod.Post, new { id = "form1", onsubmit = "Fx_OnSubmit();" })) +{ + @Html.AntiForgeryToken() + +
+
+
+ + @Html.DropDownListFor(model => model.DdlDap, Model.DdlDapItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode1, Model.DdlMode1Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlMode2, Model.DdlMode2Items, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlIso, Model.DdlIsoItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlExRollback, Model.DdlExRollbackItems, new { @class = "form-control" }) +
+
+
+
+ + @Html.TextBoxFor(model => model.Shipper.ShipperID, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.CompanyName, new { @class = "form-control" }) +
+
+ + @Html.TextBoxFor(model => model.Shipper.Phone, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderColumn, Model.DdlOrderColumnItems, new { @class = "form-control" }) +
+
+ + @Html.DropDownListFor(model => model.DdlOrderSequence, Model.DdlOrderSequenceItems, new { @class = "form-control" }) +
+ 処理結果： +
@await Html.PartialAsync("_MessageView")
+
+
+
@await Html.PartialAsync("_ChartView")
+ +
+
+
+ + + + + +
+
+ + + + +
+
+ + + +
+} + +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml rename to root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml new file mode 100644 index 000000000..81b2a5671 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml @@ -0,0 +1,24 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_MessageView + //* クラス日本語名 ：Message部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml new file mode 100644 index 000000000..31b4ca979 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml @@ -0,0 +1,40 @@ +@* + //********************************************************************************** + //* テンプレート + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Index + //* クラス日本語名 ：エラー用のView + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@model ErrorViewModel +@{ + Layout = null; +} + + + + + + + エラー + + +
+

エラー。

+

要求の処理中にエラーが発生しました。

+
+ + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml new file mode 100644 index 000000000..f734ff254 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml @@ -0,0 +1,48 @@ +@* + //********************************************************************************** + //* サンプル アプリ・ビュー + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Menu + //* クラス日本語名 ：Menu + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@{ + ViewBag.Title = "Menu"; +} + +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +

@ViewBag.Title

+ +
    +
  • + サンプル +
      +
    • @Html.ActionLink("メニュー", "Index", "Home")
      • +
    • @Html.ActionLink("スクロールのテスト", "Scroll", "Home")
      • +
    • @Html.ActionLink("Crudテスト（Html.BeginForm）", "Index", "Crud1")
      • +
    • Crudテスト（Ajax.BeginForm）
      • +
    +
    • +
+ +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml new file mode 100644 index 000000000..68132a46d --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml @@ -0,0 +1,65 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：Sign-in + //* クラス日本語名 ：Sign-in + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model LoginViewModel +@{ + ViewBag.Title = "Sign-in"; +} + +

Sign-in

+ +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +@using (@Html.BeginForm()) +{ + @Html.ValidationSummary() + @Html.AntiForgeryToken() + + + + + + + + + + + + + + +
ユーザーID@Html.TextBoxFor(model => model.UserName)
パスワード@Html.PasswordFor(model => model.Password)
+ + +
+ + +
+} + +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml new file mode 100644 index 000000000..97252d8e5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml @@ -0,0 +1,128 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：ScrollView + //* クラス日本語名 ：ScrollView + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@{ + ViewBag.Title = "ScrollView"; +} + +@* スクリプト・セクション（RenderSection("HeaderScriptsSection", required: true)に出力されます） *@ +@section HeaderScriptsSection{ + +} + +

ScrollView

+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+・・・
+ +@* スクリプト・セクション（RenderSection("FooterScriptsSection", required: true)に出力されます） *@ +@section FooterScriptsSection{ + +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml new file mode 100644 index 000000000..3dd802c0d --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml @@ -0,0 +1,126 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_Layout + //* クラス日本語名 ：マスタ・ページ相当 + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@* マスタ・ページに相当 *@ +@using MVC_Sample.Models.ViewModels + + + + + + + @ViewData["Title"] + + @* ScriptTagHelperの属性を指定可能。*@ + + + + + + + + + + + + + + @RenderSection("HeaderScriptsSection", required: true) + + + + + +
+
+ +
+ You has signed-in as "@BaseViewModel.UserName". + scroll value +
+
+
+ @if (User.Identity.IsAuthenticated) + { + @* サインアウトボタンは、ユーザーが認証されている時だけ表示する *@ + + } +
+
+
+
+
+
メニュー
+ +
+
    +
  • + メニュートップ +
    • + @if (User.Identity.IsAuthenticated) + { + @* 各メニューは、ユーザーが認証されている時だけ表示する *@ +
  • + メニュー１ +
    • +
  • + メニュー２ +
    • + } +
+
+
+
+ @RenderBody() +
+
+
+ + + + + + + + + + + + + + + + + + + + + + @RenderSection("FooterScriptsSection", required: true) + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_ValidationScriptsPartial.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_ValidationScriptsPartial.cshtml new file mode 100644 index 000000000..a699aafa9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Shared/_ValidationScriptsPartial.cshtml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewImports.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewImports.cshtml new file mode 100644 index 000000000..d5f5d29a2 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewImports.cshtml @@ -0,0 +1,25 @@ +@* + //********************************************************************************** + //* テンプレート + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_ViewImports + //* クラス日本語名 ：_ViewImports + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample +@using MVC_Sample.Models +@using MVC_Sample.Models.ViewModels +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml new file mode 100644 index 000000000..2503cfe8e --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml @@ -0,0 +1,24 @@ +@* + //********************************************************************************** + //* テンプレート + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_ViewStart + //* クラス日本語名 ：_ViewStart + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@{ + Layout = "_Layout"; +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.Development.json b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.Development.json new file mode 100644 index 000000000..fa8ce71a9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.Development.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json new file mode 100644 index 000000000..c68bb3c15 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json @@ -0,0 +1,66 @@ +{ + // connectionStrings section + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + + // appSettings section + "appSettings": { + // Webサービス用 + //"Azure": "MVC_Sample", + + // フレームワークの使用するパラメータ - start + // 基盤画面パス" + "FxErrorScreenPath": "/Error/Index", + // 共有情報定義へのパス + "FxXMLSPDefinition": "C:/root/files/resource/XML/SPDefinition.xml", + // メッセージ定義へのパス + "FxXMLMSGDefinition": "C:/root/files/resource/XML/MSGDefinition.xml", + // トランザクション制御定義へのパス + "FxXMLTCDefinition": "C:/root/files/resource/XML/TCDefinition.xml", + // 名前解決定義へのパス + "FxXMLTMInProcessDefinition": "C:/root/files/resource/XML/TMInProcessDefinition.xml", + + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + + // Log4Netのコンフィグファイルへのパス + "FxLog4NetConfFile": "C:/root/files/resource/Log/SampleLogConf.xml", + // 共通部品の使用するパラメータ - end + // Ｄ層のパフォーマンスログ出力機能のon・off" "-->", + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定", + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // セッションタイムアウト検出機能のon・off + "FxSessionTimeOutCheck": "on", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + + // OAuth2, OIDC認証 + "SpRp_Isser": "https://ssoauth.opentouryo.com", + "OAuth2AndOidcClientID": "f53469c17c5a432f86ce563b7805ab89", + "OAuth2AndOidcSecret": "cKdwJb6mRKVIJpGxEWjIC94zquQltw_ECfO-55p21YM", + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", + "JwkSetUri": "https://localhost:44300/MultiPurposeAuthSite/jwkcerts/", + "SpRp_AuthRequestUri": "https://localhost:44300/MultiPurposeAuthSite/authorize", + "SpRp_TokenRequestUri": "https://localhost:44300/MultiPurposeAuthSite/token", + "SpRp_UserInfoUri": "https://localhost:44300/MultiPurposeAuthSite/userinfo", + "SpRp_RedirectUri": "https://localhost:44334/Home/OAuth2AuthorizationCodeGrantClient", + + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "C:/root/files/resource/Sql" + + // アプリケーションの使用するパラメータ - end + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/gruntfile.js b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/gruntfile.js new file mode 100644 index 000000000..efd456049 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/gruntfile.js @@ -0,0 +1,82 @@ +module.exports = function (grunt) { + grunt.initConfig({ + // package.jsonファイル内のプロパティの値を参照する + pkg: grunt.file.readJSON('package.json'), + // 各タスクの構成を定義 + // package.json の scripts から "grunt cssmin" などで呼び出せる。 + copy: { + bundle: { + files: [ + { + expand: true, src: ['**'], + cwd: 'node_modules/jquery/dist/', + dest: 'wwwroot/lib/jquery/dist/' + }, + { + expand: true, src: ['**'], + cwd: 'node_modules/jquery-validation/dist/', + dest: 'wwwroot/lib/jquery-validation/dist/' + }, + { + expand: true, src: ['**'], + cwd: 'node_modules/jquery-validation-unobtrusive/dist/', + dest: 'wwwroot/lib/jquery-validation-unobtrusive/dist/' + }, + { + expand: true, src: ['**'], + cwd: 'node_modules/bootstrap/dist/', + dest: 'wwwroot/lib/bootstrap/dist/' + }, + { + expand: true, src: ['**'], + cwd: 'node_modules/font-awesome/css/', + dest: 'wwwroot/css/' + }, + { + expand: true, src: ['**'], + cwd: 'node_modules/font-awesome/fonts/', + dest: 'wwwroot/fonts/' + } + ] + } + }, + cssmin: { + bundle: { + src: [ + 'wwwroot/css/app/site.css', + 'wwwroot/css/touryo/Style.css', + 'wwwroot/lib/bootstrap/dist/css/bootstrap.css', + 'wwwroot/css/font-awesome.css' + ], + dest: 'wwwroot/css/css.min.css' + } + }, + uglify: { + bundle: { + files: { + 'wwwroot/js/header.min.js': [ + 'wwwroot/lib/jquery/dist/jquery.js', + 'wwwroot/lib/bootstrap/dist/js/bootstrap.js'], + 'wwwroot/js/footer.min.js': [ + 'wwwroot/lib/jquery-validation/dist/jquery.validate.js', + 'wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js'], + 'wwwroot/js/app.min.js': [ + 'wwwroot/js/app/site.js' + ], + 'wwwroot/js/touryo.min.js': [ + 'wwwroot/js/touryo/common.js', + 'wwwroot/js/touryo/else.js'] + } + } + } + }); + // 必要なGruntプラグインを読み込む。 + grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-uglify-es'); + // 各タスクを組合せたカスタム タスクを登録する。 + // package.json の scripts から "grunt bundle" で呼び出せる。 + grunt.registerTask('bundle', ['copy', 'cssmin', 'uglify']); +}; \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/package.json b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/package.json new file mode 100644 index 000000000..3b22ced07 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/package.json @@ -0,0 +1,26 @@ +{ + "name": "mvc_sample", + "version": "1.0.0", + "description": "Sample of Core MVC", + "private": true, + "main": "gruntfile.js", + "scripts": { + "build": "grunt bundle", + "old_build": "dotnet bundle" + }, + "dependencies": { + "bootstrap": "^4.3.1", + "font-awesome": "^4.7.0", + "jquery": "^3.4.1", + "jquery-validation": "^1.17.0", + "jquery-validation-unobtrusive": "^3.2.11", + "popper.js": "^1.14.7" + }, + "devDependencies": { + "grunt": "^1.0.3", + "grunt-cli": "^1.2.0", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-cssmin": "^2.2.1", + "grunt-contrib-uglify-es": "^3.3.0" + } +} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/app/site.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css rename to root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/app/site.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css rename to root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/favicon.ico b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71 GIT binary patch literal 32038 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 + + + WinExe + net5.0-windows + true + _2CSClientWPF_sample + 2CSClientWPF_sample + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + Always + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln similarity index 93% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index 87b8b2c9b..a58a56287 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml new file mode 100644 index 000000000..a67cfc5f2 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml.cs new file mode 100644 index 000000000..3b8d460e7 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/App.xaml.cs @@ -0,0 +1,38 @@ +//********************************************************************************** +//* サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：App +//* クラス日本語名 ：App.xaml の相互作用ロジック +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Windows; + +using Touryo.Infrastructure.Public.Util; + +namespace _2CSClientWPF_sample +{ + /// App.xaml の相互作用ロジック + public partial class App : Application + { + /// OnStartupイベント + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs new file mode 100644 index 000000000..94cc49389 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Business/LayerB.cs @@ -0,0 +1,848 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using _2CSClientWPF_sample.Dao; +using _2CSClientWPF_sample.Common; + +using System; +using System.Data; + +using Touryo.Infrastructure.Business.RichClient.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Framework.Exceptions; + +namespace _2CSClientWPF_sample.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic2CS + { + #region テンプレ + + /// 業務処理を実装 + /// 引数クラス + private void UOC_メソッド名(TestParameterValue testParameter) + { //メソッド引数にBaseParameterValueの派生の型を定義可能。 + + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + // 個別Dao + LayerD myDao = new LayerD(this.GetDam()); + //myDao.xxxx(testParameter, ref testReturn); + + // 共通Dao + CmnDao cmnDao = new CmnDao(this.GetDam()); + cmnDao.ExecSelectScalar(); + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #region UOCメソッド + + #region SelectCount + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectCount(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.xml"; + break; + } + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecSelectScalar(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D5_SelCnt(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectCount(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DT + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DT(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DT(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DS + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DS(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataSet ds = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 ds + ds = new DataSet(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DS(ds); + + // 戻り値を設定 + testReturn.Obj = ds; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 ds + ds = new DataSet(); + ds.Tables.Add(new DataTable()); + + // 自動生成Daoを実行 + genDao.D2_Select(ds.Tables[0]); + + // 戻り値を設定 + testReturn.Obj = ds; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DS(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DR + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DR(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // 共通Daoを実行 + IDataReader idr = cmnDao.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // DRのI/Fなし + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DR(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DSQL + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DSQL(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.xml"; + break; + } + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + cmnDao.SetUserParameter("COLUMN", " " + orderColumn + " "); + cmnDao.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 自動生成Daoを実行 + testReturn.Obj = dt; + + break; + + //case "generate": // 自動生成Daoを使用する。 + // // 当該SQLなし + // break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DSQL(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Select + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.S2_Select(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Select(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Insert + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + cmnDao.SQLFileName = "ShipperInsert.sql"; + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.CompanyName = testParameter.CompanyName; + genDao.Phone = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D1_Insert(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Insert(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Update + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + genDao.Set_CompanyName_forUPD = testParameter.CompanyName; + genDao.Set_Phone_forUPD = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S3_Update(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Update(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Delete + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S4_Delete(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Delete(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #endregion + + #region ロールバックのテスト + + /// ロールバックのテスト + /// 引数クラス + private void TestRollback(TestParameterValue testParameter) + { + switch ((testParameter.ActionType.Split('%'))[3]) + { + + case "Business": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // 業務例外のスロー + throw new BusinessApplicationException( + "ロールバックのテスト", + "ロールバックのテスト", + "エラー情報"); + //break; // 到達できないためコメントアウト + + case "System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // システム例外のスロー + throw new BusinessSystemException( + "ロールバックのテスト", + "ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外のスロー + throw new Exception("ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other-Business": + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（業務例外へ振り替え）のスロー + throw new Exception("Other-Business"); + //break; // 到達できないためコメントアウト + + case "Other-System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（システム例外へ振り替え）のスロー + throw new Exception("Other-System"); + //break; // 到達できないためコメントアウト + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs new file mode 100644 index 000000000..4f1c1ddc8 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.cs @@ -0,0 +1,60 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace _2CSClientWPF_sample.Common +{ + /// + /// TestParameterValue の概要の説明です + /// + public class TestParameterValue : MyParameterValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + + /// OrderColumn + public string OrderColumn; + + /// OrderSequence + public string OrderSequence; + + #region コンストラクタ + + /// コンストラクタ + public TestParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs new file mode 100644 index 000000000..153b0b211 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.cs @@ -0,0 +1,41 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; + +namespace _2CSClientWPF_sample.Common +{ + /// + /// TestReturnValueの概要の説明です + /// + public class TestReturnValue : MyReturnValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs new file mode 100644 index 000000000..8aeaa4767 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoShippers +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoShippers : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoShippers(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// ShipperID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_ShipperID + { + set + { + this.HtParameter["ShipperID"] = value; + } + get + { + return this.HtParameter["ShipperID"]; + } + } + + + + /// CompanyName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CompanyName + { + set + { + this.HtParameter["CompanyName"] = value; + } + get + { + return this.HtParameter["CompanyName"]; + } + } + + /// Phone列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Phone + { + set + { + this.HtParameter["Phone"] = value; + } + get + { + return this.HtParameter["Phone"]; + } + } + + + /// Set_ShipperID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipperID_forUPD + { + set + { + this.HtParameter["Set_ShipperID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipperID_forUPD"]; + } + } + + + /// Set_CompanyName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CompanyName_forUPD + { + set + { + this.HtParameter["Set_CompanyName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CompanyName_forUPD"]; + } + } + + + /// Set_Phone_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Phone_forUPD + { + set + { + this.HtParameter["Set_Phone_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Phone_forUPD"]; + } + } + + + + /// ShipperID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipperID_Like + { + set + { + this.HtParameter["ShipperID_Like"] = value; + } + get + { + return this.HtParameter["ShipperID_Like"]; + } + } + + + /// CompanyName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CompanyName_Like + { + set + { + this.HtParameter["CompanyName_Like"] = value; + } + get + { + return this.HtParameter["CompanyName_Like"]; + } + } + + + /// Phone_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Phone_Like + { + set + { + this.HtParameter["Phone_Like"] = value; + } + get + { + return this.HtParameter["Phone_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoShippers_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoShippers_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoShippers_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoShippers_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoShippers_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoShippers_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoShippers_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoShippers_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoShippers_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs new file mode 100644 index 000000000..fdcbba207 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Dao/LayerD.cs @@ -0,0 +1,518 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerD +//* クラス日本語名 ：Ｄ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using _2CSClientWPF_sample.Common; + +using System.Data; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace _2CSClientWPF_sample.Dao +{ + /// + /// LayerD の概要の説明です + /// + public class LayerD : MyBaseDao + { + /// + /// コンストラクタ + /// + public LayerD(BaseDam dam) : base(dam) { } + + #region テンプレ + + /// テンプレ + /// 引数クラス + /// 戻り値クラス + public void テンプレ(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + // ● 下記のいづれかの方法でSQLを設定する。 + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ファイル名"); + + // -- 直接指定する場合。 + this.SetSqlByCommand("SQL文"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 追加、更新、削除の場合（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // -- 先頭の１セル分の情報を返すSELECTクエリを実行する場合 + obj = this.ExecSelectScalar(); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データテーブル） + obj = new DataTable(); + this.ExecSelectFill_DT((DataTable)obj); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データセット） + obj = new DataSet(); + this.ExecSelectFill_DS((DataSet)obj); + + // -- データリーダを返す + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 参照系 + + #region 件数取得（SelectCount） + + /// 件数情報を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectCount(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperCount.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperCount.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + object obj; + + // -- 件数情報を返すSELECTクエリを実行する + obj = this.ExecSelectScalar(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 一覧取得（SelectAll） + + /// 一覧を返すSELECTクエリを実行する（DT） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DT(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する（DS） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DS(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 ds + DataSet ds = new DataSet(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DS(ds); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = ds; + } + + /// 一覧を返すSELECTクエリを実行する（DR） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DR(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // -- 一覧を返すSELECTクエリを実行する + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DSQL(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelectOrder.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelectOrder.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + this.SetUserParameter("COLUMN", " " + orderColumn + " "); + this.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + #endregion + + #region 参照 + + /// １レコードを返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Select(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelect.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelect.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- １レコードを返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + //// 戻り値を設定 // 不要 + //testReturn.Obj = dt; + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + } + + #endregion + + #endregion + + #region 更新系 + + #region 追加 + + /// Insertクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Insert(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ShipperInsert.sql"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 追加（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 更新 + + /// Updateクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Update(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperUpdate.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperUpdate.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 更新（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 削除 + + /// Deleteクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Delete(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperDelete.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperDelete.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 削除（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml new file mode 100644 index 000000000..ae67a4dba --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs new file mode 100644 index 000000000..62db7b075 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/Window1.xaml.cs @@ -0,0 +1,642 @@ +//********************************************************************************** +//* サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Window1 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using _2CSClientWPF_sample.Common; +using _2CSClientWPF_sample.Business; + +using System; +using System.Data; +using System.Windows; +using System.Windows.Controls; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Framework.Util; +using Touryo.Infrastructure.Public.Db; + +namespace _2CSClientWPF_sample +{ + /// Window1.xaml の相互作用ロジック（サンプル アプリ画面） + public partial class Window1 : Window + { + /// ユーザ情報 + MyUserInfo myUserInfo; + + #region 初期処理 + + /// コンストラクタ + public Window1() + { + InitializeComponent(); + } + + /// ロード イベント + private void Window_Loaded(object sender, RoutedEventArgs e) + { + // ddlDap + this.ddlDap.Items.Add(new ComboBoxItem("SQL Server / SQL Client", "SQL")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / OLEDB.NET", "OLE")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / ODCB.NET", "ODB")); + this.ddlDap.Items.Add(new ComboBoxItem("Oracle / ODP.NET", "ODP")); + this.ddlDap.Items.Add(new ComboBoxItem("DB2 / DB2.NET", "DB2")); + this.ddlDap.Items.Add(new ComboBoxItem("HiRDB / HiRDB-DP", "HIR")); + this.ddlDap.Items.Add(new ComboBoxItem("MySQL Cnn/NET", "MCN")); + this.ddlDap.Items.Add(new ComboBoxItem("PostgreSQL / Npgsql", "NPS")); + + this.ddlDap.SelectedIndex = 0; + + // ddlMode1 + this.ddlMode1.Items.Add(new ComboBoxItem("個別Ｄａｏ", "individual")); + this.ddlMode1.Items.Add(new ComboBoxItem("共通Ｄａｏ", "common")); + this.ddlMode1.Items.Add(new ComboBoxItem("自動生成Ｄａｏ（更新のみ）", "generate")); + this.ddlMode1.SelectedIndex = 0; + + // ddlMode2 + this.ddlMode2.Items.Add(new ComboBoxItem("静的クエリ", "static")); + this.ddlMode2.Items.Add(new ComboBoxItem("動的クエリ", "dynamic")); + this.ddlMode2.SelectedIndex = 0; + + // ddlIso + this.ddlIso.Items.Add(new ComboBoxItem("ノットコネクト", "NC")); + this.ddlIso.Items.Add(new ComboBoxItem("ノートランザクション", "NT")); + this.ddlIso.Items.Add(new ComboBoxItem("ダーティリード", "RU")); + this.ddlIso.Items.Add(new ComboBoxItem("リードコミット", "RC")); + this.ddlIso.Items.Add(new ComboBoxItem("リピータブルリード", "RR")); + this.ddlIso.Items.Add(new ComboBoxItem("シリアライザブル", "SZ")); + this.ddlIso.Items.Add(new ComboBoxItem("スナップショット", "SS")); + this.ddlIso.Items.Add(new ComboBoxItem("デフォルト", "DF")); + this.ddlIso.SelectedIndex = 1; + + // ddlExRollback + this.ddlExRollback.Items.Add(new ComboBoxItem("正常時", "-")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外", "Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外", "System")); + this.ddlExRollback.Items.Add(new ComboBoxItem("その他、一般的な例外", "Other")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外への振替", "Other-Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外への振替", "Other-System")); + this.ddlExRollback.SelectedIndex = 0; + + // ddlOrderColumn + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c1", "c1")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c2", "c2")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c3", "c3")); + this.ddlOrderColumn.SelectedIndex = 0; + + // ddlOrderSequence + this.ddlOrderSequence.Items.Add(new ComboBoxItem("ASC", "A")); + this.ddlOrderSequence.Items.Add(new ComboBoxItem("DESC", "D")); + this.ddlOrderSequence.SelectedIndex = 0; + + // ユーザ情報 + this.myUserInfo = new MyUserInfo("userName", Environment.MachineName); + } + + #region コンボボックス用 + + /// コンボボックス用インナークラス + private class ComboBoxItem + { + /// 表示名 + private string m_name = ""; + + /// 値 + private string m_value = ""; + + /// コンストラクタ + public ComboBoxItem(string name, string value) + { + m_name = name; + m_value = value; + } + + /// 表示名 + public string Name + { + get + { + return m_name; + } + } + + /// 値 + public string Value + { + get + { + return m_value; + } + } + + /// + /// オーバーライドしたメソッド + /// これがコンボボックスに表示される + /// + public override string ToString() + { + return m_name; + } + } + + #endregion + + #endregion + + #region ＣＲＵＤ処理メソッド + + #region 参照系 + + /// 件数取得 + private void button1_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectCount", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + } + + /// 一覧取得（dt） + private void button2_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DT", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridControl1.Columns.Clear(); + this.dataGridControl1.DataContext = testReturnValue.Obj; + } + } + + /// 一覧取得（ds） + private void button3_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DS", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridControl1.Columns.Clear(); + this.dataGridControl1.DataContext = ((DataSet)testReturnValue.Obj).Tables[0]; + } + } + + /// 一覧取得（dr） + private void button4_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DR", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridControl1.Columns.Clear(); + this.dataGridControl1.DataContext = testReturnValue.Obj; + } + } + + /// 一覧取得（動的sql） + private void button5_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DSQL", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = ((ComboBoxItem)this.ddlOrderColumn.SelectedItem).Value; + testParameterValue.OrderSequence = ((ComboBoxItem)this.ddlOrderSequence.SelectedItem).Value; + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridControl1.Columns.Clear(); + this.dataGridControl1.DataContext = testReturnValue.Obj; + } + } + + /// 参照処理 + private void button6_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Select", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.textBox1.Text = testReturnValue.ShipperID.ToString(); + this.textBox2.Text = testReturnValue.CompanyName; + this.textBox3.Text = testReturnValue.Phone; + } + } + + #endregion + + #region 更新系 + + /// 追加処理 + private void button7_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Insert", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件追加"; + } + } + + /// 更新処理 + private void button8_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Update", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件更新"; + } + } + + /// 削除処理 + private void button9_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Delete", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(textBox1.Text); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件削除"; + } + } + + #endregion + + #endregion + + #region その他 + + /// クリア + private void button10_Click(object sender, RoutedEventArgs e) + { + this.dataGridControl1.Columns.Clear(); + this.dataGridControl1.DataContext = null; + } + + /// メッセージ取得（埋め込まれたリソース対応） + private void button11_Click(object sender, RoutedEventArgs e) + { + this.textBox5.Text = GetMessage.GetMessageDescription(this.textBox4.Text); + } + + /// 共有情報取得（埋め込まれたリソース対応） + private void button12_Click(object sender, RoutedEventArgs e) + { + this.textBox7.Text = GetSharedProperty.GetSharedPropertyValue(this.textBox6.Text); + } + + #endregion + + #region 分離レベルの設定メソッド + + /// 分離レベルの設定 + private DbEnum.IsolationLevelEnum SelectIsolationLevel() + { + if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "NC") + { + return DbEnum.IsolationLevelEnum.NotConnect; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "NT") + { + return DbEnum.IsolationLevelEnum.NoTransaction; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "RU") + { + return DbEnum.IsolationLevelEnum.ReadUncommitted; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "RC") + { + return DbEnum.IsolationLevelEnum.ReadCommitted; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "RR") + { + return DbEnum.IsolationLevelEnum.RepeatableRead; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "SZ") + { + return DbEnum.IsolationLevelEnum.Serializable; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "SS") + { + return DbEnum.IsolationLevelEnum.Snapshot; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "DF") + { + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + else + { + throw new Exception("分離レベルの設定がおかしい"); + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json new file mode 100644 index 000000000..11f861805 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json @@ -0,0 +1,59 @@ +{ + // 2層C/S用（WPF） + // connectionStrings section + "connectionStrings": { + // SQL Server / SQL Client用 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + // Multi-DB / ODCB.NET用 + "ConnectionString_ODBC": "Dsn=odbc_test1", + // Oracle / ODP.NET用 + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + // MySQL / MySQL Connector/NET用 + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + // PostgreSQL / Npgsql用 + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + + // appSettings section + "appSettings": { + + // フレームワークの使用するパラメータ - start + // コントロールのプレフィックス + "FxPrefixOfButton": "btn", + "FxPrefixOfPictureBox": "pbx", + "FxPrefixOfComboBox": "cbb", + "FxPrefixOfListBox": "lbx", + "FxPrefixOfRadioButton": "rbn", + // リソース ファイルの場合 + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + // 埋め込まれたリソースの場合 + // "FxXMLMSGDefinition": "_2CSClientWPF_sample.MSGDefinition.xml", + // "FxXMLSPDefinition": "_2CSClientWPF_sample.SPDefinition.xml", + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + // "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // 埋め込まれたリソースの場合 + "FxLog4NetConfFile": "_2CSClientWPF_sample.SampleLogConf2CS.xml", + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "C:/root/files/resource/Sql", + // コントロールのプレフィックス（追加分） + "FxPrefixOfCheckBox": "cbx" + // アプリケーションの使用するパラメータ - end + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj new file mode 100644 index 000000000..1e42c74f5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj @@ -0,0 +1,60 @@ + + + + WinExe + net5.0-windows + true + + + _2CSClientWin_sample + 2CSClientWin_sample + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + Always + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln new file mode 100644 index 000000000..37733c8b7 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Business/LayerB.cs new file mode 100644 index 000000000..e820f4ad0 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Business/LayerB.cs @@ -0,0 +1,847 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using _2CSClientWin_sample.Common; +using _2CSClientWin_sample.Dao; + +using System; +using System.Data; + +using Touryo.Infrastructure.Business.RichClient.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Framework.Exceptions; + +namespace _2CSClientWin_sample.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic2CS + { + #region テンプレ + + /// 業務処理を実装 + /// 引数クラス + private void UOC_メソッド名(TestParameterValue testParameter) + { //メソッド引数にBaseParameterValueの派生の型を定義可能。 + + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + // 個別Dao + LayerD myDao = new LayerD(this.GetDam()); + //myDao.xxxx(testParameter, ref testReturn); + + // 共通Dao + CmnDao cmnDao = new CmnDao(this.GetDam()); + cmnDao.ExecSelectScalar(); + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #region UOCメソッド + + #region SelectCount + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectCount(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.xml"; + break; + } + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecSelectScalar(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D5_SelCnt(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectCount(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DT + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DT(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DT(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DS + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DS(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataSet ds = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 ds + ds = new DataSet(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DS(ds); + + // 戻り値を設定 + testReturn.Obj = ds; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 ds + ds = new DataSet(); + ds.Tables.Add(new DataTable()); + + // 自動生成Daoを実行 + genDao.D2_Select(ds.Tables[0]); + + // 戻り値を設定 + testReturn.Obj = ds; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DS(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DR + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DR(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // 共通Daoを実行 + IDataReader idr = cmnDao.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // DRのI/Fなし + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DR(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DSQL + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DSQL(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.xml"; + break; + } + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + cmnDao.SetUserParameter("COLUMN", " " + orderColumn + " "); + cmnDao.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 自動生成Daoを実行 + testReturn.Obj = dt; + + break; + + //case "generate": // 自動生成Daoを使用する。 + // // 当該SQLなし + // break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DSQL(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Select + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.S2_Select(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Select(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Insert + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + cmnDao.SQLFileName = "ShipperInsert.sql"; + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.CompanyName = testParameter.CompanyName; + genDao.Phone = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D1_Insert(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Insert(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Update + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + genDao.Set_CompanyName_forUPD = testParameter.CompanyName; + genDao.Set_Phone_forUPD = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S3_Update(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Update(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Delete + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S4_Delete(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Delete(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #endregion + + #region ロールバックのテスト + + /// ロールバックのテスト + /// 引数クラス + private void TestRollback(TestParameterValue testParameter) + { + switch ((testParameter.ActionType.Split('%'))[3]) + { + + case "Business": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // 業務例外のスロー + throw new BusinessApplicationException( + "ロールバックのテスト", + "ロールバックのテスト", + "エラー情報"); + //break; // 到達できないためコメントアウト + + case "System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // システム例外のスロー + throw new BusinessSystemException( + "ロールバックのテスト", + "ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外のスロー + throw new Exception("ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other-Business": + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（業務例外へ振り替え）のスロー + throw new Exception("Other-Business"); + //break; // 到達できないためコメントアウト + + case "Other-System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（システム例外へ振り替え）のスロー + throw new Exception("Other-System"); + //break; // 到達できないためコメントアウト + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs new file mode 100644 index 000000000..1596622df --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.cs @@ -0,0 +1,59 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace _2CSClientWin_sample.Common +{ + /// + /// TestParameterValue の概要の説明です + /// + public class TestParameterValue : MyParameterValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + + /// OrderColumn + public string OrderColumn; + + /// OrderSequence + public string OrderSequence; + + #region コンストラクタ + + /// コンストラクタ + public TestParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs new file mode 100644 index 000000000..98ff13d24 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.cs @@ -0,0 +1,41 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; + +namespace _2CSClientWin_sample.Common +{ + /// + /// TestReturnValueの概要の説明です + /// + public class TestReturnValue : MyReturnValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs new file mode 100644 index 000000000..8aeaa4767 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoShippers +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoShippers : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoShippers(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// ShipperID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_ShipperID + { + set + { + this.HtParameter["ShipperID"] = value; + } + get + { + return this.HtParameter["ShipperID"]; + } + } + + + + /// CompanyName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CompanyName + { + set + { + this.HtParameter["CompanyName"] = value; + } + get + { + return this.HtParameter["CompanyName"]; + } + } + + /// Phone列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Phone + { + set + { + this.HtParameter["Phone"] = value; + } + get + { + return this.HtParameter["Phone"]; + } + } + + + /// Set_ShipperID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipperID_forUPD + { + set + { + this.HtParameter["Set_ShipperID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipperID_forUPD"]; + } + } + + + /// Set_CompanyName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CompanyName_forUPD + { + set + { + this.HtParameter["Set_CompanyName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CompanyName_forUPD"]; + } + } + + + /// Set_Phone_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Phone_forUPD + { + set + { + this.HtParameter["Set_Phone_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Phone_forUPD"]; + } + } + + + + /// ShipperID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipperID_Like + { + set + { + this.HtParameter["ShipperID_Like"] = value; + } + get + { + return this.HtParameter["ShipperID_Like"]; + } + } + + + /// CompanyName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CompanyName_Like + { + set + { + this.HtParameter["CompanyName_Like"] = value; + } + get + { + return this.HtParameter["CompanyName_Like"]; + } + } + + + /// Phone_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Phone_Like + { + set + { + this.HtParameter["Phone_Like"] = value; + } + get + { + return this.HtParameter["Phone_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoShippers_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoShippers_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoShippers_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoShippers_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoShippers_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoShippers_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoShippers_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoShippers_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoShippers_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs new file mode 100644 index 000000000..b79b35e0b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Dao/LayerD.cs @@ -0,0 +1,517 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerD +//* クラス日本語名 ：Ｄ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using _2CSClientWin_sample.Common; + +using System.Data; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace _2CSClientWin_sample.Dao +{ + /// + /// LayerD の概要の説明です + /// + public class LayerD : MyBaseDao + { + /// + /// コンストラクタ + /// + public LayerD(BaseDam dam) : base(dam) { } + + #region テンプレ + + /// テンプレ + /// 引数クラス + /// 戻り値クラス + public void テンプレ(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + // ● 下記のいづれかの方法でSQLを設定する。 + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ファイル名"); + + // -- 直接指定する場合。 + this.SetSqlByCommand("SQL文"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 追加、更新、削除の場合（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // -- 先頭の１セル分の情報を返すSELECTクエリを実行する場合 + obj = this.ExecSelectScalar(); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データテーブル） + obj = new DataTable(); + this.ExecSelectFill_DT((DataTable)obj); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データセット） + obj = new DataSet(); + this.ExecSelectFill_DS((DataSet)obj); + + // -- データリーダを返す + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 参照系 + + #region 件数取得（SelectCount） + + /// 件数情報を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectCount(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperCount.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperCount.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + object obj; + + // -- 件数情報を返すSELECTクエリを実行する + obj = this.ExecSelectScalar(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 一覧取得（SelectAll） + + /// 一覧を返すSELECTクエリを実行する（DT） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DT(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する（DS） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DS(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 ds + DataSet ds = new DataSet(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DS(ds); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = ds; + } + + /// 一覧を返すSELECTクエリを実行する（DR） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DR(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // -- 一覧を返すSELECTクエリを実行する + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DSQL(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelectOrder.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelectOrder.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + this.SetUserParameter("COLUMN", " " + orderColumn + " "); + this.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + #endregion + + #region 参照 + + /// １レコードを返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Select(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelect.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelect.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- １レコードを返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + //// 戻り値を設定 // 不要 + //testReturn.Obj = dt; + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + } + + #endregion + + #endregion + + #region 更新系 + + #region 追加 + + /// Insertクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Insert(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ShipperInsert.sql"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 追加（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 更新 + + /// Updateクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Update(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperUpdate.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperUpdate.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 更新（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 削除 + + /// Deleteクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Delete(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperDelete.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperDelete.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 削除（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.Designer.cs new file mode 100644 index 000000000..33fc4eff3 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.Designer.cs @@ -0,0 +1,425 @@ +namespace _2CSClientWin_sample +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + this.ddlDap = new System.Windows.Forms.ComboBox(); + this.ddlMode1 = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.ddlMode2 = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.ddlIso = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.ddlExRollback = new System.Windows.Forms.ComboBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.ddlOrderColumn = new System.Windows.Forms.ComboBox(); + this.label10 = new System.Windows.Forms.Label(); + this.ddlOrderSequence = new System.Windows.Forms.ComboBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.btnButton1 = new System.Windows.Forms.Button(); + this.btnButton2 = new System.Windows.Forms.Button(); + this.btnButton3 = new System.Windows.Forms.Button(); + this.btnButton4 = new System.Windows.Forms.Button(); + this.btnButton5 = new System.Windows.Forms.Button(); + this.btnButton6 = new System.Windows.Forms.Button(); + this.btnButton7 = new System.Windows.Forms.Button(); + this.btnButton8 = new System.Windows.Forms.Button(); + this.btnButton9 = new System.Windows.Forms.Button(); + this.btnButton10 = new System.Windows.Forms.Button(); + this.labelMessage = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.btnButton12 = new System.Windows.Forms.Button(); + this.label15 = new System.Windows.Forms.Label(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.btnButton11 = new System.Windows.Forms.Button(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // ddlDap + // + this.ddlDap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlDap.FormattingEnabled = true; + resources.ApplyResources(this.ddlDap, "ddlDap"); + this.ddlDap.Name = "ddlDap"; + // + // ddlMode1 + // + this.ddlMode1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlMode1.FormattingEnabled = true; + resources.ApplyResources(this.ddlMode1, "ddlMode1"); + this.ddlMode1.Name = "ddlMode1"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // ddlMode2 + // + this.ddlMode2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlMode2.FormattingEnabled = true; + resources.ApplyResources(this.ddlMode2, "ddlMode2"); + this.ddlMode2.Name = "ddlMode2"; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // ddlIso + // + this.ddlIso.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlIso.FormattingEnabled = true; + resources.ApplyResources(this.ddlIso, "ddlIso"); + this.ddlIso.Name = "ddlIso"; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // ddlExRollback + // + this.ddlExRollback.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlExRollback.FormattingEnabled = true; + resources.ApplyResources(this.ddlExRollback, "ddlExRollback"); + this.ddlExRollback.Name = "ddlExRollback"; + // + // textBox1 + // + resources.ApplyResources(this.textBox1, "textBox1"); + this.textBox1.Name = "textBox1"; + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.Name = "label8"; + // + // textBox2 + // + resources.ApplyResources(this.textBox2, "textBox2"); + this.textBox2.Name = "textBox2"; + // + // textBox3 + // + resources.ApplyResources(this.textBox3, "textBox3"); + this.textBox3.Name = "textBox3"; + // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.Name = "label9"; + // + // ddlOrderColumn + // + this.ddlOrderColumn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlOrderColumn.FormattingEnabled = true; + resources.ApplyResources(this.ddlOrderColumn, "ddlOrderColumn"); + this.ddlOrderColumn.Name = "ddlOrderColumn"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // ddlOrderSequence + // + this.ddlOrderSequence.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlOrderSequence.FormattingEnabled = true; + resources.ApplyResources(this.ddlOrderSequence, "ddlOrderSequence"); + this.ddlOrderSequence.Name = "ddlOrderSequence"; + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + resources.ApplyResources(this.dataGridView1, "dataGridView1"); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 21; + // + // btnButton1 + // + resources.ApplyResources(this.btnButton1, "btnButton1"); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // btnButton2 + // + resources.ApplyResources(this.btnButton2, "btnButton2"); + this.btnButton2.Name = "btnButton2"; + this.btnButton2.UseVisualStyleBackColor = true; + // + // btnButton3 + // + resources.ApplyResources(this.btnButton3, "btnButton3"); + this.btnButton3.Name = "btnButton3"; + this.btnButton3.UseVisualStyleBackColor = true; + // + // btnButton4 + // + resources.ApplyResources(this.btnButton4, "btnButton4"); + this.btnButton4.Name = "btnButton4"; + this.btnButton4.UseVisualStyleBackColor = true; + // + // btnButton5 + // + resources.ApplyResources(this.btnButton5, "btnButton5"); + this.btnButton5.Name = "btnButton5"; + this.btnButton5.UseVisualStyleBackColor = true; + // + // btnButton6 + // + resources.ApplyResources(this.btnButton6, "btnButton6"); + this.btnButton6.Name = "btnButton6"; + this.btnButton6.UseVisualStyleBackColor = true; + // + // btnButton7 + // + resources.ApplyResources(this.btnButton7, "btnButton7"); + this.btnButton7.Name = "btnButton7"; + this.btnButton7.UseVisualStyleBackColor = true; + // + // btnButton8 + // + resources.ApplyResources(this.btnButton8, "btnButton8"); + this.btnButton8.Name = "btnButton8"; + this.btnButton8.UseVisualStyleBackColor = true; + // + // btnButton9 + // + resources.ApplyResources(this.btnButton9, "btnButton9"); + this.btnButton9.Name = "btnButton9"; + this.btnButton9.UseVisualStyleBackColor = true; + // + // btnButton10 + // + resources.ApplyResources(this.btnButton10, "btnButton10"); + this.btnButton10.Name = "btnButton10"; + this.btnButton10.UseVisualStyleBackColor = true; + // + // labelMessage + // + resources.ApplyResources(this.labelMessage, "labelMessage"); + this.labelMessage.Name = "labelMessage"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // label16 + // + resources.ApplyResources(this.label16, "label16"); + this.label16.Name = "label16"; + // + // textBox7 + // + resources.ApplyResources(this.textBox7, "textBox7"); + this.textBox7.Name = "textBox7"; + // + // btnButton12 + // + resources.ApplyResources(this.btnButton12, "btnButton12"); + this.btnButton12.Name = "btnButton12"; + this.btnButton12.UseVisualStyleBackColor = true; + // + // label15 + // + resources.ApplyResources(this.label15, "label15"); + this.label15.Name = "label15"; + // + // textBox6 + // + resources.ApplyResources(this.textBox6, "textBox6"); + this.textBox6.Name = "textBox6"; + // + // label14 + // + resources.ApplyResources(this.label14, "label14"); + this.label14.Name = "label14"; + // + // textBox5 + // + resources.ApplyResources(this.textBox5, "textBox5"); + this.textBox5.Name = "textBox5"; + // + // btnButton11 + // + resources.ApplyResources(this.btnButton11, "btnButton11"); + this.btnButton11.Name = "btnButton11"; + this.btnButton11.UseVisualStyleBackColor = true; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // + // textBox4 + // + resources.ApplyResources(this.textBox4, "textBox4"); + this.textBox4.Name = "textBox4"; + // + // Form1 + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label16); + this.Controls.Add(this.textBox7); + this.Controls.Add(this.btnButton12); + this.Controls.Add(this.label15); + this.Controls.Add(this.textBox6); + this.Controls.Add(this.label14); + this.Controls.Add(this.textBox5); + this.Controls.Add(this.btnButton11); + this.Controls.Add(this.label13); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.label11); + this.Controls.Add(this.labelMessage); + this.Controls.Add(this.btnButton10); + this.Controls.Add(this.btnButton9); + this.Controls.Add(this.btnButton8); + this.Controls.Add(this.btnButton7); + this.Controls.Add(this.btnButton6); + this.Controls.Add(this.btnButton5); + this.Controls.Add(this.btnButton4); + this.Controls.Add(this.btnButton3); + this.Controls.Add(this.btnButton2); + this.Controls.Add(this.btnButton1); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.label10); + this.Controls.Add(this.ddlOrderSequence); + this.Controls.Add(this.label9); + this.Controls.Add(this.ddlOrderColumn); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.label8); + this.Controls.Add(this.label7); + this.Controls.Add(this.label6); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.label5); + this.Controls.Add(this.ddlExRollback); + this.Controls.Add(this.label4); + this.Controls.Add(this.ddlIso); + this.Controls.Add(this.label3); + this.Controls.Add(this.ddlMode2); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.ddlMode1); + this.Controls.Add(this.ddlDap); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "Form1"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.ComboBox ddlDap; + private System.Windows.Forms.ComboBox ddlMode1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox ddlMode2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox ddlIso; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox ddlExRollback; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.ComboBox ddlOrderColumn; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.ComboBox ddlOrderSequence; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.Button btnButton2; + private System.Windows.Forms.Button btnButton3; + private System.Windows.Forms.Button btnButton4; + private System.Windows.Forms.Button btnButton5; + private System.Windows.Forms.Button btnButton6; + private System.Windows.Forms.Button btnButton7; + private System.Windows.Forms.Button btnButton8; + private System.Windows.Forms.Button btnButton9; + private System.Windows.Forms.Button btnButton10; + private System.Windows.Forms.Label labelMessage; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.Button btnButton12; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Button btnButton11; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox textBox4; + } +} + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.cs new file mode 100644 index 000000000..8d3d4722d --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.cs @@ -0,0 +1,648 @@ +//********************************************************************************** +//* サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using _2CSClientWin_sample.Business; +using _2CSClientWin_sample.Common; + +using System; +using System.Data; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Presentation; +using Touryo.Infrastructure.Framework.Util; +using Touryo.Infrastructure.Public.Db; + +namespace _2CSClientWin_sample +{ + /// サンプル アプリ画面 + public partial class Form1 : MyBaseControllerWin + { + + #region 初期処理 + + /// コンストラクタ + public Form1() + { + InitializeComponent(); + } + + /// + /// フォームロードのUOCメソッド（個別） + /// + protected override void UOC_FormInit() + { + // フォーム初期化（初回ロード）時に実行する処理を実装する + + // TODO: + + // ddlDap + this.ddlDap.Items.Add(new ComboBoxItem("SQL Server / SQL Client", "SQL")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / OLEDB.NET", "OLE")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / ODCB.NET", "ODB")); + this.ddlDap.Items.Add(new ComboBoxItem("Oracle / ODP.NET", "ODP")); + this.ddlDap.Items.Add(new ComboBoxItem("DB2 / DB2.NET", "DB2")); + this.ddlDap.Items.Add(new ComboBoxItem("HiRDB / HiRDB-DP", "HIR")); + this.ddlDap.Items.Add(new ComboBoxItem("MySQL Cnn/NET", "MCN")); + this.ddlDap.Items.Add(new ComboBoxItem("PostgreSQL / Npgsql", "NPS")); + this.ddlDap.SelectedIndex = 0; + + // ddlMode1 + this.ddlMode1.Items.Add(new ComboBoxItem("個別Ｄａｏ", "individual")); + this.ddlMode1.Items.Add(new ComboBoxItem("共通Ｄａｏ", "common")); + this.ddlMode1.Items.Add(new ComboBoxItem("自動生成Ｄａｏ（更新のみ）", "generate")); + this.ddlMode1.SelectedIndex = 0; + + // ddlMode2 + this.ddlMode2.Items.Add(new ComboBoxItem("静的クエリ", "static")); + this.ddlMode2.Items.Add(new ComboBoxItem("動的クエリ", "dynamic")); + this.ddlMode2.SelectedIndex = 0; + + // ddlIso + this.ddlIso.Items.Add(new ComboBoxItem("ノットコネクト", "NC")); + this.ddlIso.Items.Add(new ComboBoxItem("ノートランザクション", "NT")); + this.ddlIso.Items.Add(new ComboBoxItem("ダーティリード", "RU")); + this.ddlIso.Items.Add(new ComboBoxItem("リードコミット", "RC")); + this.ddlIso.Items.Add(new ComboBoxItem("リピータブルリード", "RR")); + this.ddlIso.Items.Add(new ComboBoxItem("シリアライザブル", "SZ")); + this.ddlIso.Items.Add(new ComboBoxItem("スナップショット", "SS")); + this.ddlIso.Items.Add(new ComboBoxItem("デフォルト", "DF")); + this.ddlIso.SelectedIndex = 1; + + // ddlExRollback + this.ddlExRollback.Items.Add(new ComboBoxItem("正常時", "-")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外", "Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外", "System")); + this.ddlExRollback.Items.Add(new ComboBoxItem("その他、一般的な例外", "Other")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外への振替", "Other-Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外への振替", "Other-System")); + this.ddlExRollback.SelectedIndex = 0; + + // ddlOrderColumn + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c1", "c1")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c2", "c2")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c3", "c3")); + this.ddlOrderColumn.SelectedIndex = 0; + + // ddlOrderSequence + this.ddlOrderSequence.Items.Add(new ComboBoxItem("ASC", "A")); + this.ddlOrderSequence.Items.Add(new ComboBoxItem("DESC", "D")); + this.ddlOrderSequence.SelectedIndex = 0; + } + + #region コンボボックス用 + + /// コンボボックス用インナークラス + private class ComboBoxItem + { + /// 表示名 + private string m_name = ""; + + /// 値 + private string m_value = ""; + + /// コンストラクタ + public ComboBoxItem(string name, string value) + { + m_name = name; + m_value = value; + } + + /// 表示名 + public string Name + { + get + { + return m_name; + } + } + + /// 値 + public string Value + { + get + { + return m_value; + } + } + + /// + /// オーバーライドしたメソッド + /// これがコンボボックスに表示される + /// + public override string ToString() + { + return m_name; + } + } + + #endregion + + #endregion + + #region ＣＲＵＤ処理メソッド + + #region 参照系 + + /// 件数取得 + /// イベントハンドラの共通引数 + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectCount", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Text = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + } + + /// 一覧取得（dt） + /// イベントハンドラの共通引数 + protected void UOC_btnButton2_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DT", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = testReturnValue.Obj; + } + } + + /// 一覧取得（ds） + /// イベントハンドラの共通引数 + protected void UOC_btnButton3_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DS", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = ((DataSet)testReturnValue.Obj).Tables[0]; + } + } + + /// 一覧取得（dr） + /// イベントハンドラの共通引数 + protected void UOC_btnButton4_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DR", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = testReturnValue.Obj; + } + } + + /// 一覧取得（動的sql） + /// イベントハンドラの共通引数 + protected void UOC_btnButton5_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DSQL", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = ((ComboBoxItem)this.ddlOrderColumn.SelectedItem).Value; + testParameterValue.OrderSequence = ((ComboBoxItem)this.ddlOrderSequence.SelectedItem).Value; + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = testReturnValue.Obj; + } + } + + /// 参照処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton6_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Select", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.textBox1.Text = testReturnValue.ShipperID.ToString(); + this.textBox2.Text = testReturnValue.CompanyName; + this.textBox3.Text = testReturnValue.Phone; + } + } + + #endregion + + #region 更新系 + + /// 追加処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton7_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Insert", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Text = testReturnValue.Obj.ToString() + "件追加"; + } + } + + /// 更新処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton8_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Update", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Text = testReturnValue.Obj.ToString() + "件更新"; + } + } + + /// 削除処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton9_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Delete", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(textBox1.Text); + + // 戻り値 + TestReturnValue testReturnValue; + + // 分離レベルの設定 + DbEnum.IsolationLevelEnum iso = this.SelectIsolationLevel(); + + // Ｂ層呼出し＋都度コミット + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, iso); + LayerB.CommitAndClose(); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Text = testReturnValue.Obj.ToString() + "件削除"; + } + } + + #endregion + + #endregion + + #region その他 + + /// クリア + /// イベントハンドラの共通引数 + protected void UOC_btnButton10_Click(RcFxEventArgs rcFxEventArgs) + { + this.dataGridView1.DataSource = null; + } + + /// メッセージ取得（埋め込まれたリソース対応） + /// イベントハンドラの共通引数 + protected void UOC_btnButton11_Click(RcFxEventArgs rcFxEventArgs) + { + this.textBox5.Text = GetMessage.GetMessageDescription(this.textBox4.Text); + } + + /// 共有情報取得（埋め込まれたリソース対応） + /// イベントハンドラの共通引数 + protected void UOC_btnButton12_Click(RcFxEventArgs rcFxEventArgs) + { + this.textBox7.Text = GetSharedProperty.GetSharedPropertyValue(this.textBox6.Text); + } + + #endregion + + #region 分離レベルの設定メソッド + + /// 分離レベルの設定 + private DbEnum.IsolationLevelEnum SelectIsolationLevel() + { + if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "NC") + { + return DbEnum.IsolationLevelEnum.NotConnect; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "NT") + { + return DbEnum.IsolationLevelEnum.NoTransaction; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "RU") + { + return DbEnum.IsolationLevelEnum.ReadUncommitted; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "RC") + { + return DbEnum.IsolationLevelEnum.ReadCommitted; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "RR") + { + return DbEnum.IsolationLevelEnum.RepeatableRead; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "SZ") + { + return DbEnum.IsolationLevelEnum.Serializable; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "SS") + { + return DbEnum.IsolationLevelEnum.Snapshot; + } + else if (((ComboBoxItem)this.ddlIso.SelectedItem).Value == "DF") + { + return DbEnum.IsolationLevelEnum.DefaultTransaction; + } + else + { + throw new Exception("分離レベルの設定がおかしい"); + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.resx new file mode 100644 index 000000000..cda82aece --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Form1.resx @@ -0,0 +1,1194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 12, 27 + + + 250, 20 + + + + 1 + + + ddlDap + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 42 + + + 12, 65 + + + 250, 20 + + + 2 + + + ddlMode1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 41 + + + True + + + 12, 12 + + + 237, 12 + + + 3 + + + データアクセス制御クラス（データプロバイダ）を選択 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 40 + + + True + + + 10, 50 + + + 151, 12 + + + 4 + + + 個別、共通のＤａｏ種別を選択 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 39 + + + True + + + 10, 88 + + + 252, 12 + + + 6 + + + 静的、動的のクエリ モードを選択（共通Dao選択時） + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 37 + + + 12, 103 + + + 250, 20 + + + 5 + + + ddlMode2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 38 + + + True + + + 10, 126 + + + 91, 12 + + + 8 + + + 分離レベルを選択 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 35 + + + 12, 141 + + + 250, 20 + + + 7 + + + ddlIso + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 36 + + + True + + + 10, 164 + + + 258, 12 + + + 10 + + + コミット、ロールバックを設定（例外発生時、ロールバック + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 33 + + + 12, 179 + + + 250, 20 + + + 9 + + + ddlExRollback + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 34 + + + 110, 229 + + + 152, 19 + + + 11 + + + textBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 32 + + + True + + + 10, 232 + + + 60, 12 + + + 12 + + + ShipperID： + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 31 + + + True + + + 10, 252 + + + 87, 12 + + + 13 + + + CompanyName： + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 30 + + + True + + + 10, 273 + + + 42, 12 + + + 14 + + + Phone： + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 29 + + + 110, 249 + + + 152, 19 + + + 15 + + + textBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 28 + + + 110, 270 + + + 152, 19 + + + 16 + + + textBox3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + True + + + 10, 316 + + + 84, 12 + + + 18 + + + 並び替え対象列 + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + 12, 331 + + + 250, 20 + + + 17 + + + ddlOrderColumn + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + True + + + 10, 358 + + + 59, 12 + + + 20 + + + 昇順・降順 + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + 12, 373 + + + 250, 20 + + + 19 + + + ddlOrderSequence + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + 274, 12 + + + 464, 358 + + + 21 + + + dataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 22 + + + 12, 444 + + + 140, 23 + + + 22 + + + 件数取得 + + + btnButton1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + 158, 444 + + + 140, 23 + + + 23 + + + 一覧取得（dt） + + + btnButton2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 304, 444 + + + 140, 23 + + + 24 + + + 一覧取得（ds） + + + btnButton3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + 450, 444 + + + 140, 23 + + + 25 + + + 一覧取得（dr） + + + btnButton4 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + 596, 444 + + + 140, 23 + + + 26 + + + 一覧取得（動的SQL） + + + btnButton5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + 12, 473 + + + 140, 23 + + + 27 + + + 一件参照 + + + btnButton6 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + 158, 473 + + + 140, 23 + + + 28 + + + 追加 + + + btnButton7 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + 304, 473 + + + 140, 23 + + + 29 + + + 更新 + + + btnButton8 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + 450, 473 + + + 140, 23 + + + 30 + + + 削除 + + + btnButton9 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + 274, 376 + + + 464, 23 + + + 34 + + + クリア + + + btnButton10 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 108, 409 + + + 23, 12 + + + 35 + + + *** + + + labelMessage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + True + + + 10, 409 + + + 59, 12 + + + 36 + + + 処理結果： + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + + NoControl + + + 237, 540 + + + 23, 12 + + + 91 + + + 値： + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 299, 537 + + + 439, 19 + + + 89 + + + textBox7 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 189, 535 + + + 42, 23 + + + 88 + + + → + + + btnButton12 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + NoControl + + + 10, 540 + + + 31, 12 + + + 90 + + + キー： + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 83, 537 + + + 100, 19 + + + 87 + + + textBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + NoControl + + + 237, 515 + + + 56, 12 + + + 86 + + + メッセージ： + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 299, 512 + + + 439, 19 + + + 84 + + + textBox5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + NoControl + + + 189, 510 + + + 42, 23 + + + 83 + + + → + + + btnButton11 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + True + + + NoControl + + + 10, 515 + + + 67, 12 + + + 85 + + + メッセージID： + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 83, 512 + + + 100, 19 + + + 82 + + + textBox4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + True + + + 6, 12 + + + 750, 565 + + + Form1 + + + Form1 + + + Touryo.Infrastructure.Business.RichClient.Presentation.MyBaseControllerWin, Business.RichClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.Designer.cs new file mode 100644 index 000000000..8a9591a4b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.Designer.cs @@ -0,0 +1,81 @@ +namespace _2CSClientWin_sample +{ + partial class Login + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnButton1 = new System.Windows.Forms.Button(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // btnButton1 + // + this.btnButton1.Location = new System.Drawing.Point(118, 12); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.Size = new System.Drawing.Size(75, 44); + this.btnButton1.TabIndex = 2; + this.btnButton1.Text = "ログイン"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 12); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(100, 19); + this.textBox1.TabIndex = 0; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(12, 37); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(100, 19); + this.textBox2.TabIndex = 1; + this.textBox2.UseSystemPasswordChar = true; + // + // Login + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(202, 70); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.btnButton1); + this.Name = "Login"; + this.Text = "login"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.cs new file mode 100644 index 000000000..9634e7d84 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.cs @@ -0,0 +1,53 @@ +//********************************************************************************** +//* サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：login +//* クラス日本語名 ：ログイン画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace _2CSClientWin_sample +{ + /// login + public partial class Login : MyBaseControllerWin + { + /// コンストラクタ + public Login() + { + InitializeComponent(); + + Program.FlagEnd = true; //フラグ初期化 + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + } + + /// ログイン + /// イベントハンドラの共通引数 + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + MyBaseControllerWin.UserInfo.UserName = this.textBox1.Text; + MyBaseControllerWin.UserInfo.IPAddress = Environment.MachineName; + + Program.FlagEnd = false; // フラグ完了 + this.Close(); + } + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Login.resx diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Program.cs new file mode 100644 index 000000000..dfa15e4db --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Program.cs @@ -0,0 +1,119 @@ +//********************************************************************************** +//* サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：アプリケーションのメイン エントリ ポイント +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Util; +using Touryo.Infrastructure.Public.Util; + +namespace _2CSClientWin_sample +{ + /// アプリケーションのメイン エントリ ポイント + static class Program + { + /// 終了するかどうかを表すフラグ + public static bool FlagEnd = true; + + /// + /// アプリケーションのメイン エントリ ポイントです。 + /// + [STAThread] + static void Main() + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // 既定の処理 + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + // UnhandledExceptionイベント・ハンドラを登録する + Thread.GetDomain().UnhandledException += new + UnhandledExceptionEventHandler(Application_UnhandledException); + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // スプラッシュ画面の表示 + Splash.ShowSplash(new Login()); + + // ＜スピンロック＞ + // SleepすればCPUオーバヘッドはほとんど無いが + // Sleep時間を長く、ループ回数を短くする + // ことでよりCPUオーバヘッドを軽減できる。 + + for (int i = 0; i < 30; i++ ) + { + if (Splash.SpinLock) + { + break; // 直ちに抜ける + } + + Thread.Sleep(100); + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 次の画面（ログイン画面）の表示 + Application.Run(Splash.NextForm); + if(Program.FlagEnd) + { + return; // ログインしないで終わった場合 + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 業務画面の表示（業務の開始） + Application.Run(new Form1()); + } + + // .NET TIPS > 適切に処理されなかった例外をキャッチするには？ + // http://www.atmarkit.co.jp/fdotnet/dotnettips/320appexception/appexception.html + + /// + /// 未処理例外をキャッチするイベント・ハンドラ + /// + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + RcMyCmnFunction.ShowErrorMessageWin(e.Exception, "Application_ThreadExceptionによる例外通知です。"); + } + + /// + /// 未処理例外をキャッチするイベント・ハンドラ + /// + /// + /// メイン・スレッド以外の例外はUnhandledExceptionでハンドル + /// + public static void Application_UnhandledException(object sender, UnhandledExceptionEventArgs e) + { + Exception ex = e.ExceptionObject as Exception; + if (ex != null) + { + RcMyCmnFunction.ShowErrorMessageWin(ex, "Application_UnhandledExceptionによる例外通知です。"); + } + } + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.Designer.cs new file mode 100644 index 000000000..35ad2deb1 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.Designer.cs @@ -0,0 +1,60 @@ +namespace _2CSClientWin_sample +{ + partial class Splash + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("MS UI Gothic", 64F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); + this.label1.Location = new System.Drawing.Point(15, 93); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(262, 86); + this.label1.TabIndex = 0; + this.label1.Text = "splash"; + // + // Splash + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 273); + this.Controls.Add(this.label1); + this.Name = "Splash"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.cs new file mode 100644 index 000000000..8daca4f59 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.cs @@ -0,0 +1,188 @@ +//********************************************************************************** +//* サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Splash +//* クラス日本語名 ：スプラッシュ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Public.Log; + +namespace _2CSClientWin_sample +{ + /// + /// スプラッシュ画面 + /// + /// + /// DOBON.NET > プログラミング道 > .NET Tips + /// > フォーム > スプラッシュウィンドウを表示する + /// http://dobon.net/vb/dotnet/form/splashwindow.html + /// + /// ここでは、フレームワークは使用しない。 + /// + public partial class Splash : Form + { + /// コンストラクタ + public Splash() + { + InitializeComponent(); + + // プロパティの初期化 + this.TopMost = true; + this.ShowInTaskbar = false; + this.FormBorderStyle = FormBorderStyle.None; + this.StartPosition = FormStartPosition.CenterScreen; + + // イベントの設定 + this.Click += new System.EventHandler(Splash.Splash_Click); + this.label1.Click += new System.EventHandler(Splash.Splash_Click); + + // ログの初期化 + LogIF.InfoLog("ACCESS", "Splash"); + } + + /// + /// スプラッシュ画面のクリックイベント + /// + private static void Splash_Click(object sender, EventArgs e) + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // スピンロックを終了させ次画面を表示する。 + Splash._spinLock = true; + } + + #region 静的変数 + + /// 実行済みフラグ + private static bool _hasExecuted = false; + + /// スプラッシュ画面表示スレッド + private static Thread _thread = null; + + /// スピンロック用フラグ + /// volatile:スレッドセーフ + private static volatile bool _spinLock = false; + + /// スピンロック用フラグ（Getter） + public static bool SpinLock + { + get { return Splash._spinLock; } + } + + /// スプラッシュ画面（シングルトン） + /// volatile:スレッドセーフ + private static volatile Splash _splashForm = new Splash(); + + /// 次の画面（シングルトン） + /// volatile:スレッドセーフ + private static volatile Form _nextForm = null; + + /// 次の画面（Getter） + public static Form NextForm + { + get { return Splash._nextForm; } + } + + #endregion + + #region スプラッシュ画面を表示する + + /// スプラッシュ画面を表示する + /// 次の画面 + public static void ShowSplash(Form nextForm) + { + // 主スレッド（スプラッシュ画面を生成していないスレッド） + + // 二回以上は起動できない。 + if (Splash._hasExecuted) + { + return; + } + else + { + Splash._hasExecuted = true; + } + + #region スプラッシュ画面を表示 + + // 次の画面を設定する。 + Splash._nextForm = nextForm; + 　 + // スレッドの作成 + Splash._thread = new Thread( + new ThreadStart(ShowSplashByThread)); + + // スレッドの開始 + Splash._thread.Start(); + + #endregion + } + + /// Thread関数でスプラッシュ画面を表示する。 + private static void ShowSplashByThread() + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // スプラッシュ画面を + + // ・作成 + Splash._splashForm = new Splash(); + + // ・閉じるイベントハンドラを仕掛 + Splash._nextForm.Activated += new EventHandler(Splash.Login_Activated); + + // ・表示 + Application.Run(Splash._splashForm); + } + + #endregion + + #region スプラッシュ画面を閉じる + + /// + /// ログイン画面がアクティブになった時、スプラッシュ画面を閉じる + /// + private static void Login_Activated(object sender, EventArgs e) + { + // 主スレッド（スプラッシュ画面を生成していないスレッド） + + // なので、スプラッシュ画面を閉じるメソッドをInvoke + if (Splash._splashForm != null && !Splash._splashForm.IsDisposed) + { + Splash._splashForm.Invoke(new MethodInvoker(Splash.CloseSplash)); + } + + // nullクリア + Splash._splashForm = null; + Splash._nextForm = null; + Splash._thread = null; + } + + /// スプラッシュ画面を閉じる。 + private static void CloseSplash() + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // なので、スプラッシュ画面をそのまま閉じる + Splash._splashForm.Close(); + } + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/Splash.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json new file mode 100644 index 000000000..dab0064a6 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json @@ -0,0 +1,59 @@ +{ + // 2層C/S用（Windows） + // connectionStrings section + "connectionStrings": { + // SQL Server / SQL Client用 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + // Multi-DB / ODCB.NET用 + "ConnectionString_ODBC": "Dsn=odbc_test1", + // Oracle / ODP.NET用 + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + // MySQL / MySQL Connector/NET用 + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + // PostgreSQL / Npgsql用 + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + + // appSettings section + "appSettings": { + + // フレームワークの使用するパラメータ - start + // コントロールのプレフィックス + "FxPrefixOfButton": "btn", + "FxPrefixOfPictureBox": "pbx", + "FxPrefixOfComboBox": "cbb", + "FxPrefixOfListBox": "lbx", + "FxPrefixOfRadioButton": "rbn", + // リソース ファイルの場合 + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + // 埋め込まれたリソースの場合 + // "FxXMLMSGDefinition": "_2CSClientWin_sample.MSGDefinition.xml", + // "FxXMLSPDefinition": "_2CSClientWin_sample.SPDefinition.xml", + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + // "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // 埋め込まれたリソースの場合 + "FxLog4NetConfFile": "_2CSClientWin_sample.SampleLogConf2CS.xml", + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "C:/root/files/resource/Sql", + // コントロールのプレフィックス（追加分） + "FxPrefixOfCheckBox": "cbx" + // アプリケーションの使用するパラメータ - end + } +} \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln similarity index 95% rename from root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index d7d27694f..ada5d61b8 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" EndProject diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/Readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/Readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/Readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs new file mode 100644 index 000000000..1e0cc39f1 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs @@ -0,0 +1,164 @@ +namespace WindowsFormsApplication +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.button1 = new System.Windows.Forms.Button(); + this.txtMSG = new System.Windows.Forms.TextBox(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.lblMSG = new System.Windows.Forms.Label(); + this.button5 = new System.Windows.Forms.Button(); + this.button6 = new System.Windows.Forms.Button(); + this.button7 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(12, 31); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(150, 23); + this.button1.TabIndex = 0; + this.button1.Text = "スレッド(Win)"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // txtMSG + // + this.txtMSG.Location = new System.Drawing.Point(66, 6); + this.txtMSG.Name = "txtMSG"; + this.txtMSG.Size = new System.Drawing.Size(251, 19); + this.txtMSG.TabIndex = 1; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(168, 31); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(150, 23); + this.button2.TabIndex = 2; + this.button2.Text = "スレッドプール(Win)"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(12, 60); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(150, 23); + this.button3.TabIndex = 3; + this.button3.Text = "WinForm-UIInvoke"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button4 + // + this.button4.Location = new System.Drawing.Point(168, 60); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(150, 23); + this.button4.TabIndex = 4; + this.button4.Text = "WPF-UIInvoke"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // lblMSG + // + this.lblMSG.AutoSize = true; + this.lblMSG.Location = new System.Drawing.Point(10, 9); + this.lblMSG.Name = "lblMSG"; + this.lblMSG.Size = new System.Drawing.Size(50, 12); + this.lblMSG.TabIndex = 5; + this.lblMSG.Text = "メッセージ"; + // + // button5 + // + this.button5.Location = new System.Drawing.Point(12, 89); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(305, 23); + this.button5.TabIndex = 6; + this.button5.Text = "へんなところにつなぐ"; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click); + // + // button6 + // + this.button6.Location = new System.Drawing.Point(13, 118); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(305, 23); + this.button6.TabIndex = 7; + this.button6.Text = "エントリ登録"; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.button6_Click); + // + // button7 + // + this.button7.Location = new System.Drawing.Point(13, 147); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(305, 23); + this.button7.TabIndex = 8; + this.button7.Text = "エントリ削除"; + this.button7.UseVisualStyleBackColor = true; + this.button7.Click += new System.EventHandler(this.button7_Click); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(329, 177); + this.Controls.Add(this.button7); + this.Controls.Add(this.button6); + this.Controls.Add(this.button5); + this.Controls.Add(this.lblMSG); + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.txtMSG); + this.Controls.Add(this.button1); + this.Name = "Form1"; + this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox txtMSG; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.Label lblMSG; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Button button7; + } +} + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs new file mode 100644 index 000000000..3bff70c73 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs @@ -0,0 +1,290 @@ +//********************************************************************************** +//* 非同期イベント・サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：Form1 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.IO; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Framework.RichClient.Asynchronous; +using Touryo.Infrastructure.Public.IO; + +namespace WindowsFormsApplication +{ + public partial class Form1 : Form + { + #region メンバ変数 + + /// 名前付きパイプ・サーバ名 + private string NPS = null; + /// 名前付きパイプ・クライアント + private string[] NPCS = null; + + /// 登録エントリ（Thread） + private AsyncEventEntry AeeTh = null; + /// 登録エントリ（ThreadPool） + private AsyncEventEntry AeePl = null; + /// 登録エントリ（WinForm） + private AsyncEventEntry AeeWin = null; + /// 登録エントリ（WPF） + private AsyncEventEntry AeeWPF = null; + + #endregion + + #region 開始・終了処理 + + #region 開始処理 + + /// コンストラクタ + public Form1() + { + InitializeComponent(); + + // サーバを起動 + string[] args = Environment.CommandLine.Split('/'); + args = args[1].Trim().Split(','); + + // this.NPS + this.NPS = args[0].Trim(); + this.Text = this.NPS; + + // this.NPCS + this.NPCS = new string[args.Length - 1]; + for (int i = 1; i < args.Length; i++) + { + this.NPCS[i-1] = args[i].Trim(); + } + + // 初期化 + + // 初めが自分の名称、 + + //// ２つ目からが相手の名称 + //MessageBox.Show( + // "this.NPS:" + this.NPS + // + "\r\nthis.NPCS:" + string.Join(",", this.NPCS), + // "コマンドラインのチェック"); + + AsyncEventFx.Init(this.NPS, this.NPCS, 3000); + } + + /// 初期処理 + private void Form1_Load(object sender, EventArgs e) + { + // 登録エントリ + + // スレッド + this.AeeTh = new AsyncEventEntry( + AsyncEventEnum.EventClass.Thread, "Thread", null, + new ParameterizedThreadStart(this.ParameterizedThreadStartDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeeTh); + + // --- + + // スレッド プール + this.AeePl = new AsyncEventEntry( + AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", null, + new WaitCallback(this.WaitCallbackDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeePl); + + // --- + + // WinForm + this.AeeWin = new AsyncEventEntry( + AsyncEventEnum.EventClass.WinForm, "WinForm", this, + new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeeWin); + + // --- + + // WPF + this.AeeWPF = new AsyncEventEntry( + AsyncEventEnum.EventClass.WPF, "WPF", this, + new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); + } + + #endregion + + #region 終了処理 + + /// 終了処理 + private void Form1_FormClosed(object sender, FormClosedEventArgs e) + { + // 終了 + AsyncEventFx.Final(); + } + + #endregion + + #endregion + + #region 各種デリゲード + + /// デリゲード + private void ParameterizedThreadStartDgt(object obj) + { + object[] param = (object[])obj; + AsyncEventHeader aeh = (AsyncEventHeader)param[0]; + string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); + + // ファイルにテキストを書き出し。 + using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_pts.txt", true)) + { + sw.WriteLine("\r\n" + this.NPS + " - " + + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + + "WindowsFormsApplication.Form1.ParameterizedThreadStartDgtメソッドが呼ばれた。" + + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() + + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() + + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() + + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() + + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() + + "\r\nメッセージ:" + msg, this.NPS); + } + } + + /// デリゲード + private void WaitCallbackDgt(object state) + { + object[] param = (object[])state; + AsyncEventHeader aeh = (AsyncEventHeader)param[0]; + string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); + + // ファイルにテキストを書き出し。 + using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_tpl.txt", true)) + { + sw.WriteLine("\r\n" + this.NPS + " - " + + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + + "WindowsFormsApplication.Form1.WaitCallbackDgtメソッドが呼ばれた。" + + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() + + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() + + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() + + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() + + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() + + "\r\nメッセージ:" + msg, this.NPS); + } + } + + /// デリゲード + private void SetResultDgt(object result) + { + object[] param = (object[])result; + AsyncEventHeader aeh = (AsyncEventHeader)param[0]; + string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); + + MessageBox.Show(this.NPS + " - " + + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + + "WindowsFormsApplication.Form1.SetResultDgtメソッドが呼ばれた。" + + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() + + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() + + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() + + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() + + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() + + "\r\nメッセージ:" + msg, this.NPS); + } + + #endregion + + #region 各種ボタン（イベント送信） + + /// WinFormのThread + private void button1_Click(object sender, EventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.Thread, "Thread", + AsyncEventEnum.EventClass.Thread, "Thread", + this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); + } + + /// WinFormのThreadPool + private void button2_Click(object sender, EventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", + AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", + this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); + } + + /// WinFormのUIInvoke + private void button3_Click(object sender, EventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.WinForm, "WinForm", + AsyncEventEnum.EventClass.WinForm, "WinForm", + this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); + } + + /// WPFのUIInvoke + private void button4_Click(object sender, EventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.WPF, "WPF", + AsyncEventEnum.EventClass.WPF, "WPF", + this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); + } + + /// へんなところ + private void button5_Click(object sender, EventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.WPF, "いいい", + AsyncEventEnum.EventClass.WPF, "いいい", + this.NPCS[1], "あああ", (uint)bytes.Length, bytes); + //this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); + } + + #endregion + + #region 各種ボタン（エントリ） + + /// エントリを登録 + private void button6_Click(object sender, EventArgs e) + { + AsyncEventFx.RegisterAsyncEvent(this.AeeTh); + AsyncEventFx.RegisterAsyncEvent(this.AeePl); + AsyncEventFx.RegisterAsyncEvent(this.AeeWin); + AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); + } + + /// エントリを削除 + private void button7_Click(object sender, EventArgs e) + { + AsyncEventFx.UnRegisterAsyncEvent(this.AeeTh); + AsyncEventFx.UnRegisterAsyncEvent(this.AeePl); + AsyncEventFx.UnRegisterAsyncEvent(this.AeeWin); + AsyncEventFx.UnRegisterAsyncEvent(this.AeeWPF); + } + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs new file mode 100644 index 000000000..528d40d63 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs @@ -0,0 +1,38 @@ +//********************************************************************************** +//* 非同期イベント・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：Program +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Windows.Forms; + +namespace WindowsFormsApplication +{ + static class Program + { + /// + /// アプリケーションのメイン エントリ ポイントです。 + /// + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj new file mode 100644 index 000000000..c71d2afb1 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj @@ -0,0 +1,22 @@ + + + + WinExe + net5.0-windows + true + + + WindowsFormsApplication + WindowsFormsApplication + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml new file mode 100644 index 000000000..630f74bae --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs new file mode 100644 index 000000000..9ceba249a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs @@ -0,0 +1,30 @@ +//********************************************************************************** +//* 非同期イベント・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：App +//* クラス日本語名 ：App +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Windows; + +namespace WpfApplication +{ + /// + /// App.xaml の相互作用ロジック + /// + public partial class App : Application + { + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml new file mode 100644 index 000000000..ad74ceccb --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs new file mode 100644 index 000000000..65f6db816 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs @@ -0,0 +1,302 @@ +//********************************************************************************** +//* 非同期イベント・サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：Form1 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.IO; +using System.Threading; +using System.Windows; + +using Touryo.Infrastructure.Framework.RichClient.Asynchronous; +using Touryo.Infrastructure.Public.IO; + +namespace WpfApplication +{ + /// + /// Window1.xaml の相互作用ロジック + /// + public partial class Window1 : Window + { + #region メンバ変数 + + /// 名前付きパイプ・サーバ名 + private string NPS = null; + /// 名前付きパイプ・クライアント + private string[] NPCS = null; + + /// 登録エントリ（Thread） + private AsyncEventEntry AeeTh = null; + /// 登録エントリ（ThreadPool） + private AsyncEventEntry AeePl = null; + /// 登録エントリ（WinForm） + private AsyncEventEntry AeeWin = null; + /// 登録エントリ（WPF） + private AsyncEventEntry AeeWPF = null; + + #endregion + + #region 開始・終了処理 + + #region 開始処理 + + /// コンストラクタ + public Window1() + { + InitializeComponent(); + + // サーバを起動 + string[] args = Environment.CommandLine.Split('/'); + args = args[1].Trim().Split(','); + + // this.NPS + this.NPS = args[0].Trim(); + this.Title = this.NPS; + + // this.NPCS + this.NPCS = new string[args.Length - 1]; + for (int i = 1; i < args.Length; i++) + { + this.NPCS[i - 1] = args[i].Trim(); + } + + // 初期化 + + // 初めが自分の名称、 + + //// ２つ目からが相手の名称 + //MessageBox.Show( + // "this.NPS:" + this.NPS + // + "\r\nthis.NPCS:" + string.Join(",", this.NPCS), + // "コマンドラインのチェック"); + + AsyncEventFx.Init(this.NPS, this.NPCS, 3000); + } + + /// ロード + private void Window_Loaded(object sender, RoutedEventArgs e) + { + // 登録エントリ + + // スレッド + this.AeeTh = new AsyncEventEntry( + AsyncEventEnum.EventClass.Thread, "Thread", null, + new ParameterizedThreadStart(this.ParameterizedThreadStartDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeeTh); + + // --- + + // スレッド プール + this.AeePl = new AsyncEventEntry( + AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", null, + new WaitCallback(this.WaitCallbackDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeePl); + + // --- + + // WinForm + this.AeeWin = new AsyncEventEntry( + AsyncEventEnum.EventClass.WinForm, "WinForm", this, + new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeeWin); + + // --- + + // WPF + this.AeeWPF = new AsyncEventEntry( + AsyncEventEnum.EventClass.WPF, "WPF", this, + new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); + + AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); + } + + #endregion + + #region 終了処理 + + /// アンロード + private void Window_Unloaded(object sender, RoutedEventArgs e) + { + // 終了 + AsyncEventFx.Final(); + } + + // ↑↓どっち？？ + + /// クローズ + private void Window_Closed(object sender, EventArgs e) + { + // 終了 + AsyncEventFx.Final(); + } + + #endregion + + #endregion + + #region 各種デリゲード + + /// デリゲード + private void ParameterizedThreadStartDgt(object obj) + { + object[] param = (object[])obj; + AsyncEventHeader aeh = (AsyncEventHeader)param[0]; + string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); + + // ファイルにテキストを書き出し。 + using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_pts.txt", true)) + { + sw.WriteLine("\r\n" + this.NPS + " - " + + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + + "WpfApplication.Window1.ParameterizedThreadStartDgtメソッドが呼ばれた。" + + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() + + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() + + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() + + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() + + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() + + "\r\nメッセージ:" + msg, this.NPS); + } + } + + /// デリゲード + private void WaitCallbackDgt(object state) + { + object[] param = (object[])state; + AsyncEventHeader aeh = (AsyncEventHeader)param[0]; + string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); + + // ファイルにテキストを書き出し。 + using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_tpl.txt", true)) + { + sw.WriteLine("\r\n" + this.NPS + " - " + + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + + "WpfApplication.Window1.WaitCallbackDgtメソッドが呼ばれた。" + + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() + + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() + + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() + + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() + + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() + + "\r\nメッセージ:" + msg, this.NPS); + } + } + + /// デリゲード + private void SetResultDgt(object result) + { + object[] param = (object[])result; + AsyncEventHeader aeh = (AsyncEventHeader)param[0]; + string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); + + MessageBox.Show(this,this.NPS + " - " + + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + + "WpfApplication.Window1.SetResultDgtメソッドが呼ばれた。" + + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() + + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() + + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() + + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() + + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() + + "\r\nメッセージ:" + msg, this.NPS); + } + + #endregion + + #region 各種ボタン + + /// WPFのThread + private void button1_Click(object sender, RoutedEventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.Thread, "Thread", + AsyncEventEnum.EventClass.Thread, "Thread", + this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); + } + + /// WPFのThreadPool + private void button2_Click(object sender, RoutedEventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", + AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", + this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); + } + + /// WPFのUIInvoke + private void button3_Click(object sender, RoutedEventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.WPF, "WPF", + AsyncEventEnum.EventClass.WPF, "WPF", + this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); + } + + /// WinFormのUIInvoke + private void button4_Click(object sender, RoutedEventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.WinForm, "WinForm", + AsyncEventEnum.EventClass.WinForm, "WinForm", + this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); + } + + /// へんなところ + private void button5_Click(object sender, RoutedEventArgs e) + { + byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); + + AsyncEventFx.SendAsyncEvent( + AsyncEventEnum.EventClass.WinForm, "いいい", + AsyncEventEnum.EventClass.WinForm, "いいい", + this.NPCS[1], "あああ", (uint)bytes.Length, bytes); + //this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); + } + + #endregion + + #region 各種ボタン（エントリ） + + /// エントリを登録 + private void button6_Click(object sender, RoutedEventArgs e) + { + AsyncEventFx.RegisterAsyncEvent(this.AeeTh); + AsyncEventFx.RegisterAsyncEvent(this.AeePl); + AsyncEventFx.RegisterAsyncEvent(this.AeeWin); + AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); + } + + /// エントリを削除 + private void button7_Click(object sender, RoutedEventArgs e) + { + AsyncEventFx.UnRegisterAsyncEvent(this.AeeTh); + AsyncEventFx.UnRegisterAsyncEvent(this.AeePl); + AsyncEventFx.UnRegisterAsyncEvent(this.AeeWin); + AsyncEventFx.UnRegisterAsyncEvent(this.AeeWPF); + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj new file mode 100644 index 000000000..71a55e513 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj @@ -0,0 +1,20 @@ + + + + WinExe + net5.0-windows + true + WpfApplication + WpfApplication + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat new file mode 100644 index 000000000..6df1e63f5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat @@ -0,0 +1,5 @@ +start WindowsFormsApplication\bin\Debug\net5.0\WindowsFormsApplication.exe /WinForm1,WinForm2,WPF1 +start WindowsFormsApplication\bin\Debug\net5.0\WindowsFormsApplication.exe /WinForm2,WinForm1,WPF2 + +start WpfApplication\bin\Debug\net5.0\WpfApplication.exe /WPF1,WPF2,WinForm1 +start WpfApplication\bin\Debug\net5.0\WpfApplication.exe /WPF2,WPF1,WinForm2 diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Bean.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Bean.cs new file mode 100644 index 000000000..c180b701c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Bean.cs @@ -0,0 +1,37 @@ +//********************************************************************************** +//* カスタム コントロール・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Bean +//* クラス日本語名 ：Bean +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; + +namespace CustCtrl_sample +{ + public class Bean + { + public decimal AAA { set; get; } + public DateTime BBB { set; get; } + public string CCC { set; get; } + + public Bean(decimal aaa, DateTime bbb, string ccc) + { + this.AAA = aaa; + this.BBB = bbb; + this.CCC = ccc; + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj new file mode 100644 index 000000000..96798ed52 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj @@ -0,0 +1,27 @@ + + + + WinExe + net5.0-windows + true + + + CustCtrl_sample + CustCtrl_sample + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.CustomControl.RichClient.dll + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln similarity index 93% rename from root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 5f1c05a97..071185357 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.Designer.cs new file mode 100644 index 000000000..98b312401 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.Designer.cs @@ -0,0 +1,1792 @@ +namespace CustCtrl_sample +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + Touryo.Infrastructure.CustomControl.RichClient.EditPadding editPadding1 = new Touryo.Infrastructure.CustomControl.RichClient.EditPadding(); + Touryo.Infrastructure.CustomControl.RichClient.EditPadding editPadding2 = new Touryo.Infrastructure.CustomControl.RichClient.EditPadding(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP1 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP2 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType1 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP3 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType2 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType3 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType4 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP4 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType5 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP5 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType6 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.EditPadding editPadding3 = new Touryo.Infrastructure.CustomControl.RichClient.EditPadding(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType7 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.EditPadding editPadding4 = new Touryo.Infrastructure.CustomControl.RichClient.EditPadding(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType8 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType9 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType10 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType11 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP6 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP editDigitsAfterDP7 = new Touryo.Infrastructure.CustomControl.RichClient.EditDigitsAfterDP(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType12 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType13 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType14 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType15 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType16 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType17 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType18 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType19 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType20 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType21 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType22 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType23 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType24 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType25 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType26 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType27 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType28 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType29 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType30 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + Touryo.Infrastructure.CustomControl.RichClient.CheckType checkType31 = new Touryo.Infrastructure.CustomControl.RichClient.CheckType(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.button1 = new System.Windows.Forms.Button(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.lbl2f_2 = new System.Windows.Forms.Label(); + this.lbl18_2 = new System.Windows.Forms.Label(); + this.winCustomTextBox7_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox6_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox5_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox4_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox3_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox2_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.button2 = new System.Windows.Forms.Button(); + this.lbl2h = new System.Windows.Forms.Label(); + this.winCustomTextBox23 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox22 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl2g = new System.Windows.Forms.Label(); + this.lbl2f = new System.Windows.Forms.Label(); + this.lbl2e = new System.Windows.Forms.Label(); + this.winCustomTextBox21 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl2d = new System.Windows.Forms.Label(); + this.lbl2c = new System.Windows.Forms.Label(); + this.winCustomTextBox20 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl2b = new System.Windows.Forms.Label(); + this.lbl11 = new System.Windows.Forms.Label(); + this.lbl12 = new System.Windows.Forms.Label(); + this.lbl13 = new System.Windows.Forms.Label(); + this.lbl2a = new System.Windows.Forms.Label(); + this.winCustomTextBox2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox19 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox3 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl29 = new System.Windows.Forms.Label(); + this.winCustomTextBox1 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox18 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl14 = new System.Windows.Forms.Label(); + this.lbl28 = new System.Windows.Forms.Label(); + this.winCustomTextBox4 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox17 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl15 = new System.Windows.Forms.Label(); + this.lbl27 = new System.Windows.Forms.Label(); + this.winCustomTextBox5 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox16 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox6 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl26 = new System.Windows.Forms.Label(); + this.lbl16 = new System.Windows.Forms.Label(); + this.winCustomTextBox15 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox7 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl24 = new System.Windows.Forms.Label(); + this.lbl17 = new System.Windows.Forms.Label(); + this.winCustomTextBox14 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl18 = new System.Windows.Forms.Label(); + this.lbl23 = new System.Windows.Forms.Label(); + this.winCustomTextBox9 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox12 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox10 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl25 = new System.Windows.Forms.Label(); + this.lbl21 = new System.Windows.Forms.Label(); + this.winCustomTextBox11 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.lbl19 = new System.Windows.Forms.Label(); + this.lbl22 = new System.Windows.Forms.Label(); + this.winCustomTextBox8 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.winCustomTextBox13 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.lbl44 = new System.Windows.Forms.Label(); + this.lbl3c = new System.Windows.Forms.Label(); + this.button3 = new System.Windows.Forms.Button(); + this.lbl43 = new System.Windows.Forms.Label(); + this.lbl42 = new System.Windows.Forms.Label(); + this.lbl41 = new System.Windows.Forms.Label(); + this.lbl3b = new System.Windows.Forms.Label(); + this.lbl3a = new System.Windows.Forms.Label(); + this.lbl39 = new System.Windows.Forms.Label(); + this.lbl38 = new System.Windows.Forms.Label(); + this.lbl37 = new System.Windows.Forms.Label(); + this.lbl36 = new System.Windows.Forms.Label(); + this.lbl34 = new System.Windows.Forms.Label(); + this.lbl33 = new System.Windows.Forms.Label(); + this.lbl35 = new System.Windows.Forms.Label(); + this.lbl31 = new System.Windows.Forms.Label(); + this.lbl32 = new System.Windows.Forms.Label(); + this.winCustomMaskedTextBox14 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox11_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox10_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox9_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox8_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox7_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox6_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox5_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox4_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox3_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox2_2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox13 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox12 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox11 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox10 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox9 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox8 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox7 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox6 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox5 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox4 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox3 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomMaskedTextBox1 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox(); + this.winCustomDropDownList3 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomDropDownList(); + this.winCustomDropDownList2 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomDropDownList(); + this.winCustomDropDownList1 = new Touryo.Infrastructure.CustomControl.RichClient.WinCustomDropDownList(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.SuspendLayout(); + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(462, 12); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 21; + this.dataGridView1.Size = new System.Drawing.Size(375, 449); + this.dataGridView1.TabIndex = 0; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(462, 576); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(375, 65); + this.button1.TabIndex = 47; + this.button1.Text = "一括チェック"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(12, 11); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(425, 630); + this.tabControl1.TabIndex = 54; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.lbl2f_2); + this.tabPage1.Controls.Add(this.lbl18_2); + this.tabPage1.Controls.Add(this.winCustomTextBox7_2); + this.tabPage1.Controls.Add(this.winCustomTextBox6_2); + this.tabPage1.Controls.Add(this.winCustomTextBox5_2); + this.tabPage1.Controls.Add(this.winCustomTextBox4_2); + this.tabPage1.Controls.Add(this.winCustomTextBox3_2); + this.tabPage1.Controls.Add(this.winCustomTextBox2_2); + this.tabPage1.Controls.Add(this.button2); + this.tabPage1.Controls.Add(this.lbl2h); + this.tabPage1.Controls.Add(this.winCustomTextBox23); + this.tabPage1.Controls.Add(this.winCustomTextBox22); + this.tabPage1.Controls.Add(this.lbl2g); + this.tabPage1.Controls.Add(this.lbl2f); + this.tabPage1.Controls.Add(this.lbl2e); + this.tabPage1.Controls.Add(this.winCustomTextBox21); + this.tabPage1.Controls.Add(this.lbl2d); + this.tabPage1.Controls.Add(this.lbl2c); + this.tabPage1.Controls.Add(this.winCustomTextBox20); + this.tabPage1.Controls.Add(this.lbl2b); + this.tabPage1.Controls.Add(this.lbl11); + this.tabPage1.Controls.Add(this.lbl12); + this.tabPage1.Controls.Add(this.lbl13); + this.tabPage1.Controls.Add(this.lbl2a); + this.tabPage1.Controls.Add(this.winCustomTextBox2); + this.tabPage1.Controls.Add(this.winCustomTextBox19); + this.tabPage1.Controls.Add(this.winCustomTextBox3); + this.tabPage1.Controls.Add(this.lbl29); + this.tabPage1.Controls.Add(this.winCustomTextBox1); + this.tabPage1.Controls.Add(this.winCustomTextBox18); + this.tabPage1.Controls.Add(this.lbl14); + this.tabPage1.Controls.Add(this.lbl28); + this.tabPage1.Controls.Add(this.winCustomTextBox4); + this.tabPage1.Controls.Add(this.winCustomTextBox17); + this.tabPage1.Controls.Add(this.lbl15); + this.tabPage1.Controls.Add(this.lbl27); + this.tabPage1.Controls.Add(this.winCustomTextBox5); + this.tabPage1.Controls.Add(this.winCustomTextBox16); + this.tabPage1.Controls.Add(this.winCustomTextBox6); + this.tabPage1.Controls.Add(this.lbl26); + this.tabPage1.Controls.Add(this.lbl16); + this.tabPage1.Controls.Add(this.winCustomTextBox15); + this.tabPage1.Controls.Add(this.winCustomTextBox7); + this.tabPage1.Controls.Add(this.lbl24); + this.tabPage1.Controls.Add(this.lbl17); + this.tabPage1.Controls.Add(this.winCustomTextBox14); + this.tabPage1.Controls.Add(this.lbl18); + this.tabPage1.Controls.Add(this.lbl23); + this.tabPage1.Controls.Add(this.winCustomTextBox9); + this.tabPage1.Controls.Add(this.winCustomTextBox12); + this.tabPage1.Controls.Add(this.winCustomTextBox10); + this.tabPage1.Controls.Add(this.lbl25); + this.tabPage1.Controls.Add(this.lbl21); + this.tabPage1.Controls.Add(this.winCustomTextBox11); + this.tabPage1.Controls.Add(this.lbl19); + this.tabPage1.Controls.Add(this.lbl22); + this.tabPage1.Controls.Add(this.winCustomTextBox8); + this.tabPage1.Controls.Add(this.winCustomTextBox13); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(417, 604); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "TextBox"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // lbl2f_2 + // + this.lbl2f_2.AutoSize = true; + this.lbl2f_2.Location = new System.Drawing.Point(233, 466); + this.lbl2f_2.Name = "lbl2f_2"; + this.lbl2f_2.Size = new System.Drawing.Size(159, 12); + this.lbl2f_2.TabIndex = 61; + this.lbl2f_2.Text = "数値編集は全角に適用されない"; + // + // lbl18_2 + // + this.lbl18_2.AutoSize = true; + this.lbl18_2.Location = new System.Drawing.Point(14, 208); + this.lbl18_2.Name = "lbl18_2"; + this.lbl18_2.Size = new System.Drawing.Size(316, 12); + this.lbl18_2.TabIndex = 60; + this.lbl18_2.Text = "（組み合わせは処理順序によって意図しない結果になることもある。"; + // + // winCustomTextBox7_2 + // + this.winCustomTextBox7_2.CheckRegExp = null; + editPadding1.PadChar = '0'; + editPadding1.PadDir = Touryo.Infrastructure.CustomControl.RichClient.PadDirection.Left; + this.winCustomTextBox7_2.EditPadding = editPadding1; + this.winCustomTextBox7_2.Location = new System.Drawing.Point(260, 156); + this.winCustomTextBox7_2.MaxLength = 10; + this.winCustomTextBox7_2.Name = "winCustomTextBox7_2"; + this.winCustomTextBox7_2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox7_2.TabIndex = 12; + // + // winCustomTextBox6_2 + // + this.winCustomTextBox6_2.CheckRegExp = null; + editPadding2.PadChar = ' '; + editPadding2.PadDir = Touryo.Infrastructure.CustomControl.RichClient.PadDirection.Right; + this.winCustomTextBox6_2.EditPadding = editPadding2; + this.winCustomTextBox6_2.Location = new System.Drawing.Point(260, 131); + this.winCustomTextBox6_2.MaxLength = 10; + this.winCustomTextBox6_2.Name = "winCustomTextBox6_2"; + this.winCustomTextBox6_2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox6_2.TabIndex = 11; + // + // winCustomTextBox5_2 + // + this.winCustomTextBox5_2.CheckRegExp = null; + editDigitsAfterDP1.DigitsAfterDP = ((uint)(4u)); + editDigitsAfterDP1.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod.Floor; + this.winCustomTextBox5_2.EditDigitsAfterDP_Editing = editDigitsAfterDP1; + this.winCustomTextBox5_2.Location = new System.Drawing.Point(260, 106); + this.winCustomTextBox5_2.Name = "winCustomTextBox5_2"; + this.winCustomTextBox5_2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox5_2.TabIndex = 10; + // + // winCustomTextBox4_2 + // + this.winCustomTextBox4_2.CheckRegExp = null; + editDigitsAfterDP2.DigitsAfterDP = ((uint)(2u)); + editDigitsAfterDP2.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod._4sya5nyu; + this.winCustomTextBox4_2.EditDigitsAfterDP = editDigitsAfterDP2; + this.winCustomTextBox4_2.Location = new System.Drawing.Point(260, 81); + this.winCustomTextBox4_2.Name = "winCustomTextBox4_2"; + this.winCustomTextBox4_2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox4_2.TabIndex = 9; + // + // winCustomTextBox3_2 + // + this.winCustomTextBox3_2.CheckRegExp = null; + this.winCustomTextBox3_2.EditAddFigure = Touryo.Infrastructure.CustomControl.RichClient.EditAddFigure.Af4; + this.winCustomTextBox3_2.Location = new System.Drawing.Point(260, 56); + this.winCustomTextBox3_2.Name = "winCustomTextBox3_2"; + this.winCustomTextBox3_2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox3_2.TabIndex = 8; + // + // winCustomTextBox2_2 + // + this.winCustomTextBox2_2.CheckRegExp = null; + this.winCustomTextBox2_2.EditAddFigure = Touryo.Infrastructure.CustomControl.RichClient.EditAddFigure.Af3; + this.winCustomTextBox2_2.Location = new System.Drawing.Point(260, 31); + this.winCustomTextBox2_2.Name = "winCustomTextBox2_2"; + this.winCustomTextBox2_2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox2_2.TabIndex = 7; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(16, 268); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(384, 30); + this.button2.TabIndex = 54; + this.button2.Text = "値取得プロパティ プロシージャ（編集中、編集後）"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // lbl2h + // + this.lbl2h.AutoSize = true; + this.lbl2h.Location = new System.Drawing.Point(233, 546); + this.lbl2h.Name = "lbl2h"; + this.lbl2h.Size = new System.Drawing.Size(121, 12); + this.lbl2h.TabIndex = 59; + this.lbl2h.Text = "少数３桁＋全角＆数値"; + // + // winCustomTextBox23 + // + this.winCustomTextBox23.CheckProhibitedChar = true; + this.winCustomTextBox23.CheckRegExp = null; + checkType1.IsDate = false; + checkType1.IsHankaku = false; + checkType1.IsHanKatakana = false; + checkType1.IsHiragana = false; + checkType1.IsKatakana = false; + checkType1.IsNumeric = true; + checkType1.IsZenkaku = true; + checkType1.Required = false; + this.winCustomTextBox23.CheckType = checkType1; + this.winCustomTextBox23.CheckValidating = true; + editDigitsAfterDP3.DigitsAfterDP = ((uint)(3u)); + editDigitsAfterDP3.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod._4sya5nyu; + this.winCustomTextBox23.EditDigitsAfterDP = editDigitsAfterDP3; + this.winCustomTextBox23.Location = new System.Drawing.Point(235, 568); + this.winCustomTextBox23.Name = "winCustomTextBox23"; + this.winCustomTextBox23.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox23.TabIndex = 28; + // + // winCustomTextBox22 + // + this.winCustomTextBox22.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox22.CheckRegExp = null; + checkType2.IsDate = false; + checkType2.IsHankaku = false; + checkType2.IsHanKatakana = false; + checkType2.IsHiragana = false; + checkType2.IsKatakana = false; + checkType2.IsNumeric = true; + checkType2.IsZenkaku = true; + checkType2.Required = false; + this.winCustomTextBox22.CheckType = checkType2; + this.winCustomTextBox22.CheckValidating = true; + this.winCustomTextBox22.EditAddFigure = Touryo.Infrastructure.CustomControl.RichClient.EditAddFigure.Af3; + this.winCustomTextBox22.Location = new System.Drawing.Point(235, 518); + this.winCustomTextBox22.Name = "winCustomTextBox22"; + this.winCustomTextBox22.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox22.TabIndex = 27; + // + // lbl2g + // + this.lbl2g.AutoSize = true; + this.lbl2g.Location = new System.Drawing.Point(233, 496); + this.lbl2g.Name = "lbl2g"; + this.lbl2g.Size = new System.Drawing.Size(109, 12); + this.lbl2g.TabIndex = 56; + this.lbl2g.Text = "区切り＋全角＆数値"; + // + // lbl2f + // + this.lbl2f.AutoSize = true; + this.lbl2f.Location = new System.Drawing.Point(233, 446); + this.lbl2f.Name = "lbl2f"; + this.lbl2f.Size = new System.Drawing.Size(167, 12); + this.lbl2f.TabIndex = 55; + this.lbl2f.Text = "編集と組み合わせてチェックをテスト"; + // + // lbl2e + // + this.lbl2e.AutoSize = true; + this.lbl2e.Location = new System.Drawing.Point(233, 396); + this.lbl2e.Name = "lbl2e"; + this.lbl2e.Size = new System.Drawing.Size(65, 12); + this.lbl2e.TabIndex = 53; + this.lbl2e.Text = "全角＆数値"; + // + // winCustomTextBox21 + // + this.winCustomTextBox21.CheckProhibitedChar = true; + this.winCustomTextBox21.CheckRegExp = null; + checkType3.IsDate = false; + checkType3.IsHankaku = false; + checkType3.IsHanKatakana = false; + checkType3.IsHiragana = false; + checkType3.IsKatakana = false; + checkType3.IsNumeric = true; + checkType3.IsZenkaku = true; + checkType3.Required = false; + this.winCustomTextBox21.CheckType = checkType3; + this.winCustomTextBox21.CheckValidating = true; + this.winCustomTextBox21.Location = new System.Drawing.Point(235, 418); + this.winCustomTextBox21.Name = "winCustomTextBox21"; + this.winCustomTextBox21.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox21.TabIndex = 26; + // + // lbl2d + // + this.lbl2d.AutoSize = true; + this.lbl2d.Location = new System.Drawing.Point(233, 346); + this.lbl2d.Name = "lbl2d"; + this.lbl2d.Size = new System.Drawing.Size(65, 12); + this.lbl2d.TabIndex = 51; + this.lbl2d.Text = "半角＆禁則"; + // + // lbl2c + // + this.lbl2c.AutoSize = true; + this.lbl2c.Location = new System.Drawing.Point(233, 321); + this.lbl2c.Name = "lbl2c"; + this.lbl2c.Size = new System.Drawing.Size(135, 12); + this.lbl2c.TabIndex = 50; + this.lbl2c.Text = "組み合わせてチェックをテスト"; + // + // winCustomTextBox20 + // + this.winCustomTextBox20.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox20.CheckProhibitedChar = true; + this.winCustomTextBox20.CheckRegExp = null; + checkType4.IsDate = false; + checkType4.IsHankaku = true; + checkType4.IsHanKatakana = false; + checkType4.IsHiragana = false; + checkType4.IsKatakana = false; + checkType4.IsNumeric = false; + checkType4.IsZenkaku = false; + checkType4.Required = false; + this.winCustomTextBox20.CheckType = checkType4; + this.winCustomTextBox20.CheckValidating = true; + this.winCustomTextBox20.Location = new System.Drawing.Point(235, 368); + this.winCustomTextBox20.Name = "winCustomTextBox20"; + this.winCustomTextBox20.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox20.TabIndex = 25; + // + // lbl2b + // + this.lbl2b.AutoSize = true; + this.lbl2b.Location = new System.Drawing.Point(16, 571); + this.lbl2b.Name = "lbl2b"; + this.lbl2b.Size = new System.Drawing.Size(29, 12); + this.lbl2b.TabIndex = 49; + this.lbl2b.Text = "禁則"; + // + // lbl11 + // + this.lbl11.AutoSize = true; + this.lbl11.Location = new System.Drawing.Point(14, 9); + this.lbl11.Name = "lbl11"; + this.lbl11.Size = new System.Drawing.Size(29, 12); + this.lbl11.TabIndex = 11; + this.lbl11.Text = "編集"; + // + // lbl12 + // + this.lbl12.AutoSize = true; + this.lbl12.Location = new System.Drawing.Point(14, 34); + this.lbl12.Name = "lbl12"; + this.lbl12.Size = new System.Drawing.Size(57, 12); + this.lbl12.TabIndex = 12; + this.lbl12.Text = "３桁区切り"; + // + // lbl13 + // + this.lbl13.AutoSize = true; + this.lbl13.Location = new System.Drawing.Point(14, 59); + this.lbl13.Name = "lbl13"; + this.lbl13.Size = new System.Drawing.Size(57, 12); + this.lbl13.TabIndex = 12; + this.lbl13.Text = "４桁区切り"; + // + // lbl2a + // + this.lbl2a.AutoSize = true; + this.lbl2a.Location = new System.Drawing.Point(16, 546); + this.lbl2a.Name = "lbl2a"; + this.lbl2a.Size = new System.Drawing.Size(91, 12); + this.lbl2a.TabIndex = 46; + this.lbl2a.Text = "正規表現（メアド）"; + // + // winCustomTextBox2 + // + this.winCustomTextBox2.CheckRegExp = null; + this.winCustomTextBox2.EditAddFigure = Touryo.Infrastructure.CustomControl.RichClient.EditAddFigure.Af3; + this.winCustomTextBox2.Location = new System.Drawing.Point(138, 31); + this.winCustomTextBox2.Name = "winCustomTextBox2"; + this.winCustomTextBox2.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox2.TabIndex = 1; + this.winCustomTextBox2.TextChanged += new System.EventHandler(this.winCustomTextBox_TextChanged); + // + // winCustomTextBox19 + // + this.winCustomTextBox19.BackColor = System.Drawing.SystemColors.Window; + this.winCustomTextBox19.CheckProhibitedChar = true; + this.winCustomTextBox19.CheckRegExp = null; + this.winCustomTextBox19.CheckValidating = true; + this.winCustomTextBox19.Location = new System.Drawing.Point(113, 568); + this.winCustomTextBox19.Name = "winCustomTextBox19"; + this.winCustomTextBox19.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox19.TabIndex = 24; + // + // winCustomTextBox3 + // + this.winCustomTextBox3.CheckRegExp = null; + this.winCustomTextBox3.EditAddFigure = Touryo.Infrastructure.CustomControl.RichClient.EditAddFigure.Af4; + this.winCustomTextBox3.Location = new System.Drawing.Point(138, 56); + this.winCustomTextBox3.Name = "winCustomTextBox3"; + this.winCustomTextBox3.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox3.TabIndex = 2; + this.winCustomTextBox3.TextChanged += new System.EventHandler(this.winCustomTextBox_TextChanged); + // + // lbl29 + // + this.lbl29.AutoSize = true; + this.lbl29.Location = new System.Drawing.Point(16, 521); + this.lbl29.Name = "lbl29"; + this.lbl29.Size = new System.Drawing.Size(29, 12); + this.lbl29.TabIndex = 44; + this.lbl29.Text = "日付"; + // + // winCustomTextBox1 + // + this.winCustomTextBox1.CheckRegExp = null; + this.winCustomTextBox1.Location = new System.Drawing.Point(138, 6); + this.winCustomTextBox1.Name = "winCustomTextBox1"; + this.winCustomTextBox1.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox1.TabIndex = 0; + // + // winCustomTextBox18 + // + this.winCustomTextBox18.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox18.CheckRegExp = "^([a-zA-Z0-9])+([a-zA-Z0-9\\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\\._-]+)+$"; + this.winCustomTextBox18.CheckValidating = true; + this.winCustomTextBox18.Location = new System.Drawing.Point(113, 543); + this.winCustomTextBox18.Name = "winCustomTextBox18"; + this.winCustomTextBox18.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox18.TabIndex = 23; + // + // lbl14 + // + this.lbl14.AutoSize = true; + this.lbl14.Location = new System.Drawing.Point(14, 84); + this.lbl14.Name = "lbl14"; + this.lbl14.Size = new System.Drawing.Size(99, 12); + this.lbl14.TabIndex = 15; + this.lbl14.Text = "小数点編集後 2桁"; + // + // lbl28 + // + this.lbl28.AutoSize = true; + this.lbl28.Location = new System.Drawing.Point(16, 496); + this.lbl28.Name = "lbl28"; + this.lbl28.Size = new System.Drawing.Size(41, 12); + this.lbl28.TabIndex = 42; + this.lbl28.Text = "平仮名"; + // + // winCustomTextBox4 + // + this.winCustomTextBox4.CheckRegExp = null; + editDigitsAfterDP4.DigitsAfterDP = ((uint)(2u)); + editDigitsAfterDP4.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod._4sya5nyu; + this.winCustomTextBox4.EditDigitsAfterDP = editDigitsAfterDP4; + this.winCustomTextBox4.Location = new System.Drawing.Point(138, 81); + this.winCustomTextBox4.MaxLength = 10; + this.winCustomTextBox4.Name = "winCustomTextBox4"; + this.winCustomTextBox4.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox4.TabIndex = 3; + this.winCustomTextBox4.TextChanged += new System.EventHandler(this.winCustomTextBox_TextChanged); + // + // winCustomTextBox17 + // + this.winCustomTextBox17.BackColor = System.Drawing.SystemColors.Window; + this.winCustomTextBox17.CheckRegExp = null; + checkType5.IsDate = true; + checkType5.IsHankaku = false; + checkType5.IsHanKatakana = false; + checkType5.IsHiragana = false; + checkType5.IsKatakana = false; + checkType5.IsNumeric = false; + checkType5.IsZenkaku = false; + checkType5.Required = false; + this.winCustomTextBox17.CheckType = checkType5; + this.winCustomTextBox17.CheckValidating = true; + this.winCustomTextBox17.Location = new System.Drawing.Point(113, 518); + this.winCustomTextBox17.Name = "winCustomTextBox17"; + this.winCustomTextBox17.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox17.TabIndex = 22; + // + // lbl15 + // + this.lbl15.AutoSize = true; + this.lbl15.Location = new System.Drawing.Point(14, 109); + this.lbl15.Name = "lbl15"; + this.lbl15.Size = new System.Drawing.Size(99, 12); + this.lbl15.TabIndex = 17; + this.lbl15.Text = "小数点編集中 4桁"; + // + // lbl27 + // + this.lbl27.AutoSize = true; + this.lbl27.Location = new System.Drawing.Point(14, 471); + this.lbl27.Name = "lbl27"; + this.lbl27.Size = new System.Drawing.Size(65, 12); + this.lbl27.TabIndex = 40; + this.lbl27.Text = "半角片仮名"; + // + // winCustomTextBox5 + // + this.winCustomTextBox5.CheckRegExp = null; + editDigitsAfterDP5.DigitsAfterDP = ((uint)(4u)); + editDigitsAfterDP5.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod.Floor; + this.winCustomTextBox5.EditDigitsAfterDP_Editing = editDigitsAfterDP5; + this.winCustomTextBox5.Location = new System.Drawing.Point(138, 106); + this.winCustomTextBox5.MaxLength = 10; + this.winCustomTextBox5.Name = "winCustomTextBox5"; + this.winCustomTextBox5.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox5.TabIndex = 4; + this.winCustomTextBox5.TextChanged += new System.EventHandler(this.winCustomTextBox_TextChanged); + // + // winCustomTextBox16 + // + this.winCustomTextBox16.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox16.CheckRegExp = null; + checkType6.IsDate = false; + checkType6.IsHankaku = false; + checkType6.IsHanKatakana = false; + checkType6.IsHiragana = true; + checkType6.IsKatakana = false; + checkType6.IsNumeric = false; + checkType6.IsZenkaku = false; + checkType6.Required = false; + this.winCustomTextBox16.CheckType = checkType6; + this.winCustomTextBox16.CheckValidating = true; + this.winCustomTextBox16.Location = new System.Drawing.Point(113, 493); + this.winCustomTextBox16.Name = "winCustomTextBox16"; + this.winCustomTextBox16.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox16.TabIndex = 21; + // + // winCustomTextBox6 + // + this.winCustomTextBox6.CheckRegExp = null; + editPadding3.PadChar = null; + editPadding3.PadDir = Touryo.Infrastructure.CustomControl.RichClient.PadDirection.Right; + this.winCustomTextBox6.EditPadding = editPadding3; + this.winCustomTextBox6.Location = new System.Drawing.Point(138, 131); + this.winCustomTextBox6.MaxLength = 10; + this.winCustomTextBox6.Name = "winCustomTextBox6"; + this.winCustomTextBox6.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox6.TabIndex = 5; + this.winCustomTextBox6.TextChanged += new System.EventHandler(this.winCustomTextBox_TextChanged); + // + // lbl26 + // + this.lbl26.AutoSize = true; + this.lbl26.Location = new System.Drawing.Point(14, 446); + this.lbl26.Name = "lbl26"; + this.lbl26.Size = new System.Drawing.Size(41, 12); + this.lbl26.TabIndex = 38; + this.lbl26.Text = "片仮名"; + // + // lbl16 + // + this.lbl16.AutoSize = true; + this.lbl16.Location = new System.Drawing.Point(14, 134); + this.lbl16.Name = "lbl16"; + this.lbl16.Size = new System.Drawing.Size(43, 12); + this.lbl16.TabIndex = 20; + this.lbl16.Text = "右パッド"; + // + // winCustomTextBox15 + // + this.winCustomTextBox15.BackColor = System.Drawing.SystemColors.Window; + this.winCustomTextBox15.CheckRegExp = null; + checkType7.IsDate = false; + checkType7.IsHankaku = false; + checkType7.IsHanKatakana = true; + checkType7.IsHiragana = false; + checkType7.IsKatakana = false; + checkType7.IsNumeric = false; + checkType7.IsZenkaku = false; + checkType7.Required = false; + this.winCustomTextBox15.CheckType = checkType7; + this.winCustomTextBox15.CheckValidating = true; + this.winCustomTextBox15.Location = new System.Drawing.Point(113, 468); + this.winCustomTextBox15.Name = "winCustomTextBox15"; + this.winCustomTextBox15.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox15.TabIndex = 20; + // + // winCustomTextBox7 + // + this.winCustomTextBox7.CheckRegExp = null; + editPadding4.PadChar = '0'; + editPadding4.PadDir = Touryo.Infrastructure.CustomControl.RichClient.PadDirection.Left; + this.winCustomTextBox7.EditPadding = editPadding4; + this.winCustomTextBox7.Location = new System.Drawing.Point(138, 156); + this.winCustomTextBox7.MaxLength = 10; + this.winCustomTextBox7.Name = "winCustomTextBox7"; + this.winCustomTextBox7.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox7.TabIndex = 6; + this.winCustomTextBox7.TextChanged += new System.EventHandler(this.winCustomTextBox_TextChanged); + // + // lbl24 + // + this.lbl24.AutoSize = true; + this.lbl24.Location = new System.Drawing.Point(14, 396); + this.lbl24.Name = "lbl24"; + this.lbl24.Size = new System.Drawing.Size(29, 12); + this.lbl24.TabIndex = 36; + this.lbl24.Text = "全角"; + // + // lbl17 + // + this.lbl17.AutoSize = true; + this.lbl17.Location = new System.Drawing.Point(14, 159); + this.lbl17.Name = "lbl17"; + this.lbl17.Size = new System.Drawing.Size(43, 12); + this.lbl17.TabIndex = 22; + this.lbl17.Text = "左パッド"; + // + // winCustomTextBox14 + // + this.winCustomTextBox14.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox14.CheckRegExp = null; + checkType8.IsDate = false; + checkType8.IsHankaku = false; + checkType8.IsHanKatakana = false; + checkType8.IsHiragana = false; + checkType8.IsKatakana = true; + checkType8.IsNumeric = false; + checkType8.IsZenkaku = false; + checkType8.Required = false; + this.winCustomTextBox14.CheckType = checkType8; + this.winCustomTextBox14.CheckValidating = true; + this.winCustomTextBox14.Location = new System.Drawing.Point(113, 443); + this.winCustomTextBox14.Name = "winCustomTextBox14"; + this.winCustomTextBox14.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox14.TabIndex = 19; + // + // lbl18 + // + this.lbl18.AutoSize = true; + this.lbl18.Location = new System.Drawing.Point(14, 187); + this.lbl18.Name = "lbl18"; + this.lbl18.Size = new System.Drawing.Size(284, 12); + this.lbl18.TabIndex = 23; + this.lbl18.Text = "組み合わせて編集をテスト：３桁区切り、小数点以下2, 6桁"; + // + // lbl23 + // + this.lbl23.AutoSize = true; + this.lbl23.Location = new System.Drawing.Point(14, 371); + this.lbl23.Name = "lbl23"; + this.lbl23.Size = new System.Drawing.Size(29, 12); + this.lbl23.TabIndex = 34; + this.lbl23.Text = "半角"; + // + // winCustomTextBox9 + // + this.winCustomTextBox9.BackColor = System.Drawing.SystemColors.Window; + this.winCustomTextBox9.CheckRegExp = null; + this.winCustomTextBox9.CheckValidating = true; + this.winCustomTextBox9.Location = new System.Drawing.Point(113, 318); + this.winCustomTextBox9.Name = "winCustomTextBox9"; + this.winCustomTextBox9.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox9.TabIndex = 14; + // + // winCustomTextBox12 + // + this.winCustomTextBox12.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox12.CheckRegExp = null; + checkType9.IsDate = false; + checkType9.IsHankaku = false; + checkType9.IsHanKatakana = false; + checkType9.IsHiragana = false; + checkType9.IsKatakana = false; + checkType9.IsNumeric = false; + checkType9.IsZenkaku = true; + checkType9.Required = false; + this.winCustomTextBox12.CheckType = checkType9; + this.winCustomTextBox12.CheckValidating = true; + this.winCustomTextBox12.Location = new System.Drawing.Point(113, 393); + this.winCustomTextBox12.Name = "winCustomTextBox12"; + this.winCustomTextBox12.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox12.TabIndex = 17; + // + // winCustomTextBox10 + // + this.winCustomTextBox10.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.winCustomTextBox10.CheckRegExp = null; + checkType10.IsDate = false; + checkType10.IsHankaku = false; + checkType10.IsHanKatakana = false; + checkType10.IsHiragana = false; + checkType10.IsKatakana = false; + checkType10.IsNumeric = false; + checkType10.IsZenkaku = false; + checkType10.Required = true; + this.winCustomTextBox10.CheckType = checkType10; + this.winCustomTextBox10.CheckValidating = true; + this.winCustomTextBox10.Location = new System.Drawing.Point(113, 343); + this.winCustomTextBox10.Name = "winCustomTextBox10"; + this.winCustomTextBox10.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox10.TabIndex = 15; + // + // lbl25 + // + this.lbl25.AutoSize = true; + this.lbl25.Location = new System.Drawing.Point(14, 421); + this.lbl25.Name = "lbl25"; + this.lbl25.Size = new System.Drawing.Size(29, 12); + this.lbl25.TabIndex = 32; + this.lbl25.Text = "数値"; + // + // lbl21 + // + this.lbl21.AutoSize = true; + this.lbl21.Location = new System.Drawing.Point(14, 321); + this.lbl21.Name = "lbl21"; + this.lbl21.Size = new System.Drawing.Size(36, 12); + this.lbl21.TabIndex = 26; + this.lbl21.Text = "チェック"; + // + // winCustomTextBox11 + // + this.winCustomTextBox11.BackColor = System.Drawing.SystemColors.Window; + this.winCustomTextBox11.CheckRegExp = null; + checkType11.IsDate = false; + checkType11.IsHankaku = true; + checkType11.IsHanKatakana = false; + checkType11.IsHiragana = false; + checkType11.IsKatakana = false; + checkType11.IsNumeric = false; + checkType11.IsZenkaku = false; + checkType11.Required = false; + this.winCustomTextBox11.CheckType = checkType11; + this.winCustomTextBox11.CheckValidating = true; + this.winCustomTextBox11.Location = new System.Drawing.Point(113, 368); + this.winCustomTextBox11.Name = "winCustomTextBox11"; + this.winCustomTextBox11.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox11.TabIndex = 16; + // + // lbl19 + // + this.lbl19.AutoSize = true; + this.lbl19.Location = new System.Drawing.Point(258, 9); + this.lbl19.Name = "lbl19"; + this.lbl19.Size = new System.Drawing.Size(124, 12); + this.lbl19.TabIndex = 27; + this.lbl19.Text = "テキストチェンジ動作確認"; + // + // lbl22 + // + this.lbl22.AutoSize = true; + this.lbl22.Location = new System.Drawing.Point(14, 346); + this.lbl22.Name = "lbl22"; + this.lbl22.Size = new System.Drawing.Size(53, 12); + this.lbl22.TabIndex = 30; + this.lbl22.Text = "必須入力"; + // + // winCustomTextBox8 + // + this.winCustomTextBox8.CheckRegExp = null; + this.winCustomTextBox8.DisplayUnits = ((uint)(6u)); + this.winCustomTextBox8.EditAddFigure = Touryo.Infrastructure.CustomControl.RichClient.EditAddFigure.Af3; + editDigitsAfterDP6.DigitsAfterDP = ((uint)(2u)); + editDigitsAfterDP6.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod.Floor; + this.winCustomTextBox8.EditDigitsAfterDP = editDigitsAfterDP6; + editDigitsAfterDP7.DigitsAfterDP = ((uint)(6u)); + editDigitsAfterDP7.HowToCut = Touryo.Infrastructure.CustomControl.RichClient.CutMethod.Banker; + this.winCustomTextBox8.EditDigitsAfterDP_Editing = editDigitsAfterDP7; + this.winCustomTextBox8.Location = new System.Drawing.Point(16, 231); + this.winCustomTextBox8.MaxLength = 10; + this.winCustomTextBox8.Name = "winCustomTextBox8"; + this.winCustomTextBox8.Size = new System.Drawing.Size(384, 19); + this.winCustomTextBox8.TabIndex = 13; + // + // winCustomTextBox13 + // + this.winCustomTextBox13.BackColor = System.Drawing.SystemColors.Window; + this.winCustomTextBox13.CheckRegExp = null; + checkType12.IsDate = false; + checkType12.IsHankaku = false; + checkType12.IsHanKatakana = false; + checkType12.IsHiragana = false; + checkType12.IsKatakana = false; + checkType12.IsNumeric = true; + checkType12.IsZenkaku = false; + checkType12.Required = false; + this.winCustomTextBox13.CheckType = checkType12; + this.winCustomTextBox13.CheckValidating = true; + this.winCustomTextBox13.Location = new System.Drawing.Point(113, 418); + this.winCustomTextBox13.Name = "winCustomTextBox13"; + this.winCustomTextBox13.Size = new System.Drawing.Size(100, 19); + this.winCustomTextBox13.TabIndex = 18; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.lbl44); + this.tabPage2.Controls.Add(this.lbl3c); + this.tabPage2.Controls.Add(this.button3); + this.tabPage2.Controls.Add(this.lbl43); + this.tabPage2.Controls.Add(this.lbl42); + this.tabPage2.Controls.Add(this.lbl41); + this.tabPage2.Controls.Add(this.lbl3b); + this.tabPage2.Controls.Add(this.lbl3a); + this.tabPage2.Controls.Add(this.lbl39); + this.tabPage2.Controls.Add(this.lbl38); + this.tabPage2.Controls.Add(this.lbl37); + this.tabPage2.Controls.Add(this.lbl36); + this.tabPage2.Controls.Add(this.lbl34); + this.tabPage2.Controls.Add(this.lbl33); + this.tabPage2.Controls.Add(this.lbl35); + this.tabPage2.Controls.Add(this.lbl31); + this.tabPage2.Controls.Add(this.lbl32); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox14); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox11_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox10_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox9_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox8_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox7_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox6_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox5_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox4_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox3_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox2_2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox13); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox12); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox11); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox10); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox9); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox8); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox7); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox6); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox5); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox4); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox3); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox2); + this.tabPage2.Controls.Add(this.winCustomMaskedTextBox1); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(417, 604); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "MaskedTextBox"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // lbl44 + // + this.lbl44.AutoSize = true; + this.lbl44.Location = new System.Drawing.Point(19, 457); + this.lbl44.Name = "lbl44"; + this.lbl44.Size = new System.Drawing.Size(65, 12); + this.lbl44.TabIndex = 85; + this.lbl44.Text = "全角＆数値"; + // + // lbl3c + // + this.lbl3c.AutoSize = true; + this.lbl3c.Location = new System.Drawing.Point(246, 17); + this.lbl3c.Name = "lbl3c"; + this.lbl3c.Size = new System.Drawing.Size(124, 12); + this.lbl3c.TabIndex = 83; + this.lbl3c.Text = "テキストチェンジ動作確認"; + // + // button3 + // + this.button3.Location = new System.Drawing.Point(19, 522); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(382, 65); + this.button3.TabIndex = 82; + this.button3.Text = "値取得プロパティ プロシージャ（入力時、マスク時）"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // lbl43 + // + this.lbl43.AutoSize = true; + this.lbl43.Location = new System.Drawing.Point(19, 406); + this.lbl43.Name = "lbl43"; + this.lbl43.Size = new System.Drawing.Size(65, 12); + this.lbl43.TabIndex = 68; + this.lbl43.Text = "半角＆数値"; + // + // lbl42 + // + this.lbl42.AutoSize = true; + this.lbl42.Location = new System.Drawing.Point(19, 356); + this.lbl42.Name = "lbl42"; + this.lbl42.Size = new System.Drawing.Size(65, 12); + this.lbl42.TabIndex = 67; + this.lbl42.Text = "半角＆禁則"; + // + // lbl41 + // + this.lbl41.AutoSize = true; + this.lbl41.Location = new System.Drawing.Point(19, 331); + this.lbl41.Name = "lbl41"; + this.lbl41.Size = new System.Drawing.Size(135, 12); + this.lbl41.TabIndex = 66; + this.lbl41.Text = "組み合わせてチェックをテスト"; + // + // lbl3b + // + this.lbl3b.AutoSize = true; + this.lbl3b.Location = new System.Drawing.Point(19, 267); + this.lbl3b.Name = "lbl3b"; + this.lbl3b.Size = new System.Drawing.Size(29, 12); + this.lbl3b.TabIndex = 65; + this.lbl3b.Text = "禁則"; + // + // lbl3a + // + this.lbl3a.AutoSize = true; + this.lbl3a.Location = new System.Drawing.Point(19, 242); + this.lbl3a.Name = "lbl3a"; + this.lbl3a.Size = new System.Drawing.Size(89, 12); + this.lbl3a.TabIndex = 64; + this.lbl3a.Text = "正規表現（郵便）"; + // + // lbl39 + // + this.lbl39.AutoSize = true; + this.lbl39.Location = new System.Drawing.Point(19, 217); + this.lbl39.Name = "lbl39"; + this.lbl39.Size = new System.Drawing.Size(29, 12); + this.lbl39.TabIndex = 63; + this.lbl39.Text = "日付"; + // + // lbl38 + // + this.lbl38.AutoSize = true; + this.lbl38.Location = new System.Drawing.Point(19, 192); + this.lbl38.Name = "lbl38"; + this.lbl38.Size = new System.Drawing.Size(41, 12); + this.lbl38.TabIndex = 62; + this.lbl38.Text = "平仮名"; + // + // lbl37 + // + this.lbl37.AutoSize = true; + this.lbl37.Location = new System.Drawing.Point(17, 167); + this.lbl37.Name = "lbl37"; + this.lbl37.Size = new System.Drawing.Size(65, 12); + this.lbl37.TabIndex = 61; + this.lbl37.Text = "半角片仮名"; + // + // lbl36 + // + this.lbl36.AutoSize = true; + this.lbl36.Location = new System.Drawing.Point(17, 142); + this.lbl36.Name = "lbl36"; + this.lbl36.Size = new System.Drawing.Size(41, 12); + this.lbl36.TabIndex = 60; + this.lbl36.Text = "片仮名"; + // + // lbl34 + // + this.lbl34.AutoSize = true; + this.lbl34.Location = new System.Drawing.Point(17, 92); + this.lbl34.Name = "lbl34"; + this.lbl34.Size = new System.Drawing.Size(29, 12); + this.lbl34.TabIndex = 59; + this.lbl34.Text = "全角"; + // + // lbl33 + // + this.lbl33.AutoSize = true; + this.lbl33.Location = new System.Drawing.Point(17, 67); + this.lbl33.Name = "lbl33"; + this.lbl33.Size = new System.Drawing.Size(29, 12); + this.lbl33.TabIndex = 58; + this.lbl33.Text = "半角"; + // + // lbl35 + // + this.lbl35.AutoSize = true; + this.lbl35.Location = new System.Drawing.Point(17, 117); + this.lbl35.Name = "lbl35"; + this.lbl35.Size = new System.Drawing.Size(29, 12); + this.lbl35.TabIndex = 57; + this.lbl35.Text = "数値"; + // + // lbl31 + // + this.lbl31.AutoSize = true; + this.lbl31.Location = new System.Drawing.Point(17, 17); + this.lbl31.Name = "lbl31"; + this.lbl31.Size = new System.Drawing.Size(36, 12); + this.lbl31.TabIndex = 55; + this.lbl31.Text = "チェック"; + // + // lbl32 + // + this.lbl32.AutoSize = true; + this.lbl32.Location = new System.Drawing.Point(17, 42); + this.lbl32.Name = "lbl32"; + this.lbl32.Size = new System.Drawing.Size(53, 12); + this.lbl32.TabIndex = 56; + this.lbl32.Text = "必須入力"; + // + // winCustomMaskedTextBox14 + // + this.winCustomMaskedTextBox14.CheckRegExp = null; + checkType13.IsDate = false; + checkType13.IsHankaku = false; + checkType13.IsHanKatakana = false; + checkType13.IsHiragana = false; + checkType13.IsKatakana = false; + checkType13.IsNumeric = true; + checkType13.IsZenkaku = true; + checkType13.Required = false; + this.winCustomMaskedTextBox14.CheckType = checkType13; + this.winCustomMaskedTextBox14.CheckValidating = true; + this.winCustomMaskedTextBox14.Location = new System.Drawing.Point(21, 479); + this.winCustomMaskedTextBox14.Mask_Editing = ""; + this.winCustomMaskedTextBox14.Name = "winCustomMaskedTextBox14"; + this.winCustomMaskedTextBox14.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox14.TabIndex = 84; + // + // winCustomMaskedTextBox11_2 + // + this.winCustomMaskedTextBox11_2.CheckProhibitedChar = true; + this.winCustomMaskedTextBox11_2.CheckRegExp = null; + this.winCustomMaskedTextBox11_2.Location = new System.Drawing.Point(248, 264); + this.winCustomMaskedTextBox11_2.Mask_Editing = null; + this.winCustomMaskedTextBox11_2.Name = "winCustomMaskedTextBox11_2"; + this.winCustomMaskedTextBox11_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox11_2.TabIndex = 20; + // + // winCustomMaskedTextBox10_2 + // + this.winCustomMaskedTextBox10_2.CheckRegExp = "^〒[0-9]{3}-?[0-9]{4}$"; + this.winCustomMaskedTextBox10_2.Location = new System.Drawing.Point(248, 239); + this.winCustomMaskedTextBox10_2.Mask_Editing = "0000000"; + this.winCustomMaskedTextBox10_2.Name = "winCustomMaskedTextBox10_2"; + this.winCustomMaskedTextBox10_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox10_2.TabIndex = 19; + // + // winCustomMaskedTextBox9_2 + // + this.winCustomMaskedTextBox9_2.CheckRegExp = null; + checkType14.IsDate = true; + checkType14.IsHankaku = false; + checkType14.IsHanKatakana = false; + checkType14.IsHiragana = false; + checkType14.IsKatakana = false; + checkType14.IsNumeric = false; + checkType14.IsZenkaku = false; + checkType14.Required = false; + this.winCustomMaskedTextBox9_2.CheckType = checkType14; + this.winCustomMaskedTextBox9_2.Location = new System.Drawing.Point(248, 214); + this.winCustomMaskedTextBox9_2.Mask = "0000/00/00"; + this.winCustomMaskedTextBox9_2.Mask_Editing = "0000年00月00日"; + this.winCustomMaskedTextBox9_2.Name = "winCustomMaskedTextBox9_2"; + this.winCustomMaskedTextBox9_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox9_2.TabIndex = 18; + this.winCustomMaskedTextBox9_2.Text = " / /"; + // + // winCustomMaskedTextBox8_2 + // + this.winCustomMaskedTextBox8_2.CheckRegExp = null; + checkType15.IsDate = false; + checkType15.IsHankaku = false; + checkType15.IsHanKatakana = false; + checkType15.IsHiragana = true; + checkType15.IsKatakana = false; + checkType15.IsNumeric = false; + checkType15.IsZenkaku = false; + checkType15.Required = false; + this.winCustomMaskedTextBox8_2.CheckType = checkType15; + this.winCustomMaskedTextBox8_2.Location = new System.Drawing.Point(248, 189); + this.winCustomMaskedTextBox8_2.Mask = "CCCC"; + this.winCustomMaskedTextBox8_2.Mask_Editing = "ヒラガナ：CCCC"; + this.winCustomMaskedTextBox8_2.Name = "winCustomMaskedTextBox8_2"; + this.winCustomMaskedTextBox8_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox8_2.TabIndex = 17; + // + // winCustomMaskedTextBox7_2 + // + this.winCustomMaskedTextBox7_2.CheckRegExp = null; + checkType16.IsDate = false; + checkType16.IsHankaku = false; + checkType16.IsHanKatakana = true; + checkType16.IsHiragana = false; + checkType16.IsKatakana = false; + checkType16.IsNumeric = false; + checkType16.IsZenkaku = false; + checkType16.Required = false; + this.winCustomMaskedTextBox7_2.CheckType = checkType16; + this.winCustomMaskedTextBox7_2.Location = new System.Drawing.Point(248, 164); + this.winCustomMaskedTextBox7_2.Mask = "CCCC"; + this.winCustomMaskedTextBox7_2.Mask_Editing = "半角片仮名：CCCC"; + this.winCustomMaskedTextBox7_2.Name = "winCustomMaskedTextBox7_2"; + this.winCustomMaskedTextBox7_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox7_2.TabIndex = 16; + // + // winCustomMaskedTextBox6_2 + // + this.winCustomMaskedTextBox6_2.CheckRegExp = null; + checkType17.IsDate = false; + checkType17.IsHankaku = false; + checkType17.IsHanKatakana = false; + checkType17.IsHiragana = false; + checkType17.IsKatakana = true; + checkType17.IsNumeric = false; + checkType17.IsZenkaku = false; + checkType17.Required = false; + this.winCustomMaskedTextBox6_2.CheckType = checkType17; + this.winCustomMaskedTextBox6_2.Location = new System.Drawing.Point(248, 139); + this.winCustomMaskedTextBox6_2.Mask = "CCCC"; + this.winCustomMaskedTextBox6_2.Mask_Editing = "片仮名：CCCC"; + this.winCustomMaskedTextBox6_2.Name = "winCustomMaskedTextBox6_2"; + this.winCustomMaskedTextBox6_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox6_2.TabIndex = 15; + // + // winCustomMaskedTextBox5_2 + // + this.winCustomMaskedTextBox5_2.CheckRegExp = null; + checkType18.IsDate = false; + checkType18.IsHankaku = false; + checkType18.IsHanKatakana = false; + checkType18.IsHiragana = false; + checkType18.IsKatakana = false; + checkType18.IsNumeric = true; + checkType18.IsZenkaku = false; + checkType18.Required = false; + this.winCustomMaskedTextBox5_2.CheckType = checkType18; + this.winCustomMaskedTextBox5_2.Location = new System.Drawing.Point(248, 114); + this.winCustomMaskedTextBox5_2.Mask_Editing = "CCCCCCCC"; + this.winCustomMaskedTextBox5_2.Name = "winCustomMaskedTextBox5_2"; + this.winCustomMaskedTextBox5_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox5_2.TabIndex = 14; + // + // winCustomMaskedTextBox4_2 + // + this.winCustomMaskedTextBox4_2.CheckRegExp = null; + checkType19.IsDate = false; + checkType19.IsHankaku = false; + checkType19.IsHanKatakana = false; + checkType19.IsHiragana = false; + checkType19.IsKatakana = false; + checkType19.IsNumeric = false; + checkType19.IsZenkaku = true; + checkType19.Required = false; + this.winCustomMaskedTextBox4_2.CheckType = checkType19; + this.winCustomMaskedTextBox4_2.Location = new System.Drawing.Point(248, 89); + this.winCustomMaskedTextBox4_2.Mask_Editing = "CCCC"; + this.winCustomMaskedTextBox4_2.Name = "winCustomMaskedTextBox4_2"; + this.winCustomMaskedTextBox4_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox4_2.TabIndex = 13; + // + // winCustomMaskedTextBox3_2 + // + this.winCustomMaskedTextBox3_2.CheckRegExp = null; + checkType20.IsDate = false; + checkType20.IsHankaku = true; + checkType20.IsHanKatakana = false; + checkType20.IsHiragana = false; + checkType20.IsKatakana = false; + checkType20.IsNumeric = false; + checkType20.IsZenkaku = false; + checkType20.Required = false; + this.winCustomMaskedTextBox3_2.CheckType = checkType20; + this.winCustomMaskedTextBox3_2.Location = new System.Drawing.Point(248, 64); + this.winCustomMaskedTextBox3_2.Mask_Editing = "CCCC"; + this.winCustomMaskedTextBox3_2.Name = "winCustomMaskedTextBox3_2"; + this.winCustomMaskedTextBox3_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox3_2.TabIndex = 12; + // + // winCustomMaskedTextBox2_2 + // + this.winCustomMaskedTextBox2_2.CheckRegExp = null; + checkType21.IsDate = false; + checkType21.IsHankaku = false; + checkType21.IsHanKatakana = false; + checkType21.IsHiragana = false; + checkType21.IsKatakana = false; + checkType21.IsNumeric = false; + checkType21.IsZenkaku = false; + checkType21.Required = true; + this.winCustomMaskedTextBox2_2.CheckType = checkType21; + this.winCustomMaskedTextBox2_2.Location = new System.Drawing.Point(248, 39); + this.winCustomMaskedTextBox2_2.Mask = "00000000"; + this.winCustomMaskedTextBox2_2.Mask_Editing = "00000000"; + this.winCustomMaskedTextBox2_2.Name = "winCustomMaskedTextBox2_2"; + this.winCustomMaskedTextBox2_2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox2_2.TabIndex = 11; + // + // winCustomMaskedTextBox13 + // + this.winCustomMaskedTextBox13.CheckRegExp = null; + checkType22.IsDate = false; + checkType22.IsHankaku = true; + checkType22.IsHanKatakana = false; + checkType22.IsHiragana = false; + checkType22.IsKatakana = false; + checkType22.IsNumeric = true; + checkType22.IsZenkaku = false; + checkType22.Required = false; + this.winCustomMaskedTextBox13.CheckType = checkType22; + this.winCustomMaskedTextBox13.CheckValidating = true; + this.winCustomMaskedTextBox13.EditToHankaku = true; + this.winCustomMaskedTextBox13.Location = new System.Drawing.Point(21, 428); + this.winCustomMaskedTextBox13.Mask_Editing = ""; + this.winCustomMaskedTextBox13.Name = "winCustomMaskedTextBox13"; + this.winCustomMaskedTextBox13.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox13.TabIndex = 22; + // + // winCustomMaskedTextBox12 + // + this.winCustomMaskedTextBox12.CheckProhibitedChar = true; + this.winCustomMaskedTextBox12.CheckRegExp = null; + checkType23.IsDate = false; + checkType23.IsHankaku = true; + checkType23.IsHanKatakana = false; + checkType23.IsHiragana = false; + checkType23.IsKatakana = false; + checkType23.IsNumeric = false; + checkType23.IsZenkaku = false; + checkType23.Required = false; + this.winCustomMaskedTextBox12.CheckType = checkType23; + this.winCustomMaskedTextBox12.CheckValidating = true; + this.winCustomMaskedTextBox12.EditToHankaku = true; + this.winCustomMaskedTextBox12.Location = new System.Drawing.Point(21, 378); + this.winCustomMaskedTextBox12.Mask_Editing = null; + this.winCustomMaskedTextBox12.Name = "winCustomMaskedTextBox12"; + this.winCustomMaskedTextBox12.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox12.TabIndex = 21; + // + // winCustomMaskedTextBox11 + // + this.winCustomMaskedTextBox11.CheckProhibitedChar = true; + this.winCustomMaskedTextBox11.CheckRegExp = null; + this.winCustomMaskedTextBox11.CheckValidating = true; + this.winCustomMaskedTextBox11.Location = new System.Drawing.Point(116, 264); + this.winCustomMaskedTextBox11.Mask_Editing = null; + this.winCustomMaskedTextBox11.Name = "winCustomMaskedTextBox11"; + this.winCustomMaskedTextBox11.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox11.TabIndex = 10; + this.winCustomMaskedTextBox11.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox10 + // + this.winCustomMaskedTextBox10.CheckRegExp = "^〒[0-9]{3}-?[0-9]{4}$"; + this.winCustomMaskedTextBox10.CheckValidating = true; + this.winCustomMaskedTextBox10.Location = new System.Drawing.Point(116, 239); + this.winCustomMaskedTextBox10.Mask_Editing = "CCCCCCCCC"; + this.winCustomMaskedTextBox10.Name = "winCustomMaskedTextBox10"; + this.winCustomMaskedTextBox10.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox10.TabIndex = 9; + this.winCustomMaskedTextBox10.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox9 + // + this.winCustomMaskedTextBox9.CheckRegExp = null; + checkType24.IsDate = true; + checkType24.IsHankaku = false; + checkType24.IsHanKatakana = false; + checkType24.IsHiragana = false; + checkType24.IsKatakana = false; + checkType24.IsNumeric = false; + checkType24.IsZenkaku = false; + checkType24.Required = false; + this.winCustomMaskedTextBox9.CheckType = checkType24; + this.winCustomMaskedTextBox9.CheckValidating = true; + this.winCustomMaskedTextBox9.EditToHankaku = true; + this.winCustomMaskedTextBox9.EditToYYYYMMDD = true; + this.winCustomMaskedTextBox9.Location = new System.Drawing.Point(116, 214); + this.winCustomMaskedTextBox9.Mask = "0000/00/00"; + this.winCustomMaskedTextBox9.Mask_Editing = "0000年00月00日"; + this.winCustomMaskedTextBox9.Name = "winCustomMaskedTextBox9"; + this.winCustomMaskedTextBox9.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox9.TabIndex = 8; + this.winCustomMaskedTextBox9.Text = " / /"; + this.winCustomMaskedTextBox9.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox8 + // + this.winCustomMaskedTextBox8.CheckRegExp = null; + checkType25.IsDate = false; + checkType25.IsHankaku = false; + checkType25.IsHanKatakana = false; + checkType25.IsHiragana = true; + checkType25.IsKatakana = false; + checkType25.IsNumeric = false; + checkType25.IsZenkaku = false; + checkType25.Required = false; + this.winCustomMaskedTextBox8.CheckType = checkType25; + this.winCustomMaskedTextBox8.CheckValidating = true; + this.winCustomMaskedTextBox8.Location = new System.Drawing.Point(116, 189); + this.winCustomMaskedTextBox8.Mask = "CCCC"; + this.winCustomMaskedTextBox8.Mask_Editing = "ヒラガナ：CCCC"; + this.winCustomMaskedTextBox8.Name = "winCustomMaskedTextBox8"; + this.winCustomMaskedTextBox8.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox8.TabIndex = 7; + this.winCustomMaskedTextBox8.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox7 + // + this.winCustomMaskedTextBox7.CheckRegExp = null; + checkType26.IsDate = false; + checkType26.IsHankaku = false; + checkType26.IsHanKatakana = true; + checkType26.IsHiragana = false; + checkType26.IsKatakana = false; + checkType26.IsNumeric = false; + checkType26.IsZenkaku = false; + checkType26.Required = false; + this.winCustomMaskedTextBox7.CheckType = checkType26; + this.winCustomMaskedTextBox7.CheckValidating = true; + this.winCustomMaskedTextBox7.EditToHankaku = true; + this.winCustomMaskedTextBox7.Location = new System.Drawing.Point(116, 164); + this.winCustomMaskedTextBox7.Mask = "CCCC"; + this.winCustomMaskedTextBox7.Mask_Editing = "半角片仮名：CCCC"; + this.winCustomMaskedTextBox7.Name = "winCustomMaskedTextBox7"; + this.winCustomMaskedTextBox7.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox7.TabIndex = 6; + this.winCustomMaskedTextBox7.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox6 + // + this.winCustomMaskedTextBox6.CheckRegExp = null; + checkType27.IsDate = false; + checkType27.IsHankaku = false; + checkType27.IsHanKatakana = false; + checkType27.IsHiragana = false; + checkType27.IsKatakana = true; + checkType27.IsNumeric = false; + checkType27.IsZenkaku = false; + checkType27.Required = false; + this.winCustomMaskedTextBox6.CheckType = checkType27; + this.winCustomMaskedTextBox6.CheckValidating = true; + this.winCustomMaskedTextBox6.Location = new System.Drawing.Point(116, 139); + this.winCustomMaskedTextBox6.Mask = "CCCC"; + this.winCustomMaskedTextBox6.Mask_Editing = "片仮名：CCCC"; + this.winCustomMaskedTextBox6.Name = "winCustomMaskedTextBox6"; + this.winCustomMaskedTextBox6.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox6.TabIndex = 5; + this.winCustomMaskedTextBox6.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox5 + // + this.winCustomMaskedTextBox5.CheckRegExp = null; + checkType28.IsDate = false; + checkType28.IsHankaku = false; + checkType28.IsHanKatakana = false; + checkType28.IsHiragana = false; + checkType28.IsKatakana = false; + checkType28.IsNumeric = true; + checkType28.IsZenkaku = false; + checkType28.Required = false; + this.winCustomMaskedTextBox5.CheckType = checkType28; + this.winCustomMaskedTextBox5.CheckValidating = true; + this.winCustomMaskedTextBox5.Location = new System.Drawing.Point(116, 114); + this.winCustomMaskedTextBox5.Mask_Editing = "CCCCCCCC"; + this.winCustomMaskedTextBox5.Name = "winCustomMaskedTextBox5"; + this.winCustomMaskedTextBox5.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox5.TabIndex = 4; + this.winCustomMaskedTextBox5.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox4 + // + this.winCustomMaskedTextBox4.CheckRegExp = null; + checkType29.IsDate = false; + checkType29.IsHankaku = false; + checkType29.IsHanKatakana = false; + checkType29.IsHiragana = false; + checkType29.IsKatakana = false; + checkType29.IsNumeric = false; + checkType29.IsZenkaku = true; + checkType29.Required = false; + this.winCustomMaskedTextBox4.CheckType = checkType29; + this.winCustomMaskedTextBox4.CheckValidating = true; + this.winCustomMaskedTextBox4.Location = new System.Drawing.Point(116, 89); + this.winCustomMaskedTextBox4.Mask_Editing = "CCCC"; + this.winCustomMaskedTextBox4.Name = "winCustomMaskedTextBox4"; + this.winCustomMaskedTextBox4.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox4.TabIndex = 3; + this.winCustomMaskedTextBox4.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox3 + // + this.winCustomMaskedTextBox3.CheckRegExp = null; + checkType30.IsDate = false; + checkType30.IsHankaku = true; + checkType30.IsHanKatakana = false; + checkType30.IsHiragana = false; + checkType30.IsKatakana = false; + checkType30.IsNumeric = false; + checkType30.IsZenkaku = false; + checkType30.Required = false; + this.winCustomMaskedTextBox3.CheckType = checkType30; + this.winCustomMaskedTextBox3.CheckValidating = true; + this.winCustomMaskedTextBox3.EditToHankaku = true; + this.winCustomMaskedTextBox3.Location = new System.Drawing.Point(116, 64); + this.winCustomMaskedTextBox3.Mask_Editing = "CCCC"; + this.winCustomMaskedTextBox3.Name = "winCustomMaskedTextBox3"; + this.winCustomMaskedTextBox3.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox3.TabIndex = 2; + this.winCustomMaskedTextBox3.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox2 + // + this.winCustomMaskedTextBox2.CheckRegExp = null; + checkType31.IsDate = false; + checkType31.IsHankaku = false; + checkType31.IsHanKatakana = false; + checkType31.IsHiragana = false; + checkType31.IsKatakana = false; + checkType31.IsNumeric = false; + checkType31.IsZenkaku = false; + checkType31.Required = true; + this.winCustomMaskedTextBox2.CheckType = checkType31; + this.winCustomMaskedTextBox2.CheckValidating = true; + this.winCustomMaskedTextBox2.Location = new System.Drawing.Point(116, 39); + this.winCustomMaskedTextBox2.Mask = "00000000"; + this.winCustomMaskedTextBox2.Mask_Editing = "00000000"; + this.winCustomMaskedTextBox2.Name = "winCustomMaskedTextBox2"; + this.winCustomMaskedTextBox2.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox2.TabIndex = 1; + this.winCustomMaskedTextBox2.TextChanged += new System.EventHandler(this.winCustomMaskedTextBox_TextChanged); + // + // winCustomMaskedTextBox1 + // + this.winCustomMaskedTextBox1.CheckRegExp = null; + this.winCustomMaskedTextBox1.Location = new System.Drawing.Point(116, 14); + this.winCustomMaskedTextBox1.Mask_Editing = null; + this.winCustomMaskedTextBox1.Name = "winCustomMaskedTextBox1"; + this.winCustomMaskedTextBox1.Size = new System.Drawing.Size(100, 19); + this.winCustomMaskedTextBox1.TabIndex = 0; + // + // winCustomDropDownList3 + // + this.winCustomDropDownList3.FormattingEnabled = true; + this.winCustomDropDownList3.Location = new System.Drawing.Point(716, 481); + this.winCustomDropDownList3.MasterDataName = "TEST3"; + this.winCustomDropDownList3.Name = "winCustomDropDownList3"; + this.winCustomDropDownList3.Size = new System.Drawing.Size(121, 20); + this.winCustomDropDownList3.TabIndex = 53; + // + // winCustomDropDownList2 + // + this.winCustomDropDownList2.FormattingEnabled = true; + this.winCustomDropDownList2.Location = new System.Drawing.Point(589, 481); + this.winCustomDropDownList2.MasterDataName = "TEST2"; + this.winCustomDropDownList2.Name = "winCustomDropDownList2"; + this.winCustomDropDownList2.Size = new System.Drawing.Size(121, 20); + this.winCustomDropDownList2.TabIndex = 52; + // + // winCustomDropDownList1 + // + this.winCustomDropDownList1.FormattingEnabled = true; + this.winCustomDropDownList1.Location = new System.Drawing.Point(462, 481); + this.winCustomDropDownList1.MasterDataName = "TEST1"; + this.winCustomDropDownList1.Name = "winCustomDropDownList1"; + this.winCustomDropDownList1.Size = new System.Drawing.Size(121, 20); + this.winCustomDropDownList1.TabIndex = 51; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(462, 528); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(121, 19); + this.textBox1.TabIndex = 55; + // + // button4 + // + this.button4.Location = new System.Drawing.Point(589, 526); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(246, 23); + this.button4.TabIndex = 56; + this.button4.Text = "バインディング・ソースの更新と変更通知"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(847, 654); + this.Controls.Add(this.button4); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.winCustomDropDownList3); + this.Controls.Add(this.winCustomDropDownList2); + this.Controls.Add(this.winCustomDropDownList1); + this.Controls.Add(this.button1); + this.Controls.Add(this.dataGridView1); + this.Name = "Form1"; + this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomDropDownList winCustomDropDownList1; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomDropDownList winCustomDropDownList2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomDropDownList winCustomDropDownList3; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox7_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox6_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox5_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox4_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox3_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox2_2; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Label lbl2h; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox23; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox22; + private System.Windows.Forms.Label lbl2g; + private System.Windows.Forms.Label lbl2f; + private System.Windows.Forms.Label lbl2e; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox21; + private System.Windows.Forms.Label lbl2d; + private System.Windows.Forms.Label lbl2c; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox20; + private System.Windows.Forms.Label lbl2b; + private System.Windows.Forms.Label lbl11; + private System.Windows.Forms.Label lbl12; + private System.Windows.Forms.Label lbl13; + private System.Windows.Forms.Label lbl2a; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox19; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox3; + private System.Windows.Forms.Label lbl29; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox1; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox18; + private System.Windows.Forms.Label lbl14; + private System.Windows.Forms.Label lbl28; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox4; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox17; + private System.Windows.Forms.Label lbl15; + private System.Windows.Forms.Label lbl27; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox5; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox16; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox6; + private System.Windows.Forms.Label lbl26; + private System.Windows.Forms.Label lbl16; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox15; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox7; + private System.Windows.Forms.Label lbl24; + private System.Windows.Forms.Label lbl17; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox14; + private System.Windows.Forms.Label lbl18; + private System.Windows.Forms.Label lbl23; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox9; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox12; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox10; + private System.Windows.Forms.Label lbl25; + private System.Windows.Forms.Label lbl21; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox11; + private System.Windows.Forms.Label lbl19; + private System.Windows.Forms.Label lbl22; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox8; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomTextBox winCustomTextBox13; + private System.Windows.Forms.TabPage tabPage2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox11_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox10_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox9_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox8_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox7_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox6_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox5_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox4_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox3_2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox2_2; + private System.Windows.Forms.Label lbl3c; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Label lbl43; + private System.Windows.Forms.Label lbl42; + private System.Windows.Forms.Label lbl41; + private System.Windows.Forms.Label lbl3b; + private System.Windows.Forms.Label lbl3a; + private System.Windows.Forms.Label lbl39; + private System.Windows.Forms.Label lbl38; + private System.Windows.Forms.Label lbl37; + private System.Windows.Forms.Label lbl36; + private System.Windows.Forms.Label lbl34; + private System.Windows.Forms.Label lbl33; + private System.Windows.Forms.Label lbl35; + private System.Windows.Forms.Label lbl31; + private System.Windows.Forms.Label lbl32; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox13; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox12; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox11; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox10; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox9; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox8; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox7; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox6; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox5; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox4; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox3; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox2; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox1; + private System.Windows.Forms.Label lbl44; + private Touryo.Infrastructure.CustomControl.RichClient.WinCustomMaskedTextBox winCustomMaskedTextBox14; + private System.Windows.Forms.Label lbl18_2; + private System.Windows.Forms.Label lbl2f_2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Button button4; + } +} + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.cs new file mode 100644 index 000000000..5faa6744b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.cs @@ -0,0 +1,666 @@ +//********************************************************************************** +//* カスタム コントロール・サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：Form1 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Text; +using System.Data; +using System.Collections; +using System.Collections.Generic; +using System.Windows.Forms; + +using Touryo.Infrastructure.CustomControl.RichClient; + +namespace CustCtrl_sample +{ + /// フォーム + public partial class Form1 : Form + { + /// コンストラクタ + public Form1() + { + InitializeComponent(); + + // 異常な設定状態をテスト + + //// 「HowToCut = null」では、数値と認識されないこと（例外も起きないこと）。 + //this.winCustomTextBox1.EditDigitsAfterDP = new EditDigitsAfterDP(); + //this.winCustomTextBox1.EditDigitsAfterDP.HowToCut = null; + //this.winCustomTextBox1.EditDigitsAfterDP.DigitsAfterDP = 100; + } + + /// データ・バインディングのテスト用（DataTable） + DataTable Dt = null; + + /// データ・バインディングのテスト用（Bean） + BindingSource BindingSource1 = null; + + /// ロード + private void Form1_Load(object sender, EventArgs e) + { + // ハンドラ + this.winCustomTextBox8.ValueChanged += new EventHandler(winCustomTextBox8_ValueChanged); + + #region コンボ初期化 + + // Webサービスでマスタをロード（などする） + ArrayList al = null; + CmnMasterDatasForList.ClearMasterData(); + + al = new ArrayList(); + al.Add(new ListItem("1", "aaa")); + al.Add(new ListItem("2", "bbb")); + al.Add(new ListItem("3", "ccc")); + CmnMasterDatasForList.SetMasterData("Test1", al); + + al = new ArrayList(); + al.Add(new ListItem("1", "AAA")); + al.Add(new ListItem("2", "BBB")); + al.Add(new ListItem("3", "CCC")); + CmnMasterDatasForList.SetMasterData("Test2", al); + + al = new ArrayList(); + al.Add(new ListItem("1", "あ")); + al.Add(new ListItem("2", "い")); + al.Add(new ListItem("3", "う")); + CmnMasterDatasForList.SetMasterData("Test3", al); + + //// InitItemsで初期化する。 + //this.winCustomDropDownList1.InitItems(); + //this.winCustomDropDownList2.InitItems(); + //this.winCustomDropDownList3.InitItems(); + + // InitDataSourceで初期化する。 + this.winCustomDropDownList1.InitDataSource(); + this.winCustomDropDownList2.InitDataSource(); + this.winCustomDropDownList3.InitDataSource(); + + #endregion + + #region データバインディングをテストする。 + + // DataBindingsのFormatString（桁区切り）はdecimalで無いと効かない。 + // また、DataBindingsでは初期設定時のTextのReEditも効かない。 + // 従って、DataBindings時の方式としてはdecimal＆FormatStringに寄せる必要がある。 + + #region Bindingsource + + DataView dv = null; + this.Dt = this.CreateDataTable(); + + this.BindingSource1 = new BindingSource(); + this.BindingSource1.DataSource = new Bean(88888888, DateTime.Now, "88888888"); + + #endregion + + #region 単項目の入力コントロールとのデータバインディングをテストする。 + + // FormatStringとは相性が悪いので併用NGとした。 + + #region WinCustomTextBoxの場合 + + // データバインディングには、Valueプロパティを使用する。 + + // - Text : 通常のTextプロパティ（画面表示用） + // - Text2 : ユーザ入力のTextを取得するプロパティ + // - Text3 : 編集処理込のTextを取得するプロパティ + // - Value : 単位変換に対応したプロパティ + + #region winCustomTextBox1-7 + + #region .TextプロパティとDataView + + // バインド可能だが、単位変換に対応していない。 + + // 設定なし + dv = new DataView(this.Dt, "id = 1", "", DataViewRowState.Unchanged); + this.winCustomTextBox1.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, "hogehoge");//, "#,##0.########"); + + // 桁区切り3 + dv = new DataView(this.Dt, "id = 2", "", DataViewRowState.Unchanged); + this.winCustomTextBox2.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + // 桁区切り4 + dv = new DataView(this.Dt, "id = 3", "", DataViewRowState.Unchanged); + this.winCustomTextBox3.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + // 小数点以下2, 6 + dv = new DataView(this.Dt, "id = 4", "", DataViewRowState.Unchanged); + this.winCustomTextBox4.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + // 小数点以下4, 8 + dv = new DataView(this.Dt, "id = 5", "", DataViewRowState.Unchanged); + this.winCustomTextBox5.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + // パッド + dv = new DataView(this.Dt, "id = 6", "", DataViewRowState.Unchanged); + this.winCustomTextBox6.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + // パッド + dv = new DataView(this.Dt, "id = 7", "", DataViewRowState.Unchanged); + this.winCustomTextBox7.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + #endregion + + #region .Text2プロパティとDataView + + // ココにバインドしてばダメ（編集処理が動作しない）。 + + //// 設定なし + //dv = new DataView(this.Dt, "id = 1", "", DataViewRowState.Unchanged); + //this.winCustomTextBox1.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, "hogehoge");//, "#,##0.########"); + + //// 桁区切り3 + //dv = new DataView(this.Dt, "id = 2", "", DataViewRowState.Unchanged); + //this.winCustomTextBox2.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 桁区切り4 + //dv = new DataView(this.Dt, "id = 3", "", DataViewRowState.Unchanged); + //this.winCustomTextBox3.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 小数点以下2, 6 + //dv = new DataView(this.Dt, "id = 4", "", DataViewRowState.Unchanged); + //this.winCustomTextBox4.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 小数点以下4, 8 + //dv = new DataView(this.Dt, "id = 5", "", DataViewRowState.Unchanged); + //this.winCustomTextBox5.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// パッド + //dv = new DataView(this.Dt, "id = 6", "", DataViewRowState.Unchanged); + //this.winCustomTextBox6.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// パッド + //dv = new DataView(this.Dt, "id = 7", "", DataViewRowState.Unchanged); + //this.winCustomTextBox7.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + #endregion + + #region .Text3プロパティとDataView + + // バインド可能だが、単位変換に対応していない。 + + //// 設定なし + //dv = new DataView(this.Dt, "id = 1", "", DataViewRowState.Unchanged); + //this.winCustomTextBox1.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, "hogehoge");//, "#,##0.########"); + + //// 桁区切り3 + //dv = new DataView(this.Dt, "id = 2", "", DataViewRowState.Unchanged); + //this.winCustomTextBox2.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 桁区切り4 + //dv = new DataView(this.Dt, "id = 3", "", DataViewRowState.Unchanged); + //this.winCustomTextBox3.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 小数点以下2, 6 + //dv = new DataView(this.Dt, "id = 4", "", DataViewRowState.Unchanged); + //this.winCustomTextBox4.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 小数点以下4, 8 + //dv = new DataView(this.Dt, "id = 5", "", DataViewRowState.Unchanged); + //this.winCustomTextBox5.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// パッド + //dv = new DataView(this.Dt, "id = 6", "", DataViewRowState.Unchanged); + //this.winCustomTextBox6.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// パッド + //dv = new DataView(this.Dt, "id = 7", "", DataViewRowState.Unchanged); + //this.winCustomTextBox7.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + #endregion + + #region .ValueプロパティとDataView + + //// 設定なし + //dv = new DataView(this.Dt, "id = 1", "", DataViewRowState.Unchanged); + //this.winCustomTextBox1.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, "hogehoge");//, "#,##0.########"); + + //// 桁区切り3 + //dv = new DataView(this.Dt, "id = 2", "", DataViewRowState.Unchanged); + //this.winCustomTextBox2.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 桁区切り4 + //dv = new DataView(this.Dt, "id = 3", "", DataViewRowState.Unchanged); + //this.winCustomTextBox3.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 小数点以下2, 6 + //dv = new DataView(this.Dt, "id = 4", "", DataViewRowState.Unchanged); + //this.winCustomTextBox4.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// 小数点以下4, 8 + //dv = new DataView(this.Dt, "id = 5", "", DataViewRowState.Unchanged); + //this.winCustomTextBox5.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// パッド + //dv = new DataView(this.Dt, "id = 6", "", DataViewRowState.Unchanged); + //this.winCustomTextBox6.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// パッド + //dv = new DataView(this.Dt, "id = 7", "", DataViewRowState.Unchanged); + //this.winCustomTextBox7.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + #endregion + + #endregion + + #region winCustomTextBox8 複合（桁区切り3＋小数点以下2、6＋単位変換100万→10^6乗） + + //dv = new DataView(this.Dt, "id = 1", "", DataViewRowState.Unchanged); + //// 単位変換があるのでValueを使用しないと動作しない。 + ////this.winCustomTextBox8.DataBindings.Add("Text", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + ////this.winCustomTextBox8.DataBindings.Add("Text2", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + ////this.winCustomTextBox8.DataBindings.Add("Text3", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + this.winCustomTextBox8.DataBindings.Add("Value", dv, "aaa", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + //// DateTimeとは単位変換できないので連結不可 + //dv = new DataView(this.Dt, "id = 1", "", DataViewRowState.Unchanged); + //this.winCustomTextBox8.DataBindings.Add("Value", dv, "bbb", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + //this.winCustomTextBox8.DataBindings.Add("Value", this.BindingSource1, "BBB", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "#,##0.########"); + + #endregion + + #endregion + + #region WinCustomMaskedTextBoxの場合 + + // Text : 通常のTextプロパティ（画面表示用） + // Text2 : マスクを除いた値を設定・取得するプロパティ + // Text3 : 表示時マスク適用時の値を取得するプロパティ + + // TextとBBB（DateTime）のバインドはOK。 + this.winCustomMaskedTextBox9.DataBindings.Add("Text", this.BindingSource1, "BBB", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "yyyy/MM/dd"); + //// Text2とBBB（DateTime）をバインドするとロストフォーカスできなくなる。 + //this.winCustomMaskedTextBox9.DataBindings.Add("Text2", this.BindingSource1, "BBB", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "yyyy/MM/dd"); + //// Text3とBBB（DateTime）もダメ（取得専用のため）。 + //this.winCustomMaskedTextBox9.DataBindings.Add("Text3", this.BindingSource1, "BBB", true, DataSourceUpdateMode.OnPropertyChanged, null);//, "yyyy/MM/dd"); + + #endregion + + #endregion + + #region データグリッドとのデータバインディングをテストする。 + + #region WinCustomTextBoxの場合 + + // WinCustomTextBoxDgvColを作成 + WinCustomTextBoxDgvCol nomalColumn = new WinCustomTextBoxDgvCol(); + + nomalColumn.MaxLength = 15; + nomalColumn.IsNumeric = true; + + // EditInitialValue + //nomalColumn.EditInitialValue = EditInitialValue.Zero; + + // 編集中、小数点以下（Editingのみ実装） + nomalColumn.EditDigitsAfterDP_Editing= new EditDigitsAfterDP(CutMethod.Ceiling, 6); + + // パッド + //nomalColumn.EditPadding = new EditPadding(PadDirection.Right, '0'); + //nomalColumn.EditPadding = new EditPadding(PadDirection.Left, '0'); + + // 桁区切り（FormatStringで対応） + // DisplayUnits（処理で対応） + + nomalColumn.DataPropertyName = "aaa"; + nomalColumn.HeaderText = "aaa"; + + // FormatString（編集後、カンマ区切りで小数点2桁） + nomalColumn.DefaultCellStyle.Format = "#,##0.##"; + + this.dataGridView1.Columns.Add(nomalColumn); + + #endregion + + #region WinCustomMaskedTextBoxの場合 + + // WinCustomMaskedTextBoxDgvColを作成 + WinCustomMaskedTextBoxDgvCol maskedColumn = + new WinCustomMaskedTextBoxDgvCol(); + maskedColumn.DataPropertyName = "bbb"; + maskedColumn.HeaderText = "bbb"; + + // Maskと、Mask_Editingを逆にすると上手くいかない。 + // 初期表示時と、編集後で、セル（バインド先）のFormatが変わってしまうため。 + + maskedColumn.EditInitialValue = EditInitialValue.Blank; + + maskedColumn.Mask = "9999/99/99"; + maskedColumn.Mask_Editing = "9999年99月99日"; + + maskedColumn.EditToHankaku = true; + maskedColumn.EditToYYYYMMDD = true; + + // FormatString（編集後、カンマ区切りで小数点2桁） + maskedColumn.DefaultCellStyle.Format = "yyyy/MM/dd"; + + this.dataGridView1.Columns.Add(maskedColumn); + + #endregion + + #region WinCustomDropDownListの場合 + + // WinCustomDropDownListDgvColを作成 + DataGridViewComboBoxColumn comboColumn = + new DataGridViewComboBoxColumn(); + comboColumn.DataPropertyName = "ccc"; + comboColumn.HeaderText = "ccc"; + comboColumn.DataSource = CmnMasterDatasForList.GetMasterData("Test1"); // ↓どちらでも良い + //MasterDatasForList.GetMasterData("Test1", comboColumn.Items); // ↑どちらでも良い + comboColumn.ValueMember = "ID"; // 必須 + comboColumn.DisplayMember = "Name"; // 必須 + this.dataGridView1.Columns.Add(comboColumn); + + // --- + + // また、DataBindingsでは初期設定時のTextのReEditも効かない。 + // 従って、DataBindings時の方式としてはdecimal＆FormatStringに寄せる必要がある。 + this.dataGridView1.DataSource = this.CreateDataTable(); + this.dataGridView1.Columns["id"].Visible = false; + this.dataGridView1.Columns["ddd"].Visible = false; // 変更通知を発生させる用途の列。 + + #endregion + + #endregion + + #endregion + } + + /// DataTable生成 + /// DataTable + private DataTable CreateDataTable() + { + DataTable dt = new DataTable(); + + dt.Columns.Add("id", typeof(int)); + dt.Columns.Add("aaa", typeof(decimal)); + dt.Columns.Add("bbb", typeof(DateTime)); + dt.Columns.Add("ccc"); + dt.Columns.Add("ddd"); + + DataRow dr = dt.NewRow(); + + dr["id"] = "1"; + dr["aaa"] = "11111111"; + dr["bbb"] = "2001/01/01"; + dr["ccc"] = "1"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "2"; + dr["aaa"] = "22222222"; + dr["bbb"] = "2002/02/02"; + dr["ccc"] = "2"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "3"; + dr["aaa"] = "33333333"; + dr["bbb"] = "2003/03/03"; + dr["ccc"] = "3"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "4"; + dr["aaa"] = "44444444"; + dr["bbb"] = "2004/04/04"; + dr["ccc"] = "1"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "5"; + dr["aaa"] = "55555555"; + dr["bbb"] = "2005/05/05"; + dr["ccc"] = "2"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "6"; + dr["aaa"] = "66666666"; + dr["bbb"] = "2006/06/06"; + dr["ccc"] = "3"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "7"; + dr["aaa"] = "77777777"; + dr["bbb"] = "2007/07/07"; + dr["ccc"] = "1"; + dt.Rows.Add(dr); + + dr = dt.NewRow(); + dr["id"] = "8"; + dr["aaa"] = "88888888"; + dr["bbb"] = "2008/08/08"; + dr["ccc"] = "1"; + dt.Rows.Add(dr); + + dt.AcceptChanges(); + + return dt; + } + + /// 一括チェックのテスト + private void button1_Click(object sender, EventArgs e) + { + string ret = ""; + + List lcr = new List(); + if (CmnCheckFunction.HasErrors(this, lcr)) + { + foreach (CheckResult cr in lcr) + { + ret += cr.CtrlName + "\r\n"; + foreach (string checkErrorInfo in cr.CheckErrorInfo) + { + ret += "・" + checkErrorInfo + "\r\n"; + } + ret += "\r\n"; + } + } + + MessageBox.Show(ret); + } + + /// 値取得プロパティ プロシージャのテスト（WinCustomTextBox） + private void button2_Click(object sender, EventArgs e) + { + //winCustomMaskedTextBox1.GetDateTime(); + StringBuilder sb = new StringBuilder(); + sb.AppendLine(this.GetValue(this.winCustomTextBox1)); + sb.AppendLine(this.GetValue(this.winCustomTextBox2)); + sb.AppendLine(this.GetValue(this.winCustomTextBox3)); + sb.AppendLine(this.GetValue(this.winCustomTextBox4)); + sb.AppendLine(this.GetValue(this.winCustomTextBox5)); + sb.AppendLine(this.GetValue(this.winCustomTextBox6)); + sb.AppendLine(this.GetValue(this.winCustomTextBox7)); + sb.AppendLine(this.GetValue(this.winCustomTextBox8)); + MessageBox.Show(sb.ToString()); + } + + /// 値取得プロパティ プロシージャのテスト（WinCustomMaskedTextBox） + private void button3_Click(object sender, EventArgs e) + { + //winCustomMaskedTextBox1.GetDateTime(); + StringBuilder sb = new StringBuilder(); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox1)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox2)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox3)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox4)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox5)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox6)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox7)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox8)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox9)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox10)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox11)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox12)); + sb.AppendLine(this.GetValue(this.winCustomMaskedTextBox13)); + MessageBox.Show(sb.ToString()); + } + + /// データソースからの変更通知を発生 + private void button4_Click(object sender, EventArgs e) + { + DataTable dt =this.Dt; + foreach (DataRow row in dt.Rows) + { + row["aaa"] = ((decimal)row["aaa"]) + 1; + row["bbb"] = ((DateTime)row["bbb"]).AddYears(1); + row["ccc"] = this.textBox1.Text; + } + dt.AcceptChanges(); + + dt = (DataTable)this.dataGridView1.DataSource; + foreach (DataRow row in dt.Rows) + { + row["aaa"] = ((decimal)row["aaa"]) + 1; + row["bbb"] = ((DateTime)row["bbb"]).AddYears(1); + row["ccc"] = this.textBox1.Text; + } + dt.AcceptChanges(); + + ((Bean)this.BindingSource1.DataSource).AAA = (((Bean)this.BindingSource1.DataSource).AAA) + 1; + ((Bean)this.BindingSource1.DataSource).BBB = ((Bean)this.BindingSource1.DataSource).BBB.AddYears(1); + ((Bean)this.BindingSource1.DataSource).CCC = this.textBox1.Text; + this.BindingSource1.ResetBindings(false); + } + + /// 値取得プロパティ プロシージャのテスト + private string GetValue(IGetValue igv) + { + StringBuilder sb = new StringBuilder(); + + sb.AppendLine(((Control)igv).Name); + try { sb.AppendLine("GetInt16:" + igv.GetInt16().ToString()); } catch { } + try { sb.AppendLine("GetInt32:" + igv.GetInt32().ToString()); } catch { } + try { sb.AppendLine("GetInt64:" + igv.GetInt64().ToString()); } catch { } + try { sb.AppendLine("GetFloat:" + igv.GetFloat().ToString()); } catch { } + try { sb.AppendLine("GetDouble:" + igv.GetDouble().ToString()); } catch { } + try { sb.AppendLine("GetDecimal:" + igv.GetDecimal().ToString()); } catch { } + try { sb.AppendLine("GetDateTime:" + igv.GetDateTime().ToString()); } catch { } + + if (igv is WinCustomTextBox) + { + WinCustomTextBox wctbx = (WinCustomTextBox)igv; + // 通常のTextプロパティ（可変） + sb.AppendLine("Text:" + wctbx.Text); + // ユーザの入力値だけ取得する + sb.AppendLine("Text2:" + wctbx.Text2); + // 編集処理を適用した値を取得する + sb.AppendLine("Text3:" + wctbx.Text3); + // データバインディング用プロパティ値を取得する + sb.AppendLine("Value:" + wctbx.Value); + } + else if (igv is WinCustomMaskedTextBox) + { + WinCustomMaskedTextBox wcmtbx = (WinCustomMaskedTextBox)igv; + // 通常のTextプロパティ（可変） + sb.AppendLine("Text:" + wcmtbx.Text); + // ユーザの入力値だけ取得する + sb.AppendLine("Text2:" + wcmtbx.Text2); + // 入力時マスクを適用した値を取得する + sb.AppendLine("Text3:" + wcmtbx.Text3); + } + + return sb.ToString(); + } + + /// winCustomTextBox_TextChanged + private void winCustomTextBox_TextChanged(object sender, EventArgs e) + { + string s = ((TextBox)sender).Name; + + switch (s.Substring(s.Length - 1, 1)) + { + // Text2(ユーザ入力のTextをバインド) + + case "2": + this.winCustomTextBox2_2.Text = this.winCustomTextBox2.Text2; + break; + case "3": + this.winCustomTextBox3_2.Text = this.winCustomTextBox3.Text2; + break; + case "4": + this.winCustomTextBox4_2.Text = this.winCustomTextBox4.Text2; + break; + case "5": + this.winCustomTextBox5_2.Text = this.winCustomTextBox5.Text2; + break; + case "6": + this.winCustomTextBox6_2.Text = this.winCustomTextBox6.Text2; + break; + case "7": + this.winCustomTextBox7_2.Text = this.winCustomTextBox7.Text2; + break; + default: + break; + } + } + + /// winCustomMaskedTextBox_TextChanged + private void winCustomMaskedTextBox_TextChanged(object sender, EventArgs e) + { + string s = ((MaskedTextBox)sender).Name; + + switch (s.Substring(s.Length - 1, 1)) + { + // Text2(ユーザ入力のTextをバインド) + + case "2": + this.winCustomMaskedTextBox2_2.Text = this.winCustomMaskedTextBox2.Text2; + break; + case "3": + this.winCustomMaskedTextBox3_2.Text = this.winCustomMaskedTextBox3.Text2; + break; + case "4": + this.winCustomMaskedTextBox4_2.Text = this.winCustomMaskedTextBox4.Text2; + break; + case "5": + this.winCustomMaskedTextBox5_2.Text = this.winCustomMaskedTextBox5.Text2; + break; + case "6": + this.winCustomMaskedTextBox6_2.Text = this.winCustomMaskedTextBox6.Text2; + break; + case "7": + this.winCustomMaskedTextBox7_2.Text = this.winCustomMaskedTextBox7.Text2; + break; + case "8": + this.winCustomMaskedTextBox8_2.Text = this.winCustomMaskedTextBox8.Text2; + break; + case "9": + this.winCustomMaskedTextBox9_2.Text = this.winCustomMaskedTextBox9.Text2; + break; + case "10": + this.winCustomMaskedTextBox10_2.Text = this.winCustomMaskedTextBox10.Text2; + break; + case "11": + this.winCustomMaskedTextBox11_2.Text = this.winCustomMaskedTextBox11.Text2; + break; + default: + break; + } + } + + /// デザイナで設定できなくした + private void winCustomTextBox8_ValueChanged(object sender, EventArgs e) + { + System.Diagnostics.Debug.WriteLine("ValueChanged:" + ((WinCustomTextBox)sender).Name); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Form1.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Program.cs new file mode 100644 index 000000000..187d76b04 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Program.cs @@ -0,0 +1,38 @@ +//********************************************************************************** +//* カスタム コントロール・サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：Program +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Windows.Forms; + +namespace CustCtrl_sample +{ + static class Program + { + /// + /// アプリケーションのメイン エントリ ポイントです。 + /// + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/Readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs new file mode 100644 index 000000000..877783929 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.cs @@ -0,0 +1,169 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB_BatUpd +//* クラス日本語名 ：Ｂ層（静的SQLのCRUD：Productsテーブル） +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using GenDaoAndBatUpd_sample.Common; + +using System.Data; + +using Touryo.Infrastructure.Business.RichClient.Business; +using Touryo.Infrastructure.Framework.Common; + +namespace GenDaoAndBatUpd_sample.Business +{ + /// Ｂ層（静的SQLのCRUD：Productsテーブル） + class LayerB_BatUpd : MyFcBaseLogic2CS + { + /// 業務処理を実装 + /// 引数クラス + private void UOC_BatUpd(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoProducts daoProducts = new DaoProducts(this.GetDam()); + + // ROW毎に処理 + foreach (DataRow dr in testParameter.dt.Rows) + { + // パラメタをクリアする。 + daoProducts.ClearParametersFromHt(); + + switch (dr.RowState) + { + case DataRowState.Added: + + #region １件挿入 + + // 設定（インサート値） + daoProducts.PK_ProductID = dr["ProductID"].ToString(); + daoProducts.ProductName = dr["ProductName"].ToString(); + daoProducts.SupplierID = dr["SupplierID"].ToString(); + daoProducts.CategoryID = dr["CategoryID"].ToString(); + daoProducts.QuantityPerUnit = dr["QuantityPerUnit"].ToString(); + daoProducts.UnitPrice = dr["UnitPrice"].ToString(); + daoProducts.UnitsInStock = dr["UnitsInStock"].ToString(); + daoProducts.UnitsOnOrder = dr["UnitsOnOrder"].ToString(); + daoProducts.ReorderLevel = dr["ReorderLevel"].ToString(); + daoProducts.Discontinued = dr["Discontinued"].ToString(); + + // インサート（S1でよい） + testReturn.obj = daoProducts.S1_Insert(); + + #endregion + + break; + + case DataRowState.Deleted: + + #region １件削除 + + // 設定（主キー） + daoProducts.PK_ProductID = dr["ProductID", DataRowVersion.Original].ToString(); + // ★ 楽観排他をする場合は、ここにタイムスタンプを追加する。 + + // デリート（タイムスタンプを指定する場合は、D4_Delete） + testReturn.obj = daoProducts.D4_Delete(); + + #endregion + + break; + + case DataRowState.Modified: + + #region １件更新 + + // 設定（主キー） + daoProducts.PK_ProductID = dr["ProductID"].ToString(); + + // ★ 楽観排他をする場合は、ここにタイムスタンプを追加する。 + // ↓は、DataRowVersion.Originalを使用した楽観排他の例 + daoProducts.ProductName = dr["ProductName", DataRowVersion.Original].ToString(); + daoProducts.SupplierID = dr["SupplierID", DataRowVersion.Original].ToString(); + daoProducts.CategoryID = dr["CategoryID", DataRowVersion.Original].ToString(); + daoProducts.QuantityPerUnit = dr["QuantityPerUnit", DataRowVersion.Original].ToString(); + daoProducts.UnitPrice = dr["UnitPrice", DataRowVersion.Original].ToString(); + daoProducts.UnitsInStock = dr["UnitsInStock", DataRowVersion.Original].ToString(); + daoProducts.UnitsOnOrder = dr["UnitsOnOrder", DataRowVersion.Original].ToString(); + daoProducts.ReorderLevel = dr["ReorderLevel", DataRowVersion.Original].ToString(); + daoProducts.Discontinued = dr["Discontinued", DataRowVersion.Original].ToString(); + + // 更新値設定 + daoProducts.Set_ProductName_forUPD = dr["ProductName"].ToString(); + daoProducts.Set_SupplierID_forUPD = dr["SupplierID"].ToString(); + daoProducts.Set_CategoryID_forUPD = dr["CategoryID"].ToString(); + daoProducts.Set_QuantityPerUnit_forUPD = dr["QuantityPerUnit"].ToString(); + daoProducts.Set_UnitPrice_forUPD = dr["UnitPrice"].ToString(); + daoProducts.Set_UnitsInStock_forUPD = dr["UnitsInStock"].ToString(); + daoProducts.Set_UnitsOnOrder_forUPD = dr["UnitsOnOrder"].ToString(); + daoProducts.Set_ReorderLevel_forUPD = dr["ReorderLevel"].ToString(); + daoProducts.Set_Discontinued_forUPD = dr["Discontinued"].ToString(); + + // アップデート（タイムスタンプを指定する場合は、D3_Update） + testReturn.obj = daoProducts.D3_Update(); + + #endregion + + break; + + default: + break; + } + } + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoProducts daoProducts = new DaoProducts(this.GetDam()); + + // 全件取得 + DataTable dt = new DataTable(); + daoProducts.D2_Select(dt); + + // 戻り値を戻す + testReturn.dt = dt; + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs new file mode 100644 index 000000000..6bd390af3 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.cs @@ -0,0 +1,206 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB_Dynamic +//* クラス日本語名 ：Ｂ層（動的SQLのCRUD：Categoryテーブル） +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using GenDaoAndBatUpd_sample.Common; + +using System.Data; + +using Touryo.Infrastructure.Business.RichClient.Business; +using Touryo.Infrastructure.Framework.Common; + +namespace GenDaoAndBatUpd_sample.Business +{ + /// Ｂ層（動的SQLのCRUD：Categoryテーブル） + class LayerB_Dynamic : MyFcBaseLogic2CS + { + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoCategories daoCategories = new DaoCategories(this.GetDam()); + + // １件挿入 + //daoCategories.PK_CategoryID = testParameter.field1; + daoCategories.CategoryName = testParameter.field2; + daoCategories.Description = testParameter.field3; + //daoCategories.Picture = testParameter.field4; + + // インサート + testReturn.obj = daoCategories.D1_Insert(); + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoCategories daoCategories = new DaoCategories(this.GetDam()); + + // ｎ件参照 + if (testParameter.field1_ForSearch.ToString().Trim() == "") { } + else + { daoCategories.PK_CategoryID = testParameter.field1_ForSearch; } + + if (testParameter.field2_ForSearch.ToString().Trim() == "") { } + else + { daoCategories.CategoryName = testParameter.field2_ForSearch; } + + DataTable dt = new DataTable(); + daoCategories.D2_Select(dt); + + testReturn.dt = dt; + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoCategories daoCategories = new DaoCategories(this.GetDam()); + + // ｎ件更新 + + // 更新値設定 + if (testParameter.field2_ForUpd.ToString().Trim() == "") { } + else + { daoCategories.Set_CategoryName_forUPD = testParameter.field2_ForUpd; } + + if (testParameter.field3_ForUpd.ToString().Trim() == "") { } + else + { daoCategories.Set_Description_forUPD = testParameter.field3_ForUpd; } + + // 検索条件設定 + if (testParameter.field1_ForSearch.ToString().Trim() == "") { } + else + { daoCategories.PK_CategoryID = testParameter.field1_ForSearch; } + + if (testParameter.field2_ForSearch.ToString().Trim() == "") { } + else + { daoCategories.CategoryName = testParameter.field2_ForSearch; } + + // アップデート + testReturn.obj = daoCategories.D3_Update(); + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoCategories daoCategories = new DaoCategories(this.GetDam()); + + // ｎ件削除 + + // 検索条件設定 + if (testParameter.field1_ForSearch.ToString().Trim() == "") { } + else + { daoCategories.PK_CategoryID = testParameter.field1_ForSearch; } + + if (testParameter.field2_ForSearch.ToString().Trim() == "") { } + else + { daoCategories.CategoryName = testParameter.field2_ForSearch; } + + // デリート + testReturn.obj = daoCategories.D4_Delete(); + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoCategories daoCategories = new DaoCategories(this.GetDam()); + + // 全件取得 + + // 実行 + DataTable dt = new DataTable(); + daoCategories.D2_Select(dt); + + // 戻り値を戻す + testReturn.dt = dt; + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs new file mode 100644 index 000000000..0695de367 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.cs @@ -0,0 +1,233 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB_Static +//* クラス日本語名 ：Ｂ層（静的SQLのCRUD：Suppliersテーブル） +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using GenDaoAndBatUpd_sample.Common; + +using System.Data; + +using Touryo.Infrastructure.Business.RichClient.Business; +using Touryo.Infrastructure.Framework.Common; + +namespace GenDaoAndBatUpd_sample.Business +{ + /// Ｂ層（静的SQLのCRUD：Suppliersテーブル） + class LayerB_Static : MyFcBaseLogic2CS + { + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoSuppliers daoSuppliers = new DaoSuppliers(this.GetDam()); + + // １件挿入 + //daoSuppliers.PK_SupplierID = testParameter.field1; + daoSuppliers.CompanyName = testParameter.field2; + daoSuppliers.ContactName = testParameter.field3; + daoSuppliers.ContactTitle = testParameter.field4; + daoSuppliers.Address = testParameter.field5; + daoSuppliers.City = testParameter.field6; + daoSuppliers.Region = testParameter.field7; + daoSuppliers.PostalCode = testParameter.field8; + daoSuppliers.Country = testParameter.field9; + daoSuppliers.Phone = testParameter.field10; + daoSuppliers.Fax = testParameter.field11; + daoSuppliers.HomePage = testParameter.field12; + + testReturn.obj = daoSuppliers.S1_Insert(); + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoSuppliers daoSuppliers = new DaoSuppliers(this.GetDam()); + + // １件参照 + daoSuppliers.PK_SupplierID = testParameter.field1; + + DataTable dt = new DataTable(); + daoSuppliers.S2_Select(dt); + + testReturn.field1 = dt.Rows[0][0]; + testReturn.field2 = dt.Rows[0][1]; + testReturn.field3 = dt.Rows[0][2]; + testReturn.field4 = dt.Rows[0][3]; + testReturn.field5 = dt.Rows[0][4]; + testReturn.field6 = dt.Rows[0][5]; + testReturn.field7 = dt.Rows[0][6]; + testReturn.field8 = dt.Rows[0][7]; + testReturn.field9 = dt.Rows[0][8]; + testReturn.field10 = dt.Rows[0][9]; + testReturn.field11 = dt.Rows[0][10]; + testReturn.field12 = dt.Rows[0][11]; + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoSuppliers daoSuppliers = new DaoSuppliers(this.GetDam()); + + // １件更新 + daoSuppliers.PK_SupplierID = testParameter.field1; + + if (testParameter.field2_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_CompanyName_forUPD = testParameter.field2_ForUpd; } + + if (testParameter.field3_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_ContactName_forUPD = testParameter.field3_ForUpd; } + + if (testParameter.field4_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_ContactTitle_forUPD = testParameter.field4_ForUpd; } + + if (testParameter.field5_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_Address_forUPD = testParameter.field5_ForUpd; } + + if (testParameter.field6_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_City_forUPD = testParameter.field6_ForUpd; } + + if (testParameter.field7_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_Region_forUPD = testParameter.field7_ForUpd; } + + if (testParameter.field8_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_PostalCode_forUPD = testParameter.field8_ForUpd; } + + if (testParameter.field9_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_Country_forUPD = testParameter.field9_ForUpd; } + + if (testParameter.field10_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_Phone_forUPD = testParameter.field10_ForUpd; } + + if (testParameter.field11_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_Fax_forUPD = testParameter.field11_ForUpd; } + + if (testParameter.field12_ForUpd.ToString().Trim() == "") { } + else + { daoSuppliers.Set_HomePage_forUPD = testParameter.field12_ForUpd; } + + testReturn.obj = daoSuppliers.S3_Update(); + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoSuppliers daoSuppliers = new DaoSuppliers(this.GetDam()); + + // １件削除 + daoSuppliers.PK_SupplierID = testParameter.field1; + + testReturn.obj = daoSuppliers.S4_Delete(); + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll(BaseParameterValue parameterValue) + { + // 引数クラスをアップキャスト + TestParameterValue testParameter = (TestParameterValue)parameterValue; + + // 戻り値クラスを生成 + TestReturnValue testReturn = new TestReturnValue(); + + // ↓業務処理----------------------------------------------------- + + // データアクセス クラスを生成する + DaoSuppliers daoSuppliers = new DaoSuppliers(this.GetDam()); + + // 全件参照 + DataTable dt = new DataTable(); + daoSuppliers.D2_Select(dt); + + // 戻り値を戻す + testReturn.dt = dt; + + // ↑業務処理----------------------------------------------------- + + // 戻り値クラスをダウンキャストして戻す + this.ReturnValue = (BaseReturnValue)testReturn; + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs new file mode 100644 index 000000000..38604113c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.cs @@ -0,0 +1,114 @@ +//********************************************************************************** +//* バッチ更新処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Data; +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace GenDaoAndBatUpd_sample.Common +{ + /// + /// TestParameterValue の概要の説明です + /// + public class TestParameterValue : MyParameterValue + { + #region コンストラクタ + + public TestParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + + #region フィールド + + // 値（インサート、主キー値など） + public object field1; + public object field2; + public object field3; + public object field4; + public object field5; + public object field6; + public object field7; + public object field8; + public object field9; + public object field10; + public object field11; + public object field12; + public object field13; + public object field14; + public object field15; + public object field16; + public object field17; + public object field18; + public object field19; + public object field20; + + // 更新時 + public object field1_ForUpd; + public object field2_ForUpd; + public object field3_ForUpd; + public object field4_ForUpd; + public object field5_ForUpd; + public object field6_ForUpd; + public object field7_ForUpd; + public object field8_ForUpd; + public object field9_ForUpd; + public object field10_ForUpd; + public object field11_ForUpd; + public object field12_ForUpd; + public object field13_ForUpd; + public object field14_ForUpd; + public object field15_ForUpd; + public object field16_ForUpd; + public object field17_ForUpd; + public object field18_ForUpd; + public object field19_ForUpd; + public object field20_ForUpd; + + // 検索条件 + public object field1_ForSearch; + public object field2_ForSearch; + public object field3_ForSearch; + public object field4_ForSearch; + public object field5_ForSearch; + public object field6_ForSearch; + public object field7_ForSearch; + public object field8_ForSearch; + public object field9_ForSearch; + public object field10_ForSearch; + public object field11_ForSearch; + public object field12_ForSearch; + public object field13_ForSearch; + public object field14_ForSearch; + public object field15_ForSearch; + public object field16_ForSearch; + public object field17_ForSearch; + public object field18_ForSearch; + public object field19_ForSearch; + public object field20_ForSearch; + + #endregion + + public DataTable dt; + public object obj; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs new file mode 100644 index 000000000..276bd6810 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.cs @@ -0,0 +1,58 @@ +//********************************************************************************** +//* バッチ更新処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Data; +using Touryo.Infrastructure.Business.Common; + +namespace GenDaoAndBatUpd_sample.Common +{ + /// + /// TestReturnValueの概要の説明です + /// + public class TestReturnValue : MyReturnValue + { + #region フィールド + + public object field1; + public object field2; + public object field3; + public object field4; + public object field5; + public object field6; + public object field7; + public object field8; + public object field9; + public object field10; + public object field11; + public object field12; + public object field13; + public object field14; + public object field15; + public object field16; + public object field17; + public object field18; + public object field19; + public object field20; + + #endregion + + public DataTable dt; + public object obj; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs new file mode 100644 index 000000000..08d9fb528 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.cs @@ -0,0 +1,450 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoCategories +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoCategories : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoCategories(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// CategoryID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_CategoryID + { + set + { + this.HtParameter["CategoryID"] = value; + } + get + { + return this.HtParameter["CategoryID"]; + } + } + + + + /// CategoryName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CategoryName + { + set + { + this.HtParameter["CategoryName"] = value; + } + get + { + return this.HtParameter["CategoryName"]; + } + } + + /// Description列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Description + { + set + { + this.HtParameter["Description"] = value; + } + get + { + return this.HtParameter["Description"]; + } + } + + /// Picture列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Picture + { + set + { + this.HtParameter["Picture"] = value; + } + get + { + return this.HtParameter["Picture"]; + } + } + + + /// Set_CategoryID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CategoryID_forUPD + { + set + { + this.HtParameter["Set_CategoryID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CategoryID_forUPD"]; + } + } + + + /// Set_CategoryName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CategoryName_forUPD + { + set + { + this.HtParameter["Set_CategoryName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CategoryName_forUPD"]; + } + } + + + /// Set_Description_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Description_forUPD + { + set + { + this.HtParameter["Set_Description_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Description_forUPD"]; + } + } + + + /// Set_Picture_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Picture_forUPD + { + set + { + this.HtParameter["Set_Picture_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Picture_forUPD"]; + } + } + + + + /// CategoryID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CategoryID_Like + { + set + { + this.HtParameter["CategoryID_Like"] = value; + } + get + { + return this.HtParameter["CategoryID_Like"]; + } + } + + + /// CategoryName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CategoryName_Like + { + set + { + this.HtParameter["CategoryName_Like"] = value; + } + get + { + return this.HtParameter["CategoryName_Like"]; + } + } + + + /// Description_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Description_Like + { + set + { + this.HtParameter["Description_Like"] = value; + } + get + { + return this.HtParameter["Description_Like"]; + } + } + + + /// Picture_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Picture_Like + { + set + { + this.HtParameter["Picture_Like"] = value; + } + get + { + return this.HtParameter["Picture_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoCategories_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoCategories_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoCategories_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoCategories_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoCategories_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoCategories_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoCategories_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoCategories_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoCategories_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs new file mode 100644 index 000000000..499b0e629 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.cs @@ -0,0 +1,714 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoProducts +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoProducts : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoProducts(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// ProductID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_ProductID + { + set + { + this.HtParameter["ProductID"] = value; + } + get + { + return this.HtParameter["ProductID"]; + } + } + + + + /// ProductName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ProductName + { + set + { + this.HtParameter["ProductName"] = value; + } + get + { + return this.HtParameter["ProductName"]; + } + } + + /// SupplierID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object SupplierID + { + set + { + this.HtParameter["SupplierID"] = value; + } + get + { + return this.HtParameter["SupplierID"]; + } + } + + /// CategoryID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CategoryID + { + set + { + this.HtParameter["CategoryID"] = value; + } + get + { + return this.HtParameter["CategoryID"]; + } + } + + /// QuantityPerUnit列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object QuantityPerUnit + { + set + { + this.HtParameter["QuantityPerUnit"] = value; + } + get + { + return this.HtParameter["QuantityPerUnit"]; + } + } + + /// UnitPrice列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object UnitPrice + { + set + { + this.HtParameter["UnitPrice"] = value; + } + get + { + return this.HtParameter["UnitPrice"]; + } + } + + /// UnitsInStock列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object UnitsInStock + { + set + { + this.HtParameter["UnitsInStock"] = value; + } + get + { + return this.HtParameter["UnitsInStock"]; + } + } + + /// UnitsOnOrder列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object UnitsOnOrder + { + set + { + this.HtParameter["UnitsOnOrder"] = value; + } + get + { + return this.HtParameter["UnitsOnOrder"]; + } + } + + /// ReorderLevel列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ReorderLevel + { + set + { + this.HtParameter["ReorderLevel"] = value; + } + get + { + return this.HtParameter["ReorderLevel"]; + } + } + + /// Discontinued列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Discontinued + { + set + { + this.HtParameter["Discontinued"] = value; + } + get + { + return this.HtParameter["Discontinued"]; + } + } + + + /// Set_ProductID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ProductID_forUPD + { + set + { + this.HtParameter["Set_ProductID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ProductID_forUPD"]; + } + } + + + /// Set_ProductName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ProductName_forUPD + { + set + { + this.HtParameter["Set_ProductName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ProductName_forUPD"]; + } + } + + + /// Set_SupplierID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_SupplierID_forUPD + { + set + { + this.HtParameter["Set_SupplierID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_SupplierID_forUPD"]; + } + } + + + /// Set_CategoryID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CategoryID_forUPD + { + set + { + this.HtParameter["Set_CategoryID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CategoryID_forUPD"]; + } + } + + + /// Set_QuantityPerUnit_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_QuantityPerUnit_forUPD + { + set + { + this.HtParameter["Set_QuantityPerUnit_forUPD"] = value; + } + get + { + return this.HtParameter["Set_QuantityPerUnit_forUPD"]; + } + } + + + /// Set_UnitPrice_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_UnitPrice_forUPD + { + set + { + this.HtParameter["Set_UnitPrice_forUPD"] = value; + } + get + { + return this.HtParameter["Set_UnitPrice_forUPD"]; + } + } + + + /// Set_UnitsInStock_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_UnitsInStock_forUPD + { + set + { + this.HtParameter["Set_UnitsInStock_forUPD"] = value; + } + get + { + return this.HtParameter["Set_UnitsInStock_forUPD"]; + } + } + + + /// Set_UnitsOnOrder_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_UnitsOnOrder_forUPD + { + set + { + this.HtParameter["Set_UnitsOnOrder_forUPD"] = value; + } + get + { + return this.HtParameter["Set_UnitsOnOrder_forUPD"]; + } + } + + + /// Set_ReorderLevel_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ReorderLevel_forUPD + { + set + { + this.HtParameter["Set_ReorderLevel_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ReorderLevel_forUPD"]; + } + } + + + /// Set_Discontinued_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Discontinued_forUPD + { + set + { + this.HtParameter["Set_Discontinued_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Discontinued_forUPD"]; + } + } + + + + /// ProductID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ProductID_Like + { + set + { + this.HtParameter["ProductID_Like"] = value; + } + get + { + return this.HtParameter["ProductID_Like"]; + } + } + + + /// ProductName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ProductName_Like + { + set + { + this.HtParameter["ProductName_Like"] = value; + } + get + { + return this.HtParameter["ProductName_Like"]; + } + } + + + /// SupplierID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object SupplierID_Like + { + set + { + this.HtParameter["SupplierID_Like"] = value; + } + get + { + return this.HtParameter["SupplierID_Like"]; + } + } + + + /// CategoryID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CategoryID_Like + { + set + { + this.HtParameter["CategoryID_Like"] = value; + } + get + { + return this.HtParameter["CategoryID_Like"]; + } + } + + + /// QuantityPerUnit_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object QuantityPerUnit_Like + { + set + { + this.HtParameter["QuantityPerUnit_Like"] = value; + } + get + { + return this.HtParameter["QuantityPerUnit_Like"]; + } + } + + + /// UnitPrice_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object UnitPrice_Like + { + set + { + this.HtParameter["UnitPrice_Like"] = value; + } + get + { + return this.HtParameter["UnitPrice_Like"]; + } + } + + + /// UnitsInStock_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object UnitsInStock_Like + { + set + { + this.HtParameter["UnitsInStock_Like"] = value; + } + get + { + return this.HtParameter["UnitsInStock_Like"]; + } + } + + + /// UnitsOnOrder_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object UnitsOnOrder_Like + { + set + { + this.HtParameter["UnitsOnOrder_Like"] = value; + } + get + { + return this.HtParameter["UnitsOnOrder_Like"]; + } + } + + + /// ReorderLevel_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ReorderLevel_Like + { + set + { + this.HtParameter["ReorderLevel_Like"] = value; + } + get + { + return this.HtParameter["ReorderLevel_Like"]; + } + } + + + /// Discontinued_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Discontinued_Like + { + set + { + this.HtParameter["Discontinued_Like"] = value; + } + get + { + return this.HtParameter["Discontinued_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoProducts_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoProducts_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoProducts_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoProducts_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoProducts_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoProducts_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoProducts_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoProducts_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoProducts_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs new file mode 100644 index 000000000..8775d4036 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.cs @@ -0,0 +1,802 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoSuppliers +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoSuppliers : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoSuppliers(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// SupplierID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_SupplierID + { + set + { + this.HtParameter["SupplierID"] = value; + } + get + { + return this.HtParameter["SupplierID"]; + } + } + + + + /// CompanyName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CompanyName + { + set + { + this.HtParameter["CompanyName"] = value; + } + get + { + return this.HtParameter["CompanyName"]; + } + } + + /// ContactName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ContactName + { + set + { + this.HtParameter["ContactName"] = value; + } + get + { + return this.HtParameter["ContactName"]; + } + } + + /// ContactTitle列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ContactTitle + { + set + { + this.HtParameter["ContactTitle"] = value; + } + get + { + return this.HtParameter["ContactTitle"]; + } + } + + /// Address列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Address + { + set + { + this.HtParameter["Address"] = value; + } + get + { + return this.HtParameter["Address"]; + } + } + + /// City列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object City + { + set + { + this.HtParameter["City"] = value; + } + get + { + return this.HtParameter["City"]; + } + } + + /// Region列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Region + { + set + { + this.HtParameter["Region"] = value; + } + get + { + return this.HtParameter["Region"]; + } + } + + /// PostalCode列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PostalCode + { + set + { + this.HtParameter["PostalCode"] = value; + } + get + { + return this.HtParameter["PostalCode"]; + } + } + + /// Country列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Country + { + set + { + this.HtParameter["Country"] = value; + } + get + { + return this.HtParameter["Country"]; + } + } + + /// Phone列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Phone + { + set + { + this.HtParameter["Phone"] = value; + } + get + { + return this.HtParameter["Phone"]; + } + } + + /// Fax列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Fax + { + set + { + this.HtParameter["Fax"] = value; + } + get + { + return this.HtParameter["Fax"]; + } + } + + /// HomePage列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object HomePage + { + set + { + this.HtParameter["HomePage"] = value; + } + get + { + return this.HtParameter["HomePage"]; + } + } + + + /// Set_SupplierID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_SupplierID_forUPD + { + set + { + this.HtParameter["Set_SupplierID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_SupplierID_forUPD"]; + } + } + + + /// Set_CompanyName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CompanyName_forUPD + { + set + { + this.HtParameter["Set_CompanyName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CompanyName_forUPD"]; + } + } + + + /// Set_ContactName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ContactName_forUPD + { + set + { + this.HtParameter["Set_ContactName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ContactName_forUPD"]; + } + } + + + /// Set_ContactTitle_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ContactTitle_forUPD + { + set + { + this.HtParameter["Set_ContactTitle_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ContactTitle_forUPD"]; + } + } + + + /// Set_Address_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Address_forUPD + { + set + { + this.HtParameter["Set_Address_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Address_forUPD"]; + } + } + + + /// Set_City_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_City_forUPD + { + set + { + this.HtParameter["Set_City_forUPD"] = value; + } + get + { + return this.HtParameter["Set_City_forUPD"]; + } + } + + + /// Set_Region_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Region_forUPD + { + set + { + this.HtParameter["Set_Region_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Region_forUPD"]; + } + } + + + /// Set_PostalCode_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_PostalCode_forUPD + { + set + { + this.HtParameter["Set_PostalCode_forUPD"] = value; + } + get + { + return this.HtParameter["Set_PostalCode_forUPD"]; + } + } + + + /// Set_Country_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Country_forUPD + { + set + { + this.HtParameter["Set_Country_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Country_forUPD"]; + } + } + + + /// Set_Phone_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Phone_forUPD + { + set + { + this.HtParameter["Set_Phone_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Phone_forUPD"]; + } + } + + + /// Set_Fax_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Fax_forUPD + { + set + { + this.HtParameter["Set_Fax_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Fax_forUPD"]; + } + } + + + /// Set_HomePage_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_HomePage_forUPD + { + set + { + this.HtParameter["Set_HomePage_forUPD"] = value; + } + get + { + return this.HtParameter["Set_HomePage_forUPD"]; + } + } + + + + /// SupplierID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object SupplierID_Like + { + set + { + this.HtParameter["SupplierID_Like"] = value; + } + get + { + return this.HtParameter["SupplierID_Like"]; + } + } + + + /// CompanyName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CompanyName_Like + { + set + { + this.HtParameter["CompanyName_Like"] = value; + } + get + { + return this.HtParameter["CompanyName_Like"]; + } + } + + + /// ContactName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ContactName_Like + { + set + { + this.HtParameter["ContactName_Like"] = value; + } + get + { + return this.HtParameter["ContactName_Like"]; + } + } + + + /// ContactTitle_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ContactTitle_Like + { + set + { + this.HtParameter["ContactTitle_Like"] = value; + } + get + { + return this.HtParameter["ContactTitle_Like"]; + } + } + + + /// Address_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Address_Like + { + set + { + this.HtParameter["Address_Like"] = value; + } + get + { + return this.HtParameter["Address_Like"]; + } + } + + + /// City_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object City_Like + { + set + { + this.HtParameter["City_Like"] = value; + } + get + { + return this.HtParameter["City_Like"]; + } + } + + + /// Region_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Region_Like + { + set + { + this.HtParameter["Region_Like"] = value; + } + get + { + return this.HtParameter["Region_Like"]; + } + } + + + /// PostalCode_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object PostalCode_Like + { + set + { + this.HtParameter["PostalCode_Like"] = value; + } + get + { + return this.HtParameter["PostalCode_Like"]; + } + } + + + /// Country_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Country_Like + { + set + { + this.HtParameter["Country_Like"] = value; + } + get + { + return this.HtParameter["Country_Like"]; + } + } + + + /// Phone_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Phone_Like + { + set + { + this.HtParameter["Phone_Like"] = value; + } + get + { + return this.HtParameter["Phone_Like"]; + } + } + + + /// Fax_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Fax_Like + { + set + { + this.HtParameter["Fax_Like"] = value; + } + get + { + return this.HtParameter["Fax_Like"]; + } + } + + + /// HomePage_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object HomePage_Like + { + set + { + this.HtParameter["HomePage_Like"] = value; + } + get + { + return this.HtParameter["HomePage_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoSuppliers_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoSuppliers_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoSuppliers_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoSuppliers_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoSuppliers_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoSuppliers_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoSuppliers_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoSuppliers_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoSuppliers_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs new file mode 100644 index 000000000..c9e666686 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.Designer.cs @@ -0,0 +1,883 @@ +namespace GenDaoAndBatUpd_sample +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.btnBatUpd = new System.Windows.Forms.Button(); + this.btnClear3 = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.btnSelectAll3 = new System.Windows.Forms.Button(); + this.dataGridView3 = new System.Windows.Forms.DataGridView(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.txtPicture_where = new System.Windows.Forms.TextBox(); + this.txtDescription_where = new System.Windows.Forms.TextBox(); + this.txtCategoryName_where = new System.Windows.Forms.TextBox(); + this.txtCategoryID_where = new System.Windows.Forms.TextBox(); + this.txtPicture = new System.Windows.Forms.TextBox(); + this.txtCategoryName = new System.Windows.Forms.TextBox(); + this.txtDescription = new System.Windows.Forms.TextBox(); + this.txtCategoryID = new System.Windows.Forms.TextBox(); + this.lblPicture_where = new System.Windows.Forms.Label(); + this.lblDescription_where = new System.Windows.Forms.Label(); + this.lblCategoryName_where = new System.Windows.Forms.Label(); + this.lblCategoryID_where = new System.Windows.Forms.Label(); + this.lblPicture = new System.Windows.Forms.Label(); + this.lblDescription = new System.Windows.Forms.Label(); + this.lblCategoryName = new System.Windows.Forms.Label(); + this.lblCategoryID = new System.Windows.Forms.Label(); + this.btnDelete2 = new System.Windows.Forms.Button(); + this.btnUpdate2 = new System.Windows.Forms.Button(); + this.btnInsert2 = new System.Windows.Forms.Button(); + this.btnSelect2 = new System.Windows.Forms.Button(); + this.btnClear2 = new System.Windows.Forms.Button(); + this.btnSelectAll2 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.dataGridView2 = new System.Windows.Forms.DataGridView(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.lblHomePage = new System.Windows.Forms.Label(); + this.txtHomePage = new System.Windows.Forms.TextBox(); + this.txtFax = new System.Windows.Forms.TextBox(); + this.txtPhone = new System.Windows.Forms.TextBox(); + this.txtCountry = new System.Windows.Forms.TextBox(); + this.txtPostalCode = new System.Windows.Forms.TextBox(); + this.txtRegion = new System.Windows.Forms.TextBox(); + this.txtCity = new System.Windows.Forms.TextBox(); + this.txtAddress = new System.Windows.Forms.TextBox(); + this.txtContactTitle = new System.Windows.Forms.TextBox(); + this.txtCompanyName = new System.Windows.Forms.TextBox(); + this.txtContactName = new System.Windows.Forms.TextBox(); + this.txtSupplierID = new System.Windows.Forms.TextBox(); + this.lblFax = new System.Windows.Forms.Label(); + this.lblPhone = new System.Windows.Forms.Label(); + this.lblCountry = new System.Windows.Forms.Label(); + this.lblPostalCode = new System.Windows.Forms.Label(); + this.lblRegion = new System.Windows.Forms.Label(); + this.lblCity = new System.Windows.Forms.Label(); + this.lblAddress = new System.Windows.Forms.Label(); + this.lblContactTitle = new System.Windows.Forms.Label(); + this.lblContactName = new System.Windows.Forms.Label(); + this.lblCompanyName = new System.Windows.Forms.Label(); + this.lblSupplierID = new System.Windows.Forms.Label(); + this.btnDelete1 = new System.Windows.Forms.Button(); + this.btnUpdate1 = new System.Windows.Forms.Button(); + this.btnInsert1 = new System.Windows.Forms.Button(); + this.btnSelect1 = new System.Windows.Forms.Button(); + this.btnClear1 = new System.Windows.Forms.Button(); + this.btnSelectAll1 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).BeginInit(); + this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); + this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.btnBatUpd); + this.tabPage3.Controls.Add(this.btnClear3); + this.tabPage3.Controls.Add(this.label5); + this.tabPage3.Controls.Add(this.btnSelectAll3); + this.tabPage3.Controls.Add(this.dataGridView3); + this.tabPage3.Location = new System.Drawing.Point(4, 21); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(693, 558); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "バッチ更新"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // btnBatUpd + // + this.btnBatUpd.Location = new System.Drawing.Point(12, 501); + this.btnBatUpd.Name = "btnBatUpd"; + this.btnBatUpd.Size = new System.Drawing.Size(666, 23); + this.btnBatUpd.TabIndex = 38; + this.btnBatUpd.Text = "バッチ更新"; + this.btnBatUpd.UseVisualStyleBackColor = true; + this.btnBatUpd.Click += new System.EventHandler(this.btnBatUpd_Click); + // + // btnClear3 + // + this.btnClear3.Location = new System.Drawing.Point(12, 530); + this.btnClear3.Name = "btnClear3"; + this.btnClear3.Size = new System.Drawing.Size(666, 23); + this.btnClear3.TabIndex = 37; + this.btnClear3.Text = "クリア"; + this.btnClear3.UseVisualStyleBackColor = true; + this.btnClear3.Click += new System.EventHandler(this.btnClear3_Click); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(10, 19); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(88, 12); + this.label5.TabIndex = 36; + this.label5.Text = "Productsテーブル"; + // + // btnSelectAll3 + // + this.btnSelectAll3.Location = new System.Drawing.Point(12, 472); + this.btnSelectAll3.Name = "btnSelectAll3"; + this.btnSelectAll3.Size = new System.Drawing.Size(666, 23); + this.btnSelectAll3.TabIndex = 1; + this.btnSelectAll3.Text = "全件取得"; + this.btnSelectAll3.UseVisualStyleBackColor = true; + this.btnSelectAll3.Click += new System.EventHandler(this.btnSelectAll3_Click); + // + // dataGridView3 + // + this.dataGridView3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView3.Location = new System.Drawing.Point(12, 34); + this.dataGridView3.Name = "dataGridView3"; + this.dataGridView3.RowTemplate.Height = 21; + this.dataGridView3.Size = new System.Drawing.Size(666, 432); + this.dataGridView3.TabIndex = 0; + this.dataGridView3.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView3_DataError); + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.label4); + this.tabPage2.Controls.Add(this.label3); + this.tabPage2.Controls.Add(this.txtPicture_where); + this.tabPage2.Controls.Add(this.txtDescription_where); + this.tabPage2.Controls.Add(this.txtCategoryName_where); + this.tabPage2.Controls.Add(this.txtCategoryID_where); + this.tabPage2.Controls.Add(this.txtPicture); + this.tabPage2.Controls.Add(this.txtCategoryName); + this.tabPage2.Controls.Add(this.txtDescription); + this.tabPage2.Controls.Add(this.txtCategoryID); + this.tabPage2.Controls.Add(this.lblPicture_where); + this.tabPage2.Controls.Add(this.lblDescription_where); + this.tabPage2.Controls.Add(this.lblCategoryName_where); + this.tabPage2.Controls.Add(this.lblCategoryID_where); + this.tabPage2.Controls.Add(this.lblPicture); + this.tabPage2.Controls.Add(this.lblDescription); + this.tabPage2.Controls.Add(this.lblCategoryName); + this.tabPage2.Controls.Add(this.lblCategoryID); + this.tabPage2.Controls.Add(this.btnDelete2); + this.tabPage2.Controls.Add(this.btnUpdate2); + this.tabPage2.Controls.Add(this.btnInsert2); + this.tabPage2.Controls.Add(this.btnSelect2); + this.tabPage2.Controls.Add(this.btnClear2); + this.tabPage2.Controls.Add(this.btnSelectAll2); + this.tabPage2.Controls.Add(this.label2); + this.tabPage2.Controls.Add(this.dataGridView2); + this.tabPage2.Location = new System.Drawing.Point(4, 21); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(693, 558); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "動的SQLのCRUD"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(144, 192); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 65; + this.label4.Text = "検索条件"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(144, 42); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(29, 12); + this.label3.TabIndex = 64; + this.label3.Text = "実値"; + // + // txtPicture_where + // + this.txtPicture_where.Enabled = false; + this.txtPicture_where.Location = new System.Drawing.Point(146, 282); + this.txtPicture_where.Name = "txtPicture_where"; + this.txtPicture_where.Size = new System.Drawing.Size(122, 19); + this.txtPicture_where.TabIndex = 62; + // + // txtDescription_where + // + this.txtDescription_where.Enabled = false; + this.txtDescription_where.Location = new System.Drawing.Point(146, 257); + this.txtDescription_where.Name = "txtDescription_where"; + this.txtDescription_where.Size = new System.Drawing.Size(122, 19); + this.txtDescription_where.TabIndex = 60; + // + // txtCategoryName_where + // + this.txtCategoryName_where.Location = new System.Drawing.Point(146, 232); + this.txtCategoryName_where.Name = "txtCategoryName_where"; + this.txtCategoryName_where.Size = new System.Drawing.Size(122, 19); + this.txtCategoryName_where.TabIndex = 58; + // + // txtCategoryID_where + // + this.txtCategoryID_where.Location = new System.Drawing.Point(146, 207); + this.txtCategoryID_where.Name = "txtCategoryID_where"; + this.txtCategoryID_where.Size = new System.Drawing.Size(122, 19); + this.txtCategoryID_where.TabIndex = 56; + // + // txtPicture + // + this.txtPicture.Enabled = false; + this.txtPicture.Location = new System.Drawing.Point(146, 132); + this.txtPicture.Name = "txtPicture"; + this.txtPicture.Size = new System.Drawing.Size(122, 19); + this.txtPicture.TabIndex = 48; + // + // txtCategoryName + // + this.txtCategoryName.Location = new System.Drawing.Point(146, 82); + this.txtCategoryName.Name = "txtCategoryName"; + this.txtCategoryName.Size = new System.Drawing.Size(122, 19); + this.txtCategoryName.TabIndex = 46; + // + // txtDescription + // + this.txtDescription.Location = new System.Drawing.Point(146, 107); + this.txtDescription.Name = "txtDescription"; + this.txtDescription.Size = new System.Drawing.Size(122, 19); + this.txtDescription.TabIndex = 43; + // + // txtCategoryID + // + this.txtCategoryID.Enabled = false; + this.txtCategoryID.Location = new System.Drawing.Point(146, 57); + this.txtCategoryID.Name = "txtCategoryID"; + this.txtCategoryID.Size = new System.Drawing.Size(122, 19); + this.txtCategoryID.TabIndex = 42; + // + // lblPicture_where + // + this.lblPicture_where.AutoSize = true; + this.lblPicture_where.Location = new System.Drawing.Point(65, 285); + this.lblPicture_where.Name = "lblPicture_where"; + this.lblPicture_where.Size = new System.Drawing.Size(75, 12); + this.lblPicture_where.TabIndex = 63; + this.lblPicture_where.Text = "Picture_where"; + // + // lblDescription_where + // + this.lblDescription_where.AutoSize = true; + this.lblDescription_where.Location = new System.Drawing.Point(43, 260); + this.lblDescription_where.Name = "lblDescription_where"; + this.lblDescription_where.Size = new System.Drawing.Size(97, 12); + this.lblDescription_where.TabIndex = 61; + this.lblDescription_where.Text = "Description_where"; + // + // lblCategoryName_where + // + this.lblCategoryName_where.AutoSize = true; + this.lblCategoryName_where.Location = new System.Drawing.Point(26, 235); + this.lblCategoryName_where.Name = "lblCategoryName_where"; + this.lblCategoryName_where.Size = new System.Drawing.Size(114, 12); + this.lblCategoryName_where.TabIndex = 59; + this.lblCategoryName_where.Text = "CategoryName_where"; + // + // lblCategoryID_where + // + this.lblCategoryID_where.AutoSize = true; + this.lblCategoryID_where.Location = new System.Drawing.Point(44, 210); + this.lblCategoryID_where.Name = "lblCategoryID_where"; + this.lblCategoryID_where.Size = new System.Drawing.Size(96, 12); + this.lblCategoryID_where.TabIndex = 57; + this.lblCategoryID_where.Text = "CategoryID_where"; + // + // lblPicture + // + this.lblPicture.AutoSize = true; + this.lblPicture.Location = new System.Drawing.Point(99, 135); + this.lblPicture.Name = "lblPicture"; + this.lblPicture.Size = new System.Drawing.Size(41, 12); + this.lblPicture.TabIndex = 49; + this.lblPicture.Text = "Picture"; + // + // lblDescription + // + this.lblDescription.AutoSize = true; + this.lblDescription.Location = new System.Drawing.Point(77, 110); + this.lblDescription.Name = "lblDescription"; + this.lblDescription.Size = new System.Drawing.Size(63, 12); + this.lblDescription.TabIndex = 47; + this.lblDescription.Text = "Description"; + // + // lblCategoryName + // + this.lblCategoryName.AutoSize = true; + this.lblCategoryName.Location = new System.Drawing.Point(60, 85); + this.lblCategoryName.Name = "lblCategoryName"; + this.lblCategoryName.Size = new System.Drawing.Size(80, 12); + this.lblCategoryName.TabIndex = 45; + this.lblCategoryName.Text = "CategoryName"; + // + // lblCategoryID + // + this.lblCategoryID.AutoSize = true; + this.lblCategoryID.Location = new System.Drawing.Point(78, 60); + this.lblCategoryID.Name = "lblCategoryID"; + this.lblCategoryID.Size = new System.Drawing.Size(62, 12); + this.lblCategoryID.TabIndex = 44; + this.lblCategoryID.Text = "CategoryID"; + // + // btnDelete2 + // + this.btnDelete2.Location = new System.Drawing.Point(6, 530); + this.btnDelete2.Name = "btnDelete2"; + this.btnDelete2.Size = new System.Drawing.Size(262, 23); + this.btnDelete2.TabIndex = 41; + this.btnDelete2.Text = "デリート"; + this.btnDelete2.UseVisualStyleBackColor = true; + this.btnDelete2.Click += new System.EventHandler(this.btnDelete2_Click); + // + // btnUpdate2 + // + this.btnUpdate2.Location = new System.Drawing.Point(6, 501); + this.btnUpdate2.Name = "btnUpdate2"; + this.btnUpdate2.Size = new System.Drawing.Size(262, 23); + this.btnUpdate2.TabIndex = 40; + this.btnUpdate2.Text = "アップデート"; + this.btnUpdate2.UseVisualStyleBackColor = true; + this.btnUpdate2.Click += new System.EventHandler(this.btnUpdate2_Click); + // + // btnInsert2 + // + this.btnInsert2.Location = new System.Drawing.Point(6, 443); + this.btnInsert2.Name = "btnInsert2"; + this.btnInsert2.Size = new System.Drawing.Size(262, 23); + this.btnInsert2.TabIndex = 39; + this.btnInsert2.Text = "インサート"; + this.btnInsert2.UseVisualStyleBackColor = true; + this.btnInsert2.Click += new System.EventHandler(this.btnInsert2_Click); + // + // btnSelect2 + // + this.btnSelect2.Location = new System.Drawing.Point(6, 472); + this.btnSelect2.Name = "btnSelect2"; + this.btnSelect2.Size = new System.Drawing.Size(262, 23); + this.btnSelect2.TabIndex = 38; + this.btnSelect2.Text = "セレクト"; + this.btnSelect2.UseVisualStyleBackColor = true; + this.btnSelect2.Click += new System.EventHandler(this.btnSelect2_Click); + // + // btnClear2 + // + this.btnClear2.Location = new System.Drawing.Point(274, 530); + this.btnClear2.Name = "btnClear2"; + this.btnClear2.Size = new System.Drawing.Size(413, 23); + this.btnClear2.TabIndex = 37; + this.btnClear2.Text = "クリア"; + this.btnClear2.UseVisualStyleBackColor = true; + this.btnClear2.Click += new System.EventHandler(this.btnClear2_Click); + // + // btnSelectAll2 + // + this.btnSelectAll2.Location = new System.Drawing.Point(274, 501); + this.btnSelectAll2.Name = "btnSelectAll2"; + this.btnSelectAll2.Size = new System.Drawing.Size(413, 23); + this.btnSelectAll2.TabIndex = 36; + this.btnSelectAll2.Text = "全件取得"; + this.btnSelectAll2.UseVisualStyleBackColor = true; + this.btnSelectAll2.Click += new System.EventHandler(this.btnSelectAll2_Click); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(272, 19); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(89, 12); + this.label2.TabIndex = 35; + this.label2.Text = "Categoryテーブル"; + // + // dataGridView2 + // + this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView2.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGridView2.Location = new System.Drawing.Point(274, 34); + this.dataGridView2.Name = "dataGridView2"; + this.dataGridView2.RowTemplate.Height = 21; + this.dataGridView2.Size = new System.Drawing.Size(413, 461); + this.dataGridView2.TabIndex = 34; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.lblHomePage); + this.tabPage1.Controls.Add(this.txtHomePage); + this.tabPage1.Controls.Add(this.txtFax); + this.tabPage1.Controls.Add(this.txtPhone); + this.tabPage1.Controls.Add(this.txtCountry); + this.tabPage1.Controls.Add(this.txtPostalCode); + this.tabPage1.Controls.Add(this.txtRegion); + this.tabPage1.Controls.Add(this.txtCity); + this.tabPage1.Controls.Add(this.txtAddress); + this.tabPage1.Controls.Add(this.txtContactTitle); + this.tabPage1.Controls.Add(this.txtCompanyName); + this.tabPage1.Controls.Add(this.txtContactName); + this.tabPage1.Controls.Add(this.txtSupplierID); + this.tabPage1.Controls.Add(this.lblFax); + this.tabPage1.Controls.Add(this.lblPhone); + this.tabPage1.Controls.Add(this.lblCountry); + this.tabPage1.Controls.Add(this.lblPostalCode); + this.tabPage1.Controls.Add(this.lblRegion); + this.tabPage1.Controls.Add(this.lblCity); + this.tabPage1.Controls.Add(this.lblAddress); + this.tabPage1.Controls.Add(this.lblContactTitle); + this.tabPage1.Controls.Add(this.lblContactName); + this.tabPage1.Controls.Add(this.lblCompanyName); + this.tabPage1.Controls.Add(this.lblSupplierID); + this.tabPage1.Controls.Add(this.btnDelete1); + this.tabPage1.Controls.Add(this.btnUpdate1); + this.tabPage1.Controls.Add(this.btnInsert1); + this.tabPage1.Controls.Add(this.btnSelect1); + this.tabPage1.Controls.Add(this.btnClear1); + this.tabPage1.Controls.Add(this.btnSelectAll1); + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.Controls.Add(this.dataGridView1); + this.tabPage1.Location = new System.Drawing.Point(4, 21); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(693, 558); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "静的SQLのCRUD"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // lblHomePage + // + this.lblHomePage.AutoSize = true; + this.lblHomePage.Location = new System.Drawing.Point(36, 310); + this.lblHomePage.Name = "lblHomePage"; + this.lblHomePage.Size = new System.Drawing.Size(59, 12); + this.lblHomePage.TabIndex = 33; + this.lblHomePage.Text = "HomePage"; + // + // txtHomePage + // + this.txtHomePage.Location = new System.Drawing.Point(101, 307); + this.txtHomePage.Name = "txtHomePage"; + this.txtHomePage.Size = new System.Drawing.Size(122, 19); + this.txtHomePage.TabIndex = 32; + // + // txtFax + // + this.txtFax.Location = new System.Drawing.Point(101, 282); + this.txtFax.Name = "txtFax"; + this.txtFax.Size = new System.Drawing.Size(122, 19); + this.txtFax.TabIndex = 30; + // + // txtPhone + // + this.txtPhone.Location = new System.Drawing.Point(101, 257); + this.txtPhone.Name = "txtPhone"; + this.txtPhone.Size = new System.Drawing.Size(122, 19); + this.txtPhone.TabIndex = 28; + // + // txtCountry + // + this.txtCountry.Location = new System.Drawing.Point(101, 232); + this.txtCountry.Name = "txtCountry"; + this.txtCountry.Size = new System.Drawing.Size(122, 19); + this.txtCountry.TabIndex = 26; + // + // txtPostalCode + // + this.txtPostalCode.Location = new System.Drawing.Point(101, 207); + this.txtPostalCode.Name = "txtPostalCode"; + this.txtPostalCode.Size = new System.Drawing.Size(122, 19); + this.txtPostalCode.TabIndex = 24; + // + // txtRegion + // + this.txtRegion.Location = new System.Drawing.Point(101, 182); + this.txtRegion.Name = "txtRegion"; + this.txtRegion.Size = new System.Drawing.Size(122, 19); + this.txtRegion.TabIndex = 22; + // + // txtCity + // + this.txtCity.Location = new System.Drawing.Point(101, 157); + this.txtCity.Name = "txtCity"; + this.txtCity.Size = new System.Drawing.Size(122, 19); + this.txtCity.TabIndex = 20; + // + // txtAddress + // + this.txtAddress.Location = new System.Drawing.Point(101, 132); + this.txtAddress.Name = "txtAddress"; + this.txtAddress.Size = new System.Drawing.Size(122, 19); + this.txtAddress.TabIndex = 18; + // + // txtContactTitle + // + this.txtContactTitle.Location = new System.Drawing.Point(101, 107); + this.txtContactTitle.Name = "txtContactTitle"; + this.txtContactTitle.Size = new System.Drawing.Size(122, 19); + this.txtContactTitle.TabIndex = 16; + // + // txtCompanyName + // + this.txtCompanyName.Location = new System.Drawing.Point(101, 57); + this.txtCompanyName.Name = "txtCompanyName"; + this.txtCompanyName.Size = new System.Drawing.Size(122, 19); + this.txtCompanyName.TabIndex = 14; + // + // txtContactName + // + this.txtContactName.Location = new System.Drawing.Point(101, 82); + this.txtContactName.Name = "txtContactName"; + this.txtContactName.Size = new System.Drawing.Size(122, 19); + this.txtContactName.TabIndex = 9; + // + // txtSupplierID + // + this.txtSupplierID.Location = new System.Drawing.Point(101, 32); + this.txtSupplierID.Name = "txtSupplierID"; + this.txtSupplierID.Size = new System.Drawing.Size(122, 19); + this.txtSupplierID.TabIndex = 8; + // + // lblFax + // + this.lblFax.AutoSize = true; + this.lblFax.Location = new System.Drawing.Point(71, 285); + this.lblFax.Name = "lblFax"; + this.lblFax.Size = new System.Drawing.Size(24, 12); + this.lblFax.TabIndex = 31; + this.lblFax.Text = "Fax"; + // + // lblPhone + // + this.lblPhone.AutoSize = true; + this.lblPhone.Location = new System.Drawing.Point(59, 260); + this.lblPhone.Name = "lblPhone"; + this.lblPhone.Size = new System.Drawing.Size(36, 12); + this.lblPhone.TabIndex = 29; + this.lblPhone.Text = "Phone"; + // + // lblCountry + // + this.lblCountry.AutoSize = true; + this.lblCountry.Location = new System.Drawing.Point(50, 235); + this.lblCountry.Name = "lblCountry"; + this.lblCountry.Size = new System.Drawing.Size(45, 12); + this.lblCountry.TabIndex = 27; + this.lblCountry.Text = "Country"; + // + // lblPostalCode + // + this.lblPostalCode.AutoSize = true; + this.lblPostalCode.Location = new System.Drawing.Point(32, 210); + this.lblPostalCode.Name = "lblPostalCode"; + this.lblPostalCode.Size = new System.Drawing.Size(63, 12); + this.lblPostalCode.TabIndex = 25; + this.lblPostalCode.Text = "PostalCode"; + // + // lblRegion + // + this.lblRegion.AutoSize = true; + this.lblRegion.Location = new System.Drawing.Point(55, 185); + this.lblRegion.Name = "lblRegion"; + this.lblRegion.Size = new System.Drawing.Size(40, 12); + this.lblRegion.TabIndex = 23; + this.lblRegion.Text = "Region"; + // + // lblCity + // + this.lblCity.AutoSize = true; + this.lblCity.Location = new System.Drawing.Point(69, 160); + this.lblCity.Name = "lblCity"; + this.lblCity.Size = new System.Drawing.Size(26, 12); + this.lblCity.TabIndex = 21; + this.lblCity.Text = "City"; + // + // lblAddress + // + this.lblAddress.AutoSize = true; + this.lblAddress.Location = new System.Drawing.Point(48, 135); + this.lblAddress.Name = "lblAddress"; + this.lblAddress.Size = new System.Drawing.Size(47, 12); + this.lblAddress.TabIndex = 19; + this.lblAddress.Text = "Address"; + // + // lblContactTitle + // + this.lblContactTitle.AutoSize = true; + this.lblContactTitle.Location = new System.Drawing.Point(27, 110); + this.lblContactTitle.Name = "lblContactTitle"; + this.lblContactTitle.Size = new System.Drawing.Size(68, 12); + this.lblContactTitle.TabIndex = 17; + this.lblContactTitle.Text = "ContactTitle"; + // + // lblContactName + // + this.lblContactName.AutoSize = true; + this.lblContactName.Location = new System.Drawing.Point(21, 85); + this.lblContactName.Name = "lblContactName"; + this.lblContactName.Size = new System.Drawing.Size(74, 12); + this.lblContactName.TabIndex = 15; + this.lblContactName.Text = "ContactName"; + // + // lblCompanyName + // + this.lblCompanyName.AutoSize = true; + this.lblCompanyName.Location = new System.Drawing.Point(14, 60); + this.lblCompanyName.Name = "lblCompanyName"; + this.lblCompanyName.Size = new System.Drawing.Size(81, 12); + this.lblCompanyName.TabIndex = 13; + this.lblCompanyName.Text = "CompanyName"; + // + // lblSupplierID + // + this.lblSupplierID.AutoSize = true; + this.lblSupplierID.Location = new System.Drawing.Point(38, 35); + this.lblSupplierID.Name = "lblSupplierID"; + this.lblSupplierID.Size = new System.Drawing.Size(57, 12); + this.lblSupplierID.TabIndex = 12; + this.lblSupplierID.Text = "SupplierID"; + // + // btnDelete1 + // + this.btnDelete1.Location = new System.Drawing.Point(6, 530); + this.btnDelete1.Name = "btnDelete1"; + this.btnDelete1.Size = new System.Drawing.Size(217, 23); + this.btnDelete1.TabIndex = 7; + this.btnDelete1.Text = "デリート"; + this.btnDelete1.UseVisualStyleBackColor = true; + this.btnDelete1.Click += new System.EventHandler(this.btnDelete1_Click); + // + // btnUpdate1 + // + this.btnUpdate1.Location = new System.Drawing.Point(6, 501); + this.btnUpdate1.Name = "btnUpdate1"; + this.btnUpdate1.Size = new System.Drawing.Size(217, 23); + this.btnUpdate1.TabIndex = 6; + this.btnUpdate1.Text = "アップデート"; + this.btnUpdate1.UseVisualStyleBackColor = true; + this.btnUpdate1.Click += new System.EventHandler(this.btnUpdate1_Click); + // + // btnInsert1 + // + this.btnInsert1.Location = new System.Drawing.Point(6, 443); + this.btnInsert1.Name = "btnInsert1"; + this.btnInsert1.Size = new System.Drawing.Size(217, 23); + this.btnInsert1.TabIndex = 5; + this.btnInsert1.Text = "インサート"; + this.btnInsert1.UseVisualStyleBackColor = true; + this.btnInsert1.Click += new System.EventHandler(this.btnInsert1_Click); + // + // btnSelect1 + // + this.btnSelect1.Location = new System.Drawing.Point(6, 472); + this.btnSelect1.Name = "btnSelect1"; + this.btnSelect1.Size = new System.Drawing.Size(217, 23); + this.btnSelect1.TabIndex = 4; + this.btnSelect1.Text = "セレクト"; + this.btnSelect1.UseVisualStyleBackColor = true; + this.btnSelect1.Click += new System.EventHandler(this.btnSelect1_Click); + // + // btnClear1 + // + this.btnClear1.Location = new System.Drawing.Point(229, 530); + this.btnClear1.Name = "btnClear1"; + this.btnClear1.Size = new System.Drawing.Size(458, 23); + this.btnClear1.TabIndex = 3; + this.btnClear1.Text = "クリア"; + this.btnClear1.UseVisualStyleBackColor = true; + this.btnClear1.Click += new System.EventHandler(this.btnClear1_Click); + // + // btnSelectAll1 + // + this.btnSelectAll1.Location = new System.Drawing.Point(229, 501); + this.btnSelectAll1.Name = "btnSelectAll1"; + this.btnSelectAll1.Size = new System.Drawing.Size(458, 23); + this.btnSelectAll1.TabIndex = 2; + this.btnSelectAll1.Text = "全件取得"; + this.btnSelectAll1.UseVisualStyleBackColor = true; + this.btnSelectAll1.Click += new System.EventHandler(this.btnSelectAll1_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(229, 19); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(90, 12); + this.label1.TabIndex = 1; + this.label1.Text = "Suppliersテーブル"; + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dataGridView1.Location = new System.Drawing.Point(229, 34); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 21; + this.dataGridView1.Size = new System.Drawing.Size(458, 461); + this.dataGridView1.TabIndex = 0; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Controls.Add(this.tabPage4); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(701, 583); + this.tabControl1.TabIndex = 0; + // + // tabPage4 + // + this.tabPage4.Controls.Add(this.pictureBox1); + this.tabPage4.Location = new System.Drawing.Point(4, 21); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Size = new System.Drawing.Size(693, 558); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "ダイアグラム"; + this.tabPage4.UseVisualStyleBackColor = true; + // + // pictureBox1 + // + this.pictureBox1.Image = global::GenDaoAndBatUpd_sample.Resources.Diagram; + this.pictureBox1.InitialImage = global::GenDaoAndBatUpd_sample.Resources.Diagram; + this.pictureBox1.Location = new System.Drawing.Point(3, 3); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(708, 552); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(725, 600); + this.Controls.Add(this.tabControl1); + this.Name = "Form1"; + this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.tabPage3.ResumeLayout(false); + this.tabPage3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).EndInit(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit(); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TextBox txtPicture_where; + private System.Windows.Forms.TextBox txtDescription_where; + private System.Windows.Forms.TextBox txtCategoryName_where; + private System.Windows.Forms.TextBox txtCategoryID_where; + private System.Windows.Forms.TextBox txtPicture; + private System.Windows.Forms.TextBox txtCategoryName; + private System.Windows.Forms.TextBox txtDescription; + private System.Windows.Forms.TextBox txtCategoryID; + private System.Windows.Forms.Label lblPicture_where; + private System.Windows.Forms.Label lblDescription_where; + private System.Windows.Forms.Label lblCategoryName_where; + private System.Windows.Forms.Label lblCategoryID_where; + private System.Windows.Forms.Label lblPicture; + private System.Windows.Forms.Label lblDescription; + private System.Windows.Forms.Label lblCategoryName; + private System.Windows.Forms.Label lblCategoryID; + private System.Windows.Forms.Button btnDelete2; + private System.Windows.Forms.Button btnUpdate2; + private System.Windows.Forms.Button btnInsert2; + private System.Windows.Forms.Button btnSelect2; + private System.Windows.Forms.Button btnClear2; + private System.Windows.Forms.Button btnSelectAll2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DataGridView dataGridView2; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.Label lblHomePage; + private System.Windows.Forms.TextBox txtHomePage; + private System.Windows.Forms.TextBox txtFax; + private System.Windows.Forms.TextBox txtPhone; + private System.Windows.Forms.TextBox txtCountry; + private System.Windows.Forms.TextBox txtPostalCode; + private System.Windows.Forms.TextBox txtRegion; + private System.Windows.Forms.TextBox txtCity; + private System.Windows.Forms.TextBox txtAddress; + private System.Windows.Forms.TextBox txtContactTitle; + private System.Windows.Forms.TextBox txtCompanyName; + private System.Windows.Forms.TextBox txtContactName; + private System.Windows.Forms.TextBox txtSupplierID; + private System.Windows.Forms.Label lblFax; + private System.Windows.Forms.Label lblPhone; + private System.Windows.Forms.Label lblCountry; + private System.Windows.Forms.Label lblPostalCode; + private System.Windows.Forms.Label lblRegion; + private System.Windows.Forms.Label lblCity; + private System.Windows.Forms.Label lblAddress; + private System.Windows.Forms.Label lblContactTitle; + private System.Windows.Forms.Label lblContactName; + private System.Windows.Forms.Label lblCompanyName; + private System.Windows.Forms.Label lblSupplierID; + private System.Windows.Forms.Button btnDelete1; + private System.Windows.Forms.Button btnUpdate1; + private System.Windows.Forms.Button btnInsert1; + private System.Windows.Forms.Button btnSelect1; + private System.Windows.Forms.Button btnClear1; + private System.Windows.Forms.Button btnSelectAll1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Button btnSelectAll3; + private System.Windows.Forms.DataGridView dataGridView3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Button btnBatUpd; + private System.Windows.Forms.Button btnClear3; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.PictureBox pictureBox1; + } +} + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs new file mode 100644 index 000000000..9d0d28596 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.cs @@ -0,0 +1,821 @@ +//********************************************************************************** +//* バッチ更新処理・サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：自動生成したDaoの利用サンプル +//* ＋ データテーブルを使用したバッチ更新サンプル +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using GenDaoAndBatUpd_sample.Business; +using GenDaoAndBatUpd_sample.Common; + +using System; +using System.Data; +using System.Drawing; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Framework.RichClient.Business; +using Touryo.Infrastructure.Public.Db; + +namespace GenDaoAndBatUpd_sample +{ + /// 自動生成したDaoの利用サンプル＋データテーブルを使用したバッチ更新サンプル + public partial class Form1 : Form + { + /// ユーザ情報 + MyUserInfo myUserInfo; + + #region 初期処理 + + /// コンストラクタ + public Form1() + { + InitializeComponent(); + + // 埋め込まれたリソースモード + MyBaseDao.UseEmbeddedResource = true; + } + + /// ロード イベント + private void Form1_Load(object sender, EventArgs e) + { + #region フローレイアウト風にする。 + + // タブ + this.tabControl1.Anchor = (AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + + // グリッド + this.dataGridView1.Anchor = (AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + this.dataGridView2.Anchor = (AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + this.dataGridView3.Anchor = (AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + + // ピクチャ + this.pictureBox1.Anchor = (AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + + // ボタンＡ + this.btnInsert1.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + this.btnInsert2.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + + this.btnSelect1.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + this.btnSelect2.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + + this.btnUpdate1.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + this.btnUpdate2.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + + this.btnDelete1.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + this.btnDelete2.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left); + + // ボタンＢ + this.btnSelectAll1.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + this.btnSelectAll2.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + this.btnSelectAll3.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + + this.btnClear1.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + this.btnClear2.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + this.btnClear3.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + + this.btnBatUpd.Anchor = (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right); + + #endregion + + // ユーザ情報 + this.myUserInfo = new MyUserInfo("userName", Environment.MachineName); + } + + #endregion + + #region データのロード + + /// Suppliersテーブルの取得 + private DataTable GetSuppliers(string controlId) + { + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, controlId, "SelectAll", "SQL", this.myUserInfo); + + // Ｂ層呼び出し + LayerB_Static lb = new LayerB_Static(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // 戻り値 + return (DataTable)testReturnValue.dt; + } + + /// Categoryテーブルの取得 + private DataTable GetCategory(string controlId) + { + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, controlId, "SelectAll", "SQL", this.myUserInfo); + + // Ｂ層呼び出し + LayerB_Dynamic lb = new LayerB_Dynamic(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // 戻り値 + return (DataTable)testReturnValue.dt; + } + + #endregion + + #region タブ１ + + #region 色をクリア + + /// 色をクリア + private void ClearColor1() + { + txtSupplierID.BackColor = Color.White; + txtCompanyName.BackColor = Color.White; + txtContactName.BackColor = Color.White; + txtContactTitle.BackColor = Color.White; + txtAddress.BackColor = Color.White; + txtCity.BackColor = Color.White; + txtRegion.BackColor = Color.White; + txtPostalCode.BackColor = Color.White; + txtCountry.BackColor = Color.White; + txtPhone.BackColor = Color.White; + txtFax.BackColor = Color.White; + txtHomePage.BackColor = Color.White; + } + + #endregion + + #region データグリッド１ + + /// グリッド１にデータをロード + private void btnSelectAll1_Click(object sender, EventArgs e) + { + // データをロード + this.dataGridView1.DataSource = this.GetSuppliers(((Button)sender).Name); + } + + /// グリッド１をクリア + private void btnClear1_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor1(); + + // クリア + this.dataGridView1.DataSource = null; + } + + #endregion + + # region 静的SQLのCRUD + + /// インサート + private void btnInsert1_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor1(); + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Insert", "SQL", this.myUserInfo); + + testParameterValue.field1 = ""; // SupplierID + + testParameterValue.field2 = txtCompanyName.Text; // CompanyName + txtCompanyName.BackColor = Color.LightYellow; + + testParameterValue.field3 = txtContactName.Text; // ContactName + txtContactName.BackColor = Color.LightYellow; + + testParameterValue.field4 = txtContactTitle.Text; // ContactTitle + txtContactTitle.BackColor = Color.LightYellow; + + testParameterValue.field5 = txtAddress.Text; // Address + txtAddress.BackColor = Color.LightYellow; + + testParameterValue.field6 = txtCity.Text; // City + txtCity.BackColor = Color.LightYellow; + + testParameterValue.field7 = txtRegion.Text; // Region + txtRegion.BackColor = Color.LightYellow; + + testParameterValue.field8 = txtPostalCode.Text; // PostalCode + txtPostalCode.BackColor = Color.LightYellow; + + testParameterValue.field9 = txtCountry.Text; // Country + txtCountry.BackColor = Color.LightYellow; + + testParameterValue.field10 = txtPhone.Text; // Phone + txtPhone.BackColor = Color.LightYellow; + + testParameterValue.field11 = txtFax.Text; // Fax + txtFax.BackColor = Color.LightYellow; + + testParameterValue.field12 = txtHomePage.Text; // HomePage + txtHomePage.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Static lb = new LayerB_Static(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll1_Click(sender,e); + } + + /// セレクト + private void btnSelect1_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor1(); + + // 主キーが無ければ、何もしない。 + if (txtSupplierID.Text == "") + { + MessageBox.Show("主キー（SupplierID）を入力してください。"); + return; + } + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Select", "SQL", this.myUserInfo); + + testParameterValue.field1 = txtSupplierID.Text; // SupplierID + txtSupplierID.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Static lb = new LayerB_Static(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // 戻り値 + txtCompanyName.Text = testReturnValue.field2.ToString(); // CompanyName + txtContactName.Text = testReturnValue.field3.ToString(); // ContactName + txtContactTitle.Text = testReturnValue.field4.ToString(); // ContactTitle + txtAddress.Text = testReturnValue.field5.ToString(); // Address + txtCity.Text = testReturnValue.field6.ToString(); // City + txtRegion.Text = testReturnValue.field7.ToString(); // Region + txtPostalCode.Text = testReturnValue.field8.ToString(); // PostalCode + txtCountry.Text = testReturnValue.field9.ToString(); // Country + txtPhone.Text = testReturnValue.field10.ToString(); // Phone + txtFax.Text = testReturnValue.field11.ToString(); // Fax + txtHomePage.Text = testReturnValue.field12.ToString(); // HomePage + } + + /// アップデート + private void btnUpdate1_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor1(); + + // 主キーが無ければ、何もしない。 + if (txtSupplierID.Text == "") + { + MessageBox.Show("主キー（SupplierID）を入力してください。"); + return; + } + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Update", "SQL", this.myUserInfo); + + testParameterValue.field1 = txtSupplierID.Text; // SupplierID + txtSupplierID.BackColor = Color.LightYellow; + + testParameterValue.field2_ForUpd = txtCompanyName.Text; // CompanyName + txtCompanyName.BackColor = Color.LightYellow; + + testParameterValue.field3_ForUpd = txtContactName.Text; // ContactName + txtContactName.BackColor = Color.LightYellow; + + testParameterValue.field4_ForUpd = txtContactTitle.Text; // ContactTitle + txtContactTitle.BackColor = Color.LightYellow; + + testParameterValue.field5_ForUpd = txtAddress.Text; // Address + txtAddress.BackColor = Color.LightYellow; + + testParameterValue.field6_ForUpd = txtCity.Text; // City + txtCity.BackColor = Color.LightYellow; + + testParameterValue.field7_ForUpd = txtRegion.Text; // Region + txtRegion.BackColor = Color.LightYellow; + + testParameterValue.field8_ForUpd = txtPostalCode.Text; // PostalCode + txtPostalCode.BackColor = Color.LightYellow; + + testParameterValue.field9_ForUpd = txtCountry.Text; // Country + txtCountry.BackColor = Color.LightYellow; + + testParameterValue.field10_ForUpd = txtPhone.Text; // Phone + txtPhone.BackColor = Color.LightYellow; + + testParameterValue.field11_ForUpd = txtFax.Text; // Fax + txtFax.BackColor = Color.LightYellow; + + testParameterValue.field12_ForUpd = txtHomePage.Text; // HomePage + txtHomePage.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Static lb = new LayerB_Static(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll1_Click(sender, e); + } + + /// デリート + private void btnDelete1_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor1(); + + // 主キーが無ければ、何もしない。 + if (txtSupplierID.Text == "") + { + MessageBox.Show("主キー（SupplierID）を入力してください。"); + return; + } + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Delete", "SQL", this.myUserInfo); + + testParameterValue.field1 = txtSupplierID.Text; // SupplierID + txtSupplierID.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Static lb = new LayerB_Static(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll1_Click(sender, e); + } + + #endregion + + #endregion + + #region タブ２ + + #region 色をクリア + + /// 色をクリア + private void ClearColor2() + { + txtCategoryID.BackColor = Color.White; + txtCategoryName.BackColor = Color.White; + txtDescription.BackColor = Color.White; + //txtPicture.BackColor = Color.White; + + txtCategoryID_where.BackColor = Color.White; + txtCategoryName_where.BackColor = Color.White; + //txtDescription_where.BackColor = Color.White; + //txtPicture_where.BackColor = Color.White; + } + + #endregion + + #region データグリッド２ + + /// グリッド２にデータをロード + private void btnSelectAll2_Click(object sender, EventArgs e) + { + // データをロード + this.dataGridView2.DataSource = this.GetCategory(((Button)sender).Name); + } + + /// グリッド２をクリア + private void btnClear2_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor2(); + + // クリア + this.dataGridView2.DataSource = null; + } + + #endregion + + #region 動的SQLのCRUD + + /// インサート + private void btnInsert2_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor2(); + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Insert", "SQL", this.myUserInfo); + + // データを入力できないのでパス + //testParameterValue.field1 = this.txtCategoryID; // CategoryID + //this.txtCategoryID.BackColor = Color.LightYellow; + + testParameterValue.field2 = this.txtCategoryName.Text; // CategoryName + this.txtCategoryName.BackColor = Color.LightYellow; + + testParameterValue.field3 = this.txtDescription.Text; // Description + this.txtDescription.BackColor = Color.LightYellow; + + // データを入力できないのでパス + //testParameterValue.field4 = this.txtPicture.Text; // Picture + //this.txtPicture.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Dynamic lb = new LayerB_Dynamic(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll2_Click(sender, e); + } + + /// セレクト + private void btnSelect2_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor2(); + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Select", "SQL", this.myUserInfo); + + testParameterValue.field1_ForSearch = txtCategoryID_where.Text; // CategoryID_where + txtCategoryID_where.BackColor = Color.LightYellow; + + testParameterValue.field2_ForSearch = txtCategoryName_where.Text; // CategoryName_where + txtCategoryName_where.BackColor = Color.LightYellow; + + // 検索条件に使えない↓ + + //testParameterValue.field3_ForSearch = txtDescription_where.Text; // Description_where + //txtDescription_where.BackColor = Color.LightYellow; + + //testParameterValue.field4_ForSearch = txtPicture_where.Text; // Picture + //txtPicture_where.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Dynamic lb = new LayerB_Dynamic(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // 戻り値を設定 + this.dataGridView2.DataSource = testReturnValue.dt; + } + + /// アップデート + private void btnUpdate2_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor2(); + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Update", "SQL", this.myUserInfo); + + // 更新値 + //testParameterValue.field1_ForUpd = txtCategoryID.Text; // CategoryID + //txtCategoryID.BackColor = Color.LightYellow; + + testParameterValue.field2_ForUpd = txtCategoryName.Text; // CategoryName + txtCategoryName.BackColor = Color.LightYellow; + + testParameterValue.field3_ForUpd = txtDescription.Text; // Description + txtDescription.BackColor = Color.LightYellow; + + // 検索条件 + testParameterValue.field1_ForSearch = txtCategoryID_where.Text; // CategoryID_where + txtCategoryID_where.BackColor = Color.LightYellow; + + testParameterValue.field2_ForSearch = txtCategoryName_where.Text; // CategoryName_where + txtCategoryName_where.BackColor = Color.LightYellow; + + // 検索条件に使えない↓ + + //testParameterValue.field3_ForSearch = txtDescription_where.Text; // Description_where + //txtDescription_where.BackColor = Color.LightYellow; + + //testParameterValue.field4_ForSearch = txtPicture_where.Text; // Picture + //txtPicture_where.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Dynamic lb = new LayerB_Dynamic(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll2_Click(sender, e); + } + + /// デリート + private void btnDelete2_Click(object sender, EventArgs e) + { + // 色のクリア + this.ClearColor2(); + + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Delete", "SQL", this.myUserInfo); + + // 検索条件 + testParameterValue.field1_ForSearch = txtCategoryID_where.Text; // CategoryID_where + txtCategoryID_where.BackColor = Color.LightYellow; + + testParameterValue.field2_ForSearch = txtCategoryName_where.Text; // CategoryName_where + txtCategoryName_where.BackColor = Color.LightYellow; + + // 検索条件に使えない↓ + + //testParameterValue.field3_ForSearch = txtDescription_where.Text; // Description_where + //txtDescription_where.BackColor = Color.LightYellow; + + //testParameterValue.field4_ForSearch = txtPicture_where.Text; // Picture + //txtPicture_where.BackColor = Color.LightYellow; + + // Ｂ層呼び出し + LayerB_Dynamic lb = new LayerB_Dynamic(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll2_Click(sender, e); + } + + #endregion + + #endregion + + #region タブ３ + + /// グリッド３にデータをロード + private void btnSelectAll3_Click(object sender, EventArgs e) + { + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll", "SQL", this.myUserInfo); + + // Ｂ層呼び出し + LayerB_BatUpd lb = new LayerB_BatUpd(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // 戻り値を設定（列が自動的に作成されないようにする） + this.dataGridView3.Columns.Clear(); + this.dataGridView3.AutoGenerateColumns = false; + this.dataGridView3.DataSource = testReturnValue.dt; + + #region マスタのコンボ生成 + + #region SupplierID - ComboBox + + DataTable dtSuppliers = this.GetSuppliers(((Button)sender).Name); + + // DataGridViewComboBoxColumnを作成 + DataGridViewComboBoxColumn cmbColSuppliers = new DataGridViewComboBoxColumn(); + this.InitDataGridViewComboBoxColumn(cmbColSuppliers); + + // "SupplierID"列にバインドされているデータと関連付け、 + cmbColSuppliers.DataPropertyName = "SupplierID"; + // ヘッダーのテキストを変更 + cmbColSuppliers.HeaderText = "Supplier"; + + //DataGridViewComboBoxColumnのDataSourceを設定 + cmbColSuppliers.DataSource = dtSuppliers; + + // 実際の値が"SupplierID"列 + // 表示するテキストが"CompanyName"列 + cmbColSuppliers.ValueMember = "SupplierID"; + cmbColSuppliers.DisplayMember = "CompanyName"; + + #endregion + + #region CategoryID - ComboBox + + DataTable dtCategory = this.GetCategory("btnSelectAll3"); + + // DataGridViewComboBoxColumnを作成 + DataGridViewComboBoxColumn cmbColCategory = new DataGridViewComboBoxColumn(); + this.InitDataGridViewComboBoxColumn(cmbColCategory); + + // "SupplierID"列にバインドされているデータと関連付け、 + cmbColCategory.DataPropertyName = "CategoryID"; + // ヘッダーのテキストを変更 + cmbColCategory.HeaderText = "Category"; + + // DataGridViewComboBoxColumnのDataSourceを設定 + cmbColCategory.DataSource = dtCategory; + + // 実際の値が"CategoryID"列 + // 表示するテキストが"CategoryName"列 + cmbColCategory.ValueMember = "CategoryID"; + cmbColCategory.DisplayMember = "CategoryName"; + + #endregion + + #endregion + + #region 手動でデータバインド + + // はじめにクリア + + // DataGridViewTextBoxColumn + DataGridViewTextBoxColumn textColumn; + + DataGridViewCheckBoxColumn checkColumn; + + //データソースの"ProductID"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "ProductID"; + textColumn.Name = "ProductID"; + textColumn.HeaderText = "ProductID"; + + // 主キーは読み取り専用 + textColumn.ReadOnly = true; + + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"ProductName"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "ProductName"; + textColumn.Name = "ProductName"; + textColumn.HeaderText = "ProductName"; + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"SupplierID"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "SupplierID"; + textColumn.Name = "SupplierID"; + textColumn.HeaderText = "SupplierID"; + this.dataGridView3.Columns.Add(textColumn); + + // 見えなくしてマスタをコンボを追加 + this.dataGridView3.Columns["SupplierID"].Visible = false; + this.dataGridView3.Columns.Add(cmbColSuppliers); + + //データソースの"CategoryID"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "CategoryID"; + textColumn.Name = "CategoryID"; + textColumn.HeaderText = "CategoryID"; + this.dataGridView3.Columns.Add(textColumn); + + // 見えなくしてマスタをコンボを追加 + this.dataGridView3.Columns["CategoryID"].Visible = false; + this.dataGridView3.Columns.Add(cmbColCategory); + + //データソースの"QuantityPerUnit"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "QuantityPerUnit"; + textColumn.Name = "QuantityPerUnit"; + textColumn.HeaderText = "QuantityPerUnit"; + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"UnitPrice"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "UnitPrice"; + textColumn.Name = "UnitPrice"; + textColumn.HeaderText = "UnitPrice"; + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"UnitsInStock"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "UnitsInStock"; + textColumn.Name = "UnitsInStock"; + textColumn.HeaderText = "UnitsInStock"; + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"UnitsOnOrder"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "UnitsOnOrder"; + textColumn.Name = "UnitsOnOrder"; + textColumn.HeaderText = "UnitsOnOrder"; + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"ReorderLevel"列をバインドする + textColumn = new DataGridViewTextBoxColumn(); + textColumn.DataPropertyName = "ReorderLevel"; + textColumn.Name = "ReorderLevel"; + textColumn.HeaderText = "ReorderLevel"; + this.dataGridView3.Columns.Add(textColumn); + + //データソースの"Discontinued"列をバインドする + checkColumn = new DataGridViewCheckBoxColumn(); + checkColumn.DataPropertyName = "Discontinued"; + checkColumn.Name = "Discontinued"; + checkColumn.HeaderText = "Discontinued"; + this.dataGridView3.Columns.Add(checkColumn); + + #endregion + } + + /// DataGridViewComboBoxColumnのスタイルを初期化する。 + private void InitDataGridViewComboBoxColumn(DataGridViewComboBoxColumn cmbCol) + { + // 現在のセルしかコンボボックスが表示されないようにする。 + cmbCol.DisplayStyleForCurrentCellOnly = true; + // 編集モードの時だけコンボボックスを表示する。 + cmbCol.DisplayStyle = DataGridViewComboBoxDisplayStyle.Nothing; + + // マウスポインタ下のセルが強調表示されるようにする。 + cmbCol.DisplayStyle = DataGridViewComboBoxDisplayStyle.ComboBox; + // マウスポインタ下のセルにポップアップが表示されるようにする。 + cmbCol.FlatStyle = FlatStyle.Popup; + } + + /// バッチ更新 + private void btnBatUpd_Click(object sender, EventArgs e) + { + // 引数 + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "BatUpd", "SQL", this.myUserInfo); + + // 編集済みのDataTableを設定 + testParameterValue.dt = (DataTable)this.dataGridView3.DataSource; + + // Ｂ層呼び出し + LayerB_BatUpd lb = new LayerB_BatUpd(); + + TestReturnValue testReturnValue = + (TestReturnValue)lb.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // コミット + BaseLogic2CS.CommitAndClose(); + + // データグリッドを更新 + this.btnSelectAll3_Click(sender, e); + } + + /// データエラー時のイベントハンドラ + private void dataGridView3_DataError(object sender, DataGridViewDataErrorEventArgs e) + { + MessageBox.Show(e.Exception.Message); + } + + /// クリア + private void btnClear3_Click(object sender, EventArgs e) + { + // クリア + this.dataGridView3.DataSource = null; + } + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Form1.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj new file mode 100644 index 000000000..72e888eb4 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj @@ -0,0 +1,211 @@ + + + + WinExe + net5.0-windows + true + + + GenDaoAndBatUpd_sample + GenDaoAndBatUpd_sample + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + + + + + Never + + + Never + + + Never + + + True + True + Resource.resx + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + Always + + + Always + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln similarity index 94% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index 161cf10e5..c828a4cef 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" EndProject diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Program.cs new file mode 100644 index 000000000..83b83f12a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Program.cs @@ -0,0 +1,43 @@ +//********************************************************************************** +//* バッチ更新処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：アプリケーションのメイン エントリ ポイント +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; +using System.Windows.Forms; + +using Touryo.Infrastructure.Public.Util; + +namespace GenDaoAndBatUpd_sample +{ + /// アプリケーションのメイン エントリ ポイント + static class Program + { + /// アプリケーションのメイン エントリ ポイントです。 + [STAThread] + static void Main() + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.Designer.cs new file mode 100644 index 000000000..75b5810ce --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.Designer.cs @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// このコードはツールによって生成されました。 +// ランタイム バージョン:4.0.30319.42000 +// +// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +// コードが再生成されるときに損失したりします。 +// +//------------------------------------------------------------------------------ + +namespace GenDaoAndBatUpd_sample { + using System; + + + /// + /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 + /// + // このクラスは StronglyTypedResourceBuilder クラスが ResGen + // または Visual Studio のようなツールを使用して自動生成されました。 + // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に + // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GenDaoAndBatUpd_sample.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします + /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 + /// + internal static System.Drawing.Bitmap Diagram { + get { + object obj = ResourceManager.GetObject("Diagram", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.resx new file mode 100644 index 000000000..28f75b834 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/Resources.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + .\Diagram.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json new file mode 100644 index 000000000..368cc20d4 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json @@ -0,0 +1,40 @@ +{ + // 2層C/S用（Windows） + // connectionStrings section + "connectionStrings": { + // SQL Server / SQL Client用 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;" + }, + + // appSettings section + "appSettings": { + + // フレームワークの使用するパラメータ - start + // リソース ファイルの場合 + "FxXMLMSGDefinition": "MSGDefinition.xml", + // 埋め込まれたリソースの場合 + // "FxXMLMSGDefinition": "GenDaoAndBatUpd_sample.MSGDefinition.xml", + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + // SQLファイルファイル（フォルダ）へのパス + //"SqlTextFilePath": "./Dao", + "SqlTextFilePath": "GenDaoAndBatUpd_sample.Dao" + // アプリケーションの使用するパラメータ - end + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs new file mode 100644 index 000000000..a539f0542 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Daots_test_table1 +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class Daots_test_table1 : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public Daots_test_table1(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// id列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_id + { + set + { + this.HtParameter["id"] = value; + } + get + { + return this.HtParameter["id"]; + } + } + + + + /// val列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object val + { + set + { + this.HtParameter["val"] = value; + } + get + { + return this.HtParameter["val"]; + } + } + + /// ts列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ts + { + set + { + this.HtParameter["ts"] = value; + } + get + { + return this.HtParameter["ts"]; + } + } + + + /// Set_id_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_id_forUPD + { + set + { + this.HtParameter["Set_id_forUPD"] = value; + } + get + { + return this.HtParameter["Set_id_forUPD"]; + } + } + + + /// Set_val_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_val_forUPD + { + set + { + this.HtParameter["Set_val_forUPD"] = value; + } + get + { + return this.HtParameter["Set_val_forUPD"]; + } + } + + + /// Set_ts_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ts_forUPD + { + set + { + this.HtParameter["Set_ts_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ts_forUPD"]; + } + } + + + + /// id_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object id_Like + { + set + { + this.HtParameter["id_Like"] = value; + } + get + { + return this.HtParameter["id_Like"]; + } + } + + + /// val_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object val_Like + { + set + { + this.HtParameter["val_Like"] = value; + } + get + { + return this.HtParameter["val_Like"]; + } + } + + + /// ts_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ts_Like + { + set + { + this.HtParameter["ts_Like"] = value; + } + get + { + return this.HtParameter["ts_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("Daots_test_table1_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("Daots_test_table1_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("Daots_test_table1_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("Daots_test_table1_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("Daots_test_table1_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("Daots_test_table1_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("Daots_test_table1_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("Daots_test_table1_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("Daots_test_table1_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs new file mode 100644 index 000000000..94beccb84 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Daots_test_table2 +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class Daots_test_table2 : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public Daots_test_table2(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// id列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_id + { + set + { + this.HtParameter["id"] = value; + } + get + { + return this.HtParameter["id"]; + } + } + + + + /// ts列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ts + { + set + { + this.HtParameter["ts"] = value; + } + get + { + return this.HtParameter["ts"]; + } + } + + /// val列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object val + { + set + { + this.HtParameter["val"] = value; + } + get + { + return this.HtParameter["val"]; + } + } + + + /// Set_id_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_id_forUPD + { + set + { + this.HtParameter["Set_id_forUPD"] = value; + } + get + { + return this.HtParameter["Set_id_forUPD"]; + } + } + + + /// Set_ts_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ts_forUPD + { + set + { + this.HtParameter["Set_ts_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ts_forUPD"]; + } + } + + + /// Set_val_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_val_forUPD + { + set + { + this.HtParameter["Set_val_forUPD"] = value; + } + get + { + return this.HtParameter["Set_val_forUPD"]; + } + } + + + + /// id_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object id_Like + { + set + { + this.HtParameter["id_Like"] = value; + } + get + { + return this.HtParameter["id_Like"]; + } + } + + + /// ts_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ts_Like + { + set + { + this.HtParameter["ts_Like"] = value; + } + get + { + return this.HtParameter["ts_Like"]; + } + } + + + /// val_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object val_Like + { + set + { + this.HtParameter["val_Like"] = value; + } + get + { + return this.HtParameter["val_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("Daots_test_table2_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("Daots_test_table2_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("Daots_test_table2_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("Daots_test_table2_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("Daots_test_table2_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("Daots_test_table2_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("Daots_test_table2_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("Daots_test_table2_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("Daots_test_table2_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs new file mode 100644 index 000000000..26721943a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Daots_test_table3 +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class Daots_test_table3 : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public Daots_test_table3(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// id列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_id + { + set + { + this.HtParameter["id"] = value; + } + get + { + return this.HtParameter["id"]; + } + } + + + + /// ts列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ts + { + set + { + this.HtParameter["ts"] = value; + } + get + { + return this.HtParameter["ts"]; + } + } + + /// val列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object val + { + set + { + this.HtParameter["val"] = value; + } + get + { + return this.HtParameter["val"]; + } + } + + + /// Set_id_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_id_forUPD + { + set + { + this.HtParameter["Set_id_forUPD"] = value; + } + get + { + return this.HtParameter["Set_id_forUPD"]; + } + } + + + /// Set_ts_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ts_forUPD + { + set + { + this.HtParameter["Set_ts_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ts_forUPD"]; + } + } + + + /// Set_val_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_val_forUPD + { + set + { + this.HtParameter["Set_val_forUPD"] = value; + } + get + { + return this.HtParameter["Set_val_forUPD"]; + } + } + + + + /// id_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object id_Like + { + set + { + this.HtParameter["id_Like"] = value; + } + get + { + return this.HtParameter["id_Like"]; + } + } + + + /// ts_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ts_Like + { + set + { + this.HtParameter["ts_Like"] = value; + } + get + { + return this.HtParameter["ts_Like"]; + } + } + + + /// val_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object val_Like + { + set + { + this.HtParameter["val_Like"] = value; + } + get + { + return this.HtParameter["val_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("Daots_test_table3_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("Daots_test_table3_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("Daots_test_table3_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("Daots_test_table3_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("Daots_test_table3_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("Daots_test_table3_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("Daots_test_table3_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("Daots_test_table3_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("Daots_test_table3_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs new file mode 100644 index 000000000..e7d479385 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Daots_test_tableA +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class Daots_test_tableA : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public Daots_test_tableA(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// id列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_id + { + set + { + this.HtParameter["id"] = value; + } + get + { + return this.HtParameter["id"]; + } + } + + + + /// val列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object val + { + set + { + this.HtParameter["val"] = value; + } + get + { + return this.HtParameter["val"]; + } + } + + /// ts列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ts + { + set + { + this.HtParameter["ts"] = value; + } + get + { + return this.HtParameter["ts"]; + } + } + + + /// Set_id_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_id_forUPD + { + set + { + this.HtParameter["Set_id_forUPD"] = value; + } + get + { + return this.HtParameter["Set_id_forUPD"]; + } + } + + + /// Set_val_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_val_forUPD + { + set + { + this.HtParameter["Set_val_forUPD"] = value; + } + get + { + return this.HtParameter["Set_val_forUPD"]; + } + } + + + /// Set_ts_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ts_forUPD + { + set + { + this.HtParameter["Set_ts_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ts_forUPD"]; + } + } + + + + /// id_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object id_Like + { + set + { + this.HtParameter["id_Like"] = value; + } + get + { + return this.HtParameter["id_Like"]; + } + } + + + /// val_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object val_Like + { + set + { + this.HtParameter["val_Like"] = value; + } + get + { + return this.HtParameter["val_Like"]; + } + } + + + /// ts_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ts_Like + { + set + { + this.HtParameter["ts_Like"] = value; + } + get + { + return this.HtParameter["ts_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("Daots_test_tableA_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs new file mode 100644 index 000000000..46de1e90a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Daots_test_tableB +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class Daots_test_tableB : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public Daots_test_tableB(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// id列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_id + { + set + { + this.HtParameter["id"] = value; + } + get + { + return this.HtParameter["id"]; + } + } + + + + /// ts列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ts + { + set + { + this.HtParameter["ts"] = value; + } + get + { + return this.HtParameter["ts"]; + } + } + + /// val列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object val + { + set + { + this.HtParameter["val"] = value; + } + get + { + return this.HtParameter["val"]; + } + } + + + /// Set_id_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_id_forUPD + { + set + { + this.HtParameter["Set_id_forUPD"] = value; + } + get + { + return this.HtParameter["Set_id_forUPD"]; + } + } + + + /// Set_ts_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ts_forUPD + { + set + { + this.HtParameter["Set_ts_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ts_forUPD"]; + } + } + + + /// Set_val_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_val_forUPD + { + set + { + this.HtParameter["Set_val_forUPD"] = value; + } + get + { + return this.HtParameter["Set_val_forUPD"]; + } + } + + + + /// id_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object id_Like + { + set + { + this.HtParameter["id_Like"] = value; + } + get + { + return this.HtParameter["id_Like"]; + } + } + + + /// ts_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ts_Like + { + set + { + this.HtParameter["ts_Like"] = value; + } + get + { + return this.HtParameter["ts_Like"]; + } + } + + + /// val_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object val_Like + { + set + { + this.HtParameter["val_Like"] = value; + } + get + { + return this.HtParameter["val_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("Daots_test_tableB_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs new file mode 100644 index 000000000..6b1a8eedf --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.cs @@ -0,0 +1,406 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Daots_test_tableC +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class Daots_test_tableC : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public Daots_test_tableC(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// id列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_id + { + set + { + this.HtParameter["id"] = value; + } + get + { + return this.HtParameter["id"]; + } + } + + + + /// ts列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ts + { + set + { + this.HtParameter["ts"] = value; + } + get + { + return this.HtParameter["ts"]; + } + } + + /// val列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object val + { + set + { + this.HtParameter["val"] = value; + } + get + { + return this.HtParameter["val"]; + } + } + + + /// Set_id_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_id_forUPD + { + set + { + this.HtParameter["Set_id_forUPD"] = value; + } + get + { + return this.HtParameter["Set_id_forUPD"]; + } + } + + + /// Set_ts_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ts_forUPD + { + set + { + this.HtParameter["Set_ts_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ts_forUPD"]; + } + } + + + /// Set_val_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_val_forUPD + { + set + { + this.HtParameter["Set_val_forUPD"] = value; + } + get + { + return this.HtParameter["Set_val_forUPD"]; + } + } + + + + /// id_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object id_Like + { + set + { + this.HtParameter["id_Like"] = value; + } + get + { + return this.HtParameter["id_Like"]; + } + } + + + /// ts_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ts_Like + { + set + { + this.HtParameter["ts_Like"] = value; + } + get + { + return this.HtParameter["ts_Like"]; + } + } + + + /// val_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object val_Like + { + set + { + this.HtParameter["val_Like"] = value; + } + get + { + return this.HtParameter["val_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("Daots_test_tableC_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.Designer.cs new file mode 100644 index 000000000..c8d5eed67 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.Designer.cs @@ -0,0 +1,288 @@ +namespace _TimeStamp_sample +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.btnGetAll = new System.Windows.Forms.Button(); + this.btnClear = new System.Windows.Forms.Button(); + this.txtID = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.cmbTSColType = new System.Windows.Forms.ComboBox(); + this.cmbTableType = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.txtVAL = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.txtTS = new System.Windows.Forms.TextBox(); + this.btnInsert = new System.Windows.Forms.Button(); + this.btnSelect = new System.Windows.Forms.Button(); + this.btnUpdate = new System.Windows.Forms.Button(); + this.btnDelete = new System.Windows.Forms.Button(); + this.btnDynDel = new System.Windows.Forms.Button(); + this.btnDynUpd = new System.Windows.Forms.Button(); + this.btnDynIns = new System.Windows.Forms.Button(); + this.btnDynSel = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.btnClearTS = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.SuspendLayout(); + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + resources.ApplyResources(this.dataGridView1, "dataGridView1"); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 21; + // + // btnGetAll + // + resources.ApplyResources(this.btnGetAll, "btnGetAll"); + this.btnGetAll.Name = "btnGetAll"; + this.btnGetAll.UseVisualStyleBackColor = true; + this.btnGetAll.Click += new System.EventHandler(this.btnGetAll_Click); + // + // btnClear + // + resources.ApplyResources(this.btnClear, "btnClear"); + this.btnClear.Name = "btnClear"; + this.btnClear.UseVisualStyleBackColor = true; + this.btnClear.Click += new System.EventHandler(this.btnClear_Click); + // + // txtID + // + resources.ApplyResources(this.txtID, "txtID"); + this.txtID.Name = "txtID"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // cmbTSColType + // + this.cmbTSColType.FormattingEnabled = true; + this.cmbTSColType.Items.AddRange(new object[] { + resources.GetString("cmbTSColType.Items"), + resources.GetString("cmbTSColType.Items1")}); + resources.ApplyResources(this.cmbTSColType, "cmbTSColType"); + this.cmbTSColType.Name = "cmbTSColType"; + // + // cmbTableType + // + this.cmbTableType.FormattingEnabled = true; + this.cmbTableType.Items.AddRange(new object[] { + resources.GetString("cmbTableType.Items"), + resources.GetString("cmbTableType.Items1"), + resources.GetString("cmbTableType.Items2")}); + resources.ApplyResources(this.cmbTableType, "cmbTableType"); + this.cmbTableType.Name = "cmbTableType"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // txtVAL + // + resources.ApplyResources(this.txtVAL, "txtVAL"); + this.txtVAL.Name = "txtVAL"; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // txtTS + // + resources.ApplyResources(this.txtTS, "txtTS"); + this.txtTS.Name = "txtTS"; + this.txtTS.ReadOnly = true; + // + // btnInsert + // + resources.ApplyResources(this.btnInsert, "btnInsert"); + this.btnInsert.Name = "btnInsert"; + this.btnInsert.UseVisualStyleBackColor = true; + this.btnInsert.Click += new System.EventHandler(this.btnInsert_Click); + // + // btnSelect + // + resources.ApplyResources(this.btnSelect, "btnSelect"); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.UseVisualStyleBackColor = true; + this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); + // + // btnUpdate + // + resources.ApplyResources(this.btnUpdate, "btnUpdate"); + this.btnUpdate.Name = "btnUpdate"; + this.btnUpdate.UseVisualStyleBackColor = true; + this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); + // + // btnDelete + // + resources.ApplyResources(this.btnDelete, "btnDelete"); + this.btnDelete.Name = "btnDelete"; + this.btnDelete.UseVisualStyleBackColor = true; + this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); + // + // btnDynDel + // + resources.ApplyResources(this.btnDynDel, "btnDynDel"); + this.btnDynDel.Name = "btnDynDel"; + this.btnDynDel.UseVisualStyleBackColor = true; + this.btnDynDel.Click += new System.EventHandler(this.btnDynDel_Click); + // + // btnDynUpd + // + resources.ApplyResources(this.btnDynUpd, "btnDynUpd"); + this.btnDynUpd.Name = "btnDynUpd"; + this.btnDynUpd.UseVisualStyleBackColor = true; + this.btnDynUpd.Click += new System.EventHandler(this.btnDynUpd_Click); + // + // btnDynIns + // + resources.ApplyResources(this.btnDynIns, "btnDynIns"); + this.btnDynIns.Name = "btnDynIns"; + this.btnDynIns.UseVisualStyleBackColor = true; + this.btnDynIns.Click += new System.EventHandler(this.btnDynIns_Click); + // + // btnDynSel + // + resources.ApplyResources(this.btnDynSel, "btnDynSel"); + this.btnDynSel.Name = "btnDynSel"; + this.btnDynSel.UseVisualStyleBackColor = true; + this.btnDynSel.Click += new System.EventHandler(this.btnDynSel_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.btnInsert); + this.groupBox1.Controls.Add(this.btnSelect); + this.groupBox1.Controls.Add(this.btnUpdate); + this.groupBox1.Controls.Add(this.btnDelete); + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.TabStop = false; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.btnDynIns); + this.groupBox2.Controls.Add(this.btnDynSel); + this.groupBox2.Controls.Add(this.btnDynDel); + this.groupBox2.Controls.Add(this.btnDynUpd); + resources.ApplyResources(this.groupBox2, "groupBox2"); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.TabStop = false; + // + // btnClearTS + // + resources.ApplyResources(this.btnClearTS, "btnClearTS"); + this.btnClearTS.Name = "btnClearTS"; + this.btnClearTS.UseVisualStyleBackColor = true; + this.btnClearTS.Click += new System.EventHandler(this.btnClearTS_Click); + // + // Form1 + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.btnClearTS); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.label5); + this.Controls.Add(this.txtTS); + this.Controls.Add(this.label4); + this.Controls.Add(this.txtVAL); + this.Controls.Add(this.label3); + this.Controls.Add(this.cmbTableType); + this.Controls.Add(this.label2); + this.Controls.Add(this.cmbTSColType); + this.Controls.Add(this.label1); + this.Controls.Add(this.txtID); + this.Controls.Add(this.btnClear); + this.Controls.Add(this.btnGetAll); + this.Controls.Add(this.dataGridView1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button btnGetAll; + private System.Windows.Forms.Button btnClear; + private System.Windows.Forms.TextBox txtID; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cmbTSColType; + private System.Windows.Forms.ComboBox cmbTableType; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox txtVAL; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtTS; + private System.Windows.Forms.Button btnInsert; + private System.Windows.Forms.Button btnSelect; + private System.Windows.Forms.Button btnUpdate; + private System.Windows.Forms.Button btnDelete; + private System.Windows.Forms.Button btnDynDel; + private System.Windows.Forms.Button btnDynUpd; + private System.Windows.Forms.Button btnDynIns; + private System.Windows.Forms.Button btnDynSel; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Button btnClearTS; + + } +} + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.cs new file mode 100644 index 000000000..4f0695d82 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.cs @@ -0,0 +1,864 @@ +//********************************************************************************** +//* タイムスタンプ・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; +using System.Data; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Util; + +namespace _TimeStamp_sample +{ + /// サンプル アプリ画面 + public partial class Form1 : Form + { + // タイムスタンプ オブジェクトの格納 + private object ts; + + #region データアクセス + + // データアクセス制御クラス + DamSqlSvr dam = null; + + // Dao + + // datetime + // 末端 + Daots_test_table1 dao1 = null; + // 中間 + Daots_test_table2 dao2 = null; + // 先頭 + Daots_test_table3 dao3 = null; + + // timestamp + // 末端 + Daots_test_tableA daoA = null; + // 中間 + Daots_test_tableB daoB = null; + // 先頭 + Daots_test_tableC daoC = null; + + #endregion + + #region 開始-終了処理 + + /// コンストラクタ + public Form1() + { + InitializeComponent(); + } + + /// 開始処理 + private void Form1_Load(object sender, EventArgs e) + { + // イベントハンドラ + this.dataGridView1.DataError += new DataGridViewDataErrorEventHandler(DataGridView_DataError); + + // ステータス + this.cmbTSColType.SelectedIndex = 0; + this.cmbTableType.SelectedIndex = 0; + + dam = new DamSqlSvr(); + dam.Obj = new MyUserInfo("userName", Environment.MachineName); + this.dam.ConnectionOpen(GetConfigParameter.GetConnectionString("ConnectionString_SQL")); + } + + /// 終了処理 + private void Form1_FormClosing(object sender, FormClosingEventArgs e) + { + this.dam.ConnectionClose(); + } + + //DataErrorイベントハンドラ + private void DataGridView_DataError(object sender, + DataGridViewDataErrorEventArgs e) + { + e.Cancel = false; + } + + #endregion + + #region 状態の取得処理 + + /// 状態の取得 + /// 状態を表す数値 + private int GetStatus() + { + if (this.cmbTSColType.Text == "RAND（float）列") + { + if (this.cmbTableType.Text == "TS列末端") { return 1; } + else if (this.cmbTableType.Text == "TS列中間") { return 2; } + else if (this.cmbTableType.Text == "TS列先頭") { return 3; } + } + else if (this.cmbTSColType.Text == "timestamp列") + { + if (this.cmbTableType.Text == "TS列末端") { return 4; } + else if (this.cmbTableType.Text == "TS列中間") { return 5; } + else if (this.cmbTableType.Text == "TS列先頭") { return 6; } + } + + throw new Exception("不明な状態です。"); + } + + #endregion + + #region テーブルチェック + + /// 全件取得 + private void btnGetAll_Click(object sender, EventArgs e) + { + DataTable dt = new DataTable(); + + if(this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + this.dao1.D2_Select(dt); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + this.dao2.D2_Select(dt); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + this.dao3.D2_Select(dt); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + this.daoA.D2_Select(dt); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + this.daoB.D2_Select(dt); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + this.daoC.D2_Select(dt); + } + + this.dataGridView1.DataSource = dt; + + } + + /// クリア + private void btnClear_Click(object sender, EventArgs e) + { + this.dataGridView1.DataSource = null; + } + + #endregion + + /// タイムスタンプを消す + private void btnClearTS_Click(object sender, EventArgs e) + { + this.txtTS.Text = ""; + this.ts = null; + } + + #region Insert + + /// Insert + private void btnInsert_Click(object sender, EventArgs e) + { + // 挿入（静的） + // ・id ：オートインクリメントのため不要 + // ・val：必須 + // ・ts ：自動更新（dao同梱）のため不要 + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + //this.dao1.PK_id = int.Parse(this.txtID.Text); + this.dao1.val = this.txtVAL.Text; + //this.dao1.ts = this.txtTS.Text; + + this.dao1.S1_Insert(); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + //this.dao2.PK_id = int.Parse(this.txtID.Text); + this.dao2.val = this.txtVAL.Text; + //this.dao2.ts = this.txtTS.Text; + + this.dao2.S1_Insert(); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + //this.dao3.PK_id = int.Parse(this.txtID.Text); + this.dao3.val = this.txtVAL.Text; + //this.dao3.ts = this.txtTS.Text; + + this.dao3.S1_Insert(); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + //this.daoA.PK_id = int.Parse(this.txtID.Text); + this.daoA.val = this.txtVAL.Text; + //this.daoA.ts = this.txtTS.Text; + + this.daoA.S1_Insert(); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + //this.daoB.PK_id = int.Parse(this.txtID.Text); + this.daoB.val = this.txtVAL.Text; + //this.daoB.ts = this.txtTS.Text; + + this.daoB.S1_Insert(); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + //this.daoC.PK_id = int.Parse(this.txtID.Text); + this.daoC.val = this.txtVAL.Text; + //this.daoC.ts = this.txtTS.Text; + + this.daoC.S1_Insert(); + } + + // 更新 + this.btnGetAll_Click(sender, e); + } + + #endregion + + #region Select + + /// Select + private void btnSelect_Click(object sender, EventArgs e) + { + int id = 0; + DataTable dt = new DataTable(); + + if (int.TryParse(this.txtID.Text, out id)) { } + else + { + MessageBox.Show("IDの値が不正です。"); + return; + } + + // 参照（静的） + // ・id ：静的 + // ・val：なし + // ・ts ：動的 + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + this.dao1.PK_id = id; + //this.dao1.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao1.ts = this.ts; } + + this.dao1.S2_Select(dt); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + this.dao2.PK_id = id; + //this.dao2.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao2.ts = this.ts; } + + this.dao2.S2_Select(dt); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + this.dao3.PK_id = id; + //this.dao3.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao3.ts = this.ts; } + + this.dao3.S2_Select(dt); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + this.daoA.PK_id = id; + //this.daoA.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoA.ts = this.ts; } + + this.daoA.S2_Select(dt); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + this.daoB.PK_id = id; + //this.daoB.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoB.ts = this.ts; } + + this.daoB.S2_Select(dt); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + this.daoC.PK_id = id; + //this.daoC.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoC.ts = this.ts; } + + this.daoC.S2_Select(dt); + } + + // 表示 + if (dt.Rows.Count != 0) + { + this.txtID.Text = dt.Rows[0]["id"].ToString(); + this.txtVAL.Text = dt.Rows[0]["val"].ToString(); + + // 文字列化の方法 + if (dt.Rows[0]["ts"].ToString() == "System.Byte[]") + { + // timestamp + this.txtTS.Text = BitConverter.ToString((byte[])dt.Rows[0]["ts"]); + } + else + { + // timeticks + this.txtTS.Text = dt.Rows[0]["ts"].ToString(); + } + + // → 文字列化 → バイト化とか解らんので退避しておく・・・ + this.ts = dt.Rows[0]["ts"]; + } + else + { + this.txtID.Text = ""; + this.txtVAL.Text = ""; + this.txtTS.Text = ""; + this.ts = null; + } + } + + #endregion + + #region Update + + /// Update + private void btnUpdate_Click(object sender, EventArgs e) + { + int id = 0; + + if (int.TryParse(this.txtID.Text, out id)) { } + else + { + MessageBox.Show("IDの値が不正です。"); + return; + } + + // 更新（静的） + // ・id ：検索条件（静的） + // ・val：更新値・機械的に指定（パラメタが０個になるので） + // ・ts ：検索条件（動的） + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + this.dao1.PK_id = id; + this.dao1.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao1.ts = this.ts; } + + this.dao1.S3_Update(); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + this.dao2.PK_id = id; + this.dao2.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao2.ts = this.ts; } + + this.dao2.S3_Update(); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + this.dao3.PK_id = id; + this.dao3.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao3.ts = this.ts; } + + this.dao3.S3_Update(); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + this.daoA.PK_id = id; + this.daoA.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoA.ts = this.ts; } + + this.daoA.S3_Update(); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + this.daoB.PK_id = id; + this.daoB.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoB.ts = this.ts; } + + this.daoB.S3_Update(); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + this.daoC.PK_id = id; + this.daoC.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoC.ts = this.ts; } + + this.daoC.S3_Update(); + } + + // 更新 + this.btnGetAll_Click(sender, e); + } + + #endregion + + #region Delete + + /// Delete + private void btnDelete_Click(object sender, EventArgs e) + { + int id = 0; + DataTable dt = new DataTable(); + + if (int.TryParse(this.txtID.Text, out id)) { } + else + { + MessageBox.Show("IDの値が不正です。"); + return; + } + + // 削除（静的） + // ・id ：静的 + // ・val：なし + // ・ts ：動的 + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + this.dao1.PK_id = id; + //this.dao1.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao1.ts = this.ts; } + + this.dao1.S4_Delete(); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + this.dao2.PK_id = id; + //this.dao2.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao2.ts = this.ts; } + + this.dao2.S4_Delete(); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + this.dao3.PK_id = id; + //this.dao3.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao3.ts = this.ts; } + + this.dao3.S4_Delete(); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + this.daoA.PK_id = id; + //this.daoA.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoA.ts = this.ts; } + + this.daoA.S4_Delete(); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + this.daoB.PK_id = id; + //this.daoB.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoB.ts = this.ts; } + + this.daoB.S4_Delete(); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + this.daoC.PK_id = id; + //this.daoC.val = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoC.ts = this.ts; } + + this.daoC.S4_Delete(); + } + + // 更新 + this.btnGetAll_Click(sender, e); + } + + #endregion + + #region DynIns + + /// DynIns + private void btnDynIns_Click(object sender, EventArgs e) + { + // 挿入（動的） + // ・id ：オートインクリメントのため不要 + // ・val：機械的に指定（パラメタが０個になるので） + // ・ts ：自動更新（dao同梱）のため不要 + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + //this.dao1.PK_id = int.Parse(this.txtID.Text); + this.dao1.val = this.txtVAL.Text; + //this.dao1.ts = this.txtTS.Text; + + this.dao1.D1_Insert(); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + //this.dao2.PK_id = int.Parse(this.txtID.Text); + this.dao2.val = this.txtVAL.Text; + //this.dao2.ts = this.txtTS.Text; + + this.dao2.D1_Insert(); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + //this.dao3.PK_id = int.Parse(this.txtID.Text); + this.dao3.val = this.txtVAL.Text; + //this.dao3.ts = this.txtTS.Text; + + this.dao3.D1_Insert(); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + //this.daoA.PK_id = int.Parse(this.txtID.Text); + this.daoA.val = this.txtVAL.Text; + //this.daoA.ts = this.txtTS.Text; + + this.daoA.D1_Insert(); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + //this.daoB.PK_id = int.Parse(this.txtID.Text); + this.daoB.val = this.txtVAL.Text; + //this.daoB.ts = this.txtTS.Text; + + this.daoB.D1_Insert(); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + //this.daoC.PK_id = int.Parse(this.txtID.Text); + this.daoC.val = this.txtVAL.Text; + //this.daoC.ts = this.txtTS.Text; + + this.daoC.D1_Insert(); + } + + // 更新 + this.btnGetAll_Click(sender, e); + } + + #endregion + + #region DynSel + + /// DynSel + private void btnDynSel_Click(object sender, EventArgs e) + { + int id = 0; + bool flg = false; + + DataTable dt = new DataTable(); + + flg = int.TryParse(this.txtID.Text, out id); + + // 参照（動的） + // ・id ：動的 + // ・val：動的 + // ・ts ：動的 + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + if (flg) { this.dao1.PK_id = id; } + if (this.txtVAL.Text != "") { this.dao1.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.dao1.ts = this.ts; } + + this.dao1.D2_Select(dt); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + if (flg) { this.dao2.PK_id = id; } + if (this.txtVAL.Text != "") { this.dao2.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.dao2.ts = this.ts; } + + this.dao2.D2_Select(dt); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + if (flg) { this.dao3.PK_id = id; } + if (this.txtVAL.Text != "") { this.dao3.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.dao3.ts = this.ts; } + + this.dao3.D2_Select(dt); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + if (flg) { this.daoA.PK_id = id; } + if (this.txtVAL.Text != "") { this.daoA.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.daoA.ts = this.ts; } + + this.daoA.D2_Select(dt); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + if (flg) { this.daoB.PK_id = id; } + if (this.txtVAL.Text != "") { this.daoB.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.daoB.ts = this.ts; } + + this.daoB.D2_Select(dt); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + if (flg) { this.daoC.PK_id = id; } + if (this.txtVAL.Text != "") { this.daoC.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.daoC.ts = this.ts; } + + this.daoC.D2_Select(dt); + } + + this.dataGridView1.DataSource = dt; + } + + #endregion + + #region DynUpd + + /// DynUpd + private void btnDynUpd_Click(object sender, EventArgs e) + { + int id = 0; + + if (int.TryParse(this.txtID.Text, out id)) { } + else + { + MessageBox.Show("IDの値が不正です。"); + return; + } + + // 更新（動的） + // ・id ：検索条件（静的） + // ・val：更新値・機械的に指定（パラメタが０個になるので） + // ・ts ：検索条件（動的） + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + this.dao1.PK_id = id; + this.dao1.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao1.ts = this.ts; } + + this.dao1.D3_Update(); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + this.dao2.PK_id = id; + this.dao2.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao2.ts = this.ts; } + + this.dao2.D3_Update(); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + this.dao3.PK_id = id; + this.dao3.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.dao3.ts = this.ts; } + + this.dao3.D3_Update(); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + this.daoA.PK_id = id; + this.daoA.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoA.ts = this.ts; } + + this.daoA.D3_Update(); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + this.daoB.PK_id = id; + this.daoB.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoB.ts = this.ts; } + + this.daoB.D3_Update(); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + this.daoC.PK_id = id; + this.daoC.Set_val_forUPD = this.txtVAL.Text; + if (this.txtTS.Text != "") { this.daoC.ts = this.ts; } + + this.daoC.D3_Update(); + } + + // 更新 + this.btnGetAll_Click(sender, e); + } + + #endregion + + #region DynDel + + /// DynDel + private void btnDynDel_Click(object sender, EventArgs e) + { + int id = 0; + bool flg = false; + + flg = int.TryParse(this.txtID.Text, out id); + + // 削除（動的） + // ・id ：動的 + // ・val：動的 + // ・ts ：動的 + if (this.GetStatus() == 1) + { + this.dao1 = new Daots_test_table1(this.dam); + + if (flg) { this.dao1.PK_id = id; } + if (this.txtVAL.Text != "") { this.dao1.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.dao1.ts = this.ts; } + + this.dao1.D4_Delete(); + } + else if (this.GetStatus() == 2) + { + this.dao2 = new Daots_test_table2(this.dam); + + if (flg) { this.dao2.PK_id = id; } + if (this.txtVAL.Text != "") { this.dao2.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.dao2.ts = this.ts; } + + this.dao2.D4_Delete(); + } + else if (this.GetStatus() == 3) + { + this.dao3 = new Daots_test_table3(this.dam); + + if (flg) { this.dao3.PK_id = id; } + if (this.txtVAL.Text != "") { this.dao3.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.dao3.ts = this.ts; } + + this.dao3.D4_Delete(); + } + else if (this.GetStatus() == 4) + { + this.daoA = new Daots_test_tableA(this.dam); + + if (flg) { this.daoA.PK_id = id; } + if (this.txtVAL.Text != "") { this.daoA.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.daoA.ts = this.ts; } + + this.daoA.D4_Delete(); + } + else if (this.GetStatus() == 5) + { + this.daoB = new Daots_test_tableB(this.dam); + + if (flg) { this.daoB.PK_id = id; } + if (this.txtVAL.Text != "") { this.daoB.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.daoB.ts = this.ts; } + + this.daoB.D4_Delete(); + } + else if (this.GetStatus() == 6) + { + this.daoC = new Daots_test_tableC(this.dam); + + if (flg) { this.daoC.PK_id = id; } + if (this.txtVAL.Text != "") { this.daoC.val = this.txtVAL.Text; } + if (this.txtTS.Text != "") { this.daoC.ts = this.ts; } + + this.daoC.D4_Delete(); + } + + // 更新 + this.btnGetAll_Click(sender, e); + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.resx new file mode 100644 index 000000000..cd74fe695 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Form1.resx @@ -0,0 +1,771 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 191, 48 + + + 463, 329 + + + + 0 + + + dataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + 191, 383 + + + 463, 23 + + + 1 + + + 全件取得（DnySel） + + + btnGetAll + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + + NoControl + + + 191, 412 + + + 463, 23 + + + 2 + + + クリア + + + btnClear + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + 51, 47 + + + 129, 19 + + + 3 + + + txtID + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 12, 12 + + + 49, 12 + + + 4 + + + TS列種： + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + RAND（float）列 + + + timestamp列 + + + 67, 9 + + + 121, 20 + + + 5 + + + cmbTSColType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + TS列末端 + + + TS列中間 + + + TS列先頭 + + + 290, 9 + + + 121, 20 + + + 7 + + + cmbTableType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + True + + + NoControl + + + 223, 12 + + + 61, 12 + + + 6 + + + テーブル種： + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + True + + + NoControl + + + 12, 50 + + + 22, 12 + + + 8 + + + ID： + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + True + + + NoControl + + + 12, 75 + + + 33, 12 + + + 10 + + + VAL： + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 51, 72 + + + 129, 19 + + + 9 + + + txtVAL + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + NoControl + + + 12, 100 + + + 25, 12 + + + 12 + + + TS： + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 51, 97 + + + 129, 19 + + + 11 + + + txtTS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + NoControl + + + 15, 18 + + + 136, 23 + + + 13 + + + Insert + + + btnInsert + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + NoControl + + + 15, 47 + + + 136, 23 + + + 14 + + + Select + + + btnSelect + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + NoControl + + + 15, 76 + + + 136, 23 + + + 15 + + + Update + + + btnUpdate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + NoControl + + + 15, 105 + + + 136, 23 + + + 16 + + + Delete + + + btnDelete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + NoControl + + + 15, 105 + + + 136, 23 + + + 20 + + + DynDel + + + btnDynDel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + NoControl + + + 15, 76 + + + 136, 23 + + + 19 + + + DynUpd + + + btnDynUpd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + NoControl + + + 15, 18 + + + 136, 23 + + + 17 + + + DynIns + + + btnDynIns + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + NoControl + + + 15, 47 + + + 136, 23 + + + 18 + + + DynSel → + + + btnDynSel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + 14, 163 + + + 166, 138 + + + 22 + + + 静的（主キー必須） + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 14, 307 + + + 166, 138 + + + 23 + + + 動的 + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 12, 122 + + + 168, 23 + + + 24 + + + TSをクリア + + + btnClearTS + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 12 + + + 678, 469 + + + Form1 + + + Form1 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Program.cs new file mode 100644 index 000000000..8b003f6d2 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Program.cs @@ -0,0 +1,43 @@ +//********************************************************************************** +//* タイムスタンプ・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：アプリケーションのメイン エントリ ポイント +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; +using System.Windows.Forms; + +using Touryo.Infrastructure.Public.Util; + +namespace _TimeStamp_sample +{ + /// アプリケーションのメイン エントリ ポイント + static class Program + { + /// アプリケーションのメイン エントリ ポイントです。 + [STAThread] + static void Main() + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/Readme.txt diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj new file mode 100644 index 000000000..e07de8b3c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj @@ -0,0 +1,271 @@ + + + + WinExe + net5.0-windows + true + + + TimeStamp_sample + TimeStamp_sample + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + Always + + + Always + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln new file mode 100644 index 000000000..983f7b036 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json new file mode 100644 index 000000000..26a898d0a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json @@ -0,0 +1,32 @@ +{ + // 2層C/S用（Windows） + // connectionStrings section + "connectionStrings": { + // SQL Server / SQL Client用 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;" + }, + + // appSettings section + "appSettings": { + + // 共通部品の使用するパラメータ - start + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "./Dao", + // アプリケーションの使用するパラメータ - end + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs new file mode 100644 index 000000000..527f77695 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Business/LayerB.cs @@ -0,0 +1,150 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using RerunnableBatch_sample.Common; + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Business; +using Touryo.Infrastructure.Business.Dao; + +namespace RerunnableBatch_sample.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic + { + #region UOCメソッド + + #region SelectPkList + + /// 主キー一覧を取得 + /// 引数クラス + private void UOC_SelectPkList(VoidParameterValue parameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + SelectPkListReturnValue returnValue = new SelectPkListReturnValue(); + this.ReturnValue = returnValue; + + // ↓業務処理----------------------------------------------------- + + DataTable pkTable = new DataTable(); + + // ↓DBアクセス----------------------------------------------------- + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + // 動的SQLを指定 + cmnDao.SQLFileName = "SelectAllOrderID.xml"; + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(pkTable); + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + ArrayList pkList = new ArrayList(); + for (int index = 0; index < pkTable.Rows.Count; index++) + { + //データテーブルからArrayListに詰め直す + pkList.Add(pkTable.Rows[index]["OrderID"]); + } + returnValue.PkList = pkList; + + // ↑業務処理----------------------------------------------------- + + } + + #endregion + + #region ExecuteBatchProcess + + /// バッチ処理を実行する + /// 引数クラス + private void UOC_ExecuteBatchProcess(ExecuteBatchProcessParameterValue parameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + this.ReturnValue = new VoidReturnValue(); + + // ↓業務処理----------------------------------------------------- + + ArrayList pkList = parameter.SubPkList; //主キー一覧(1トランザクション分) + DataTable dataTable = new DataTable(); //データ一覧(主キーを元に検索したデータ) + + //Ordersテーブルからデータを検索する + // ↓DBアクセス----------------------------------------------------- + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + // 動的SQLを指定 + cmnDao.SQLFileName = "SelectInOrderID.xml"; + + // パラメータを設定 + cmnDao.SetParameter("OrderID", pkList); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dataTable); + // ↑DBアクセス----------------------------------------------------- + + + //Orders2テーブルに1件ずつ追加する + for (int index = 0; index < dataTable.Rows.Count; index++) + { + DataRow row = dataTable.Rows[index]; //1件分のデータ + + //todo：編集処理など + + // ↓DBアクセス----------------------------------------------------- + // 自動生成Daoを生成 + DaoOrders2 dao = new DaoOrders2(this.GetDam()); + + // パラメータを設定 + dao.PK_OrderID = row["OrderID"]; + dao.CustomerID = row["CustomerID"]; + dao.EmployeeID = row["EmployeeID"]; + dao.OrderDate = row["OrderDate"]; + dao.RequiredDate = row["RequiredDate"]; + dao.ShippedDate = row["ShippedDate"]; + dao.ShipVia = row["ShipVia"]; + dao.Freight = row["Freight"]; + dao.ShipName = row["ShipName"]; + dao.ShipAddress = row["ShipAddress"]; + dao.ShipCity = row["ShipCity"]; + dao.ShipRegion = row["ShipRegion"]; + dao.ShipPostalCode = row["ShipPostalCode"]; + dao.ShipCountry = row["ShipCountry"]; + + // 共通Daoを実行 + dao.S1_Insert(); + // dao.D1_Insert(); // 性能比較用 + + // ↑DBアクセス----------------------------------------------------- + } + + // todo:中間コミット情報をDBに登録 ※最終処理主キー値の登録など + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs new file mode 100644 index 000000000..83f1ffeba --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.cs @@ -0,0 +1,46 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ExecuteBatchProcessParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Collections; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample.Common +{ + /// + /// ExecuteBatchProcessParameterValue の概要の説明です + /// + public class ExecuteBatchProcessParameterValue : MyParameterValue + { + /// 1トランザクションで処理を行う主キー一覧 + public ArrayList SubPkList; + + #region コンストラクタ + + /// コンストラクタ + public ExecuteBatchProcessParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs new file mode 100644 index 000000000..7307fd417 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.cs @@ -0,0 +1,33 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：SelectPkListReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Collections; +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample.Common +{ + /// + /// SelectPkListReturnValueの概要の説明です + /// + public class SelectPkListReturnValue : MyReturnValue + { + /// PkList + public ArrayList PkList; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs new file mode 100644 index 000000000..8f7af80c5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.cs @@ -0,0 +1,41 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：VoidParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace RerunnableBatch_sample.Common +{ + /// + /// VoidParameterValue の概要の説明です + /// + public class VoidParameterValue : MyParameterValue + { + #region コンストラクタ + + /// コンストラクタ + public VoidParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs new file mode 100644 index 000000000..456f3bc38 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.cs @@ -0,0 +1,30 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：VoidReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample.Common +{ + /// + /// VoidReturnValueの概要の説明です + /// + public class VoidReturnValue : MyReturnValue + { + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs new file mode 100644 index 000000000..2ef66e266 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.cs @@ -0,0 +1,890 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoOrders2 +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoOrders2 : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoOrders2(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// OrderID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_OrderID + { + set + { + this.HtParameter["OrderID"] = value; + } + get + { + return this.HtParameter["OrderID"]; + } + } + + + + /// CustomerID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CustomerID + { + set + { + this.HtParameter["CustomerID"] = value; + } + get + { + return this.HtParameter["CustomerID"]; + } + } + + /// EmployeeID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object EmployeeID + { + set + { + this.HtParameter["EmployeeID"] = value; + } + get + { + return this.HtParameter["EmployeeID"]; + } + } + + /// OrderDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object OrderDate + { + set + { + this.HtParameter["OrderDate"] = value; + } + get + { + return this.HtParameter["OrderDate"]; + } + } + + /// RequiredDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object RequiredDate + { + set + { + this.HtParameter["RequiredDate"] = value; + } + get + { + return this.HtParameter["RequiredDate"]; + } + } + + /// ShippedDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShippedDate + { + set + { + this.HtParameter["ShippedDate"] = value; + } + get + { + return this.HtParameter["ShippedDate"]; + } + } + + /// ShipVia列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipVia + { + set + { + this.HtParameter["ShipVia"] = value; + } + get + { + return this.HtParameter["ShipVia"]; + } + } + + /// Freight列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Freight + { + set + { + this.HtParameter["Freight"] = value; + } + get + { + return this.HtParameter["Freight"]; + } + } + + /// ShipName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipName + { + set + { + this.HtParameter["ShipName"] = value; + } + get + { + return this.HtParameter["ShipName"]; + } + } + + /// ShipAddress列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipAddress + { + set + { + this.HtParameter["ShipAddress"] = value; + } + get + { + return this.HtParameter["ShipAddress"]; + } + } + + /// ShipCity列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipCity + { + set + { + this.HtParameter["ShipCity"] = value; + } + get + { + return this.HtParameter["ShipCity"]; + } + } + + /// ShipRegion列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipRegion + { + set + { + this.HtParameter["ShipRegion"] = value; + } + get + { + return this.HtParameter["ShipRegion"]; + } + } + + /// ShipPostalCode列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipPostalCode + { + set + { + this.HtParameter["ShipPostalCode"] = value; + } + get + { + return this.HtParameter["ShipPostalCode"]; + } + } + + /// ShipCountry列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipCountry + { + set + { + this.HtParameter["ShipCountry"] = value; + } + get + { + return this.HtParameter["ShipCountry"]; + } + } + + + /// Set_OrderID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_OrderID_forUPD + { + set + { + this.HtParameter["Set_OrderID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_OrderID_forUPD"]; + } + } + + + /// Set_CustomerID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CustomerID_forUPD + { + set + { + this.HtParameter["Set_CustomerID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CustomerID_forUPD"]; + } + } + + + /// Set_EmployeeID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_EmployeeID_forUPD + { + set + { + this.HtParameter["Set_EmployeeID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_EmployeeID_forUPD"]; + } + } + + + /// Set_OrderDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_OrderDate_forUPD + { + set + { + this.HtParameter["Set_OrderDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_OrderDate_forUPD"]; + } + } + + + /// Set_RequiredDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_RequiredDate_forUPD + { + set + { + this.HtParameter["Set_RequiredDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_RequiredDate_forUPD"]; + } + } + + + /// Set_ShippedDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShippedDate_forUPD + { + set + { + this.HtParameter["Set_ShippedDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShippedDate_forUPD"]; + } + } + + + /// Set_ShipVia_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipVia_forUPD + { + set + { + this.HtParameter["Set_ShipVia_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipVia_forUPD"]; + } + } + + + /// Set_Freight_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Freight_forUPD + { + set + { + this.HtParameter["Set_Freight_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Freight_forUPD"]; + } + } + + + /// Set_ShipName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipName_forUPD + { + set + { + this.HtParameter["Set_ShipName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipName_forUPD"]; + } + } + + + /// Set_ShipAddress_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipAddress_forUPD + { + set + { + this.HtParameter["Set_ShipAddress_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipAddress_forUPD"]; + } + } + + + /// Set_ShipCity_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipCity_forUPD + { + set + { + this.HtParameter["Set_ShipCity_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipCity_forUPD"]; + } + } + + + /// Set_ShipRegion_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipRegion_forUPD + { + set + { + this.HtParameter["Set_ShipRegion_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipRegion_forUPD"]; + } + } + + + /// Set_ShipPostalCode_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipPostalCode_forUPD + { + set + { + this.HtParameter["Set_ShipPostalCode_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipPostalCode_forUPD"]; + } + } + + + /// Set_ShipCountry_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipCountry_forUPD + { + set + { + this.HtParameter["Set_ShipCountry_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipCountry_forUPD"]; + } + } + + + + /// OrderID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object OrderID_Like + { + set + { + this.HtParameter["OrderID_Like"] = value; + } + get + { + return this.HtParameter["OrderID_Like"]; + } + } + + + /// CustomerID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CustomerID_Like + { + set + { + this.HtParameter["CustomerID_Like"] = value; + } + get + { + return this.HtParameter["CustomerID_Like"]; + } + } + + + /// EmployeeID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object EmployeeID_Like + { + set + { + this.HtParameter["EmployeeID_Like"] = value; + } + get + { + return this.HtParameter["EmployeeID_Like"]; + } + } + + + /// OrderDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object OrderDate_Like + { + set + { + this.HtParameter["OrderDate_Like"] = value; + } + get + { + return this.HtParameter["OrderDate_Like"]; + } + } + + + /// RequiredDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object RequiredDate_Like + { + set + { + this.HtParameter["RequiredDate_Like"] = value; + } + get + { + return this.HtParameter["RequiredDate_Like"]; + } + } + + + /// ShippedDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShippedDate_Like + { + set + { + this.HtParameter["ShippedDate_Like"] = value; + } + get + { + return this.HtParameter["ShippedDate_Like"]; + } + } + + + /// ShipVia_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipVia_Like + { + set + { + this.HtParameter["ShipVia_Like"] = value; + } + get + { + return this.HtParameter["ShipVia_Like"]; + } + } + + + /// Freight_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Freight_Like + { + set + { + this.HtParameter["Freight_Like"] = value; + } + get + { + return this.HtParameter["Freight_Like"]; + } + } + + + /// ShipName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipName_Like + { + set + { + this.HtParameter["ShipName_Like"] = value; + } + get + { + return this.HtParameter["ShipName_Like"]; + } + } + + + /// ShipAddress_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipAddress_Like + { + set + { + this.HtParameter["ShipAddress_Like"] = value; + } + get + { + return this.HtParameter["ShipAddress_Like"]; + } + } + + + /// ShipCity_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipCity_Like + { + set + { + this.HtParameter["ShipCity_Like"] = value; + } + get + { + return this.HtParameter["ShipCity_Like"]; + } + } + + + /// ShipRegion_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipRegion_Like + { + set + { + this.HtParameter["ShipRegion_Like"] = value; + } + get + { + return this.HtParameter["ShipRegion_Like"]; + } + } + + + /// ShipPostalCode_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipPostalCode_Like + { + set + { + this.HtParameter["ShipPostalCode_Like"] = value; + } + get + { + return this.HtParameter["ShipPostalCode_Like"]; + } + } + + + /// ShipCountry_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipCountry_Like + { + set + { + this.HtParameter["ShipCountry_Like"] = value; + } + get + { + return this.HtParameter["ShipCountry_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoOrders2_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoOrders2_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoOrders2_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoOrders2_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoOrders2_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoOrders2_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoOrders2_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoOrders2_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoOrders2_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs new file mode 100644 index 000000000..b2c06e646 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs @@ -0,0 +1,151 @@ +//********************************************************************************** +//* リラン可能バッチ処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：サンプル バッチ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using RerunnableBatch_sample.Business; +using RerunnableBatch_sample.Common; + +using System; +using System.Collections; +using System.Collections.Generic; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Str; +using Touryo.Infrastructure.Public.Util; + +namespace RerunnableBatch_sample +{ + /// Program + class Program + { + /// + /// 中間コミットを行う件数 + /// + /// + /// ※ サンプルデータの件数が少ない(830件)ため小さい値としている + /// + public const int INTERMEDIATE_COMMIT_COUNT = 100; + + /// Main + static void Main(string[] args) + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // コマンドラインをバラす関数がある。 + List valsLst = null; + Dictionary argsDic = null; + StringVariableOperator.GetCommandArgs('/', out argsDic, out valsLst); + + // 引数クラス値（B層実行用） + string screenId = System.Reflection.Assembly.GetExecutingAssembly().Location; + string controlId = "-"; + string actionType = "SQL"; // argsDic["/DAP"] + "%" + argsDic["/MODE1"] + "%" + argsDic["/MODE2"] + "%" + argsDic["/EXROLLBACK"]; + MyUserInfo myUserInfo = new MyUserInfo("userName", "ipAddress"); + + // B層クラス + LayerB layerB = new LayerB(); + + // ↓B層実行：主キー値を全て検索(ORDER BY 主キー)----------------------------------------------------- + + // 引数クラスを生成 + VoidParameterValue selectPkListParameterValue = new VoidParameterValue(screenId, controlId, "SelectPkList", actionType, myUserInfo); + + // Ｂ層呼出し + SelectPkListReturnValue selectPkReturnValue = (SelectPkListReturnValue)layerB.DoBusinessLogic(selectPkListParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // 実行結果確認 + if (selectPkReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + selectPkReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + selectPkReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + selectPkReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + return; //バッチ処理終了 + } + + // 戻り値取得 + ArrayList pkList = selectPkReturnValue.PkList; + + // ↑B層実行：主キー値を全て検索(ORDER BY 主キー)----------------------------------------------------- + + int recordCount = pkList.Count; // 全レコード数 + int initialIndex = 0; // 処理開始インデックス ※ todo:リラン時に途中から再開する場合は初期値を変更する + int transactionCount = Convert.ToInt32(Math.Ceiling(((double)(recordCount - initialIndex)) / INTERMEDIATE_COMMIT_COUNT)); // 更新B層実行回数 + + // 性能測定 + // 性能測定 - 開始 + PerformanceRecorder pr = new PerformanceRecorder(); + pr.StartsPerformanceRecord(); + + for (int transactionIndex = 0; transactionIndex < transactionCount; transactionIndex++) + { + ArrayList subPkList; // 主キー一覧(1トランザクション分) + int subPkStartIndex; // 主キー(1トランザクション分)の開始位置 + int subPkCount; // 主キー数(1トランザクション分) + + // 取り出す主キーの開始、数を取得 + subPkStartIndex = initialIndex + (transactionIndex * INTERMEDIATE_COMMIT_COUNT); + if (subPkStartIndex + INTERMEDIATE_COMMIT_COUNT - 1 > recordCount - 1) + { + subPkCount = (recordCount - initialIndex) % INTERMEDIATE_COMMIT_COUNT; + } + else + { + subPkCount = INTERMEDIATE_COMMIT_COUNT; + } + + // 主キー一覧(1トランザクション分)を取り出す + subPkList = new ArrayList(); + subPkList.AddRange(pkList.GetRange(subPkStartIndex, subPkCount)); + + // ↓B層実行：バッチ処理を実行(1トランザクション分)---------------------------------------------------- + + // 引数クラスを生成 + ExecuteBatchProcessParameterValue executeBatchProcessParameterValue = new ExecuteBatchProcessParameterValue(screenId, controlId, "ExecuteBatchProcess", actionType, myUserInfo); + executeBatchProcessParameterValue.SubPkList = subPkList; + + // Ｂ層呼出し + VoidReturnValue executeBatchProcessReturnValue = (VoidReturnValue)layerB.DoBusinessLogic(executeBatchProcessParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // 実行結果確認 + if (selectPkReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + selectPkReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + selectPkReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + selectPkReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + return; // バッチ処理終了 + } + + // ↑B層実行：バッチ処理を実行(1トランザクション分)---------------------------------------------------- + } + + // 性能測定 - 終了 + Console.WriteLine(pr.EndsPerformanceRecord()); + Console.ReadKey(); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj new file mode 100644 index 000000000..800a5b3ef --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj @@ -0,0 +1,96 @@ + + + + Exe + net5.0 + + + + full + true + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln new file mode 100644 index 000000000..f5ec09f1b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B31F96AD-FD2E-4D81-B4AA-2641039C7CEE} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json new file mode 100644 index 000000000..6acfed80c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json @@ -0,0 +1,19 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + "FxSqlTraceLog": "on", + "FxSqlCacheSwitch": "off", + "FxSqlEncoding": "utf-8", + "FxSqlCommandTimeout": "30", + "SqlTextFilePath": "./Dao" + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs new file mode 100644 index 000000000..882defc5c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Business/LayerB.cs @@ -0,0 +1,160 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using RerunnableBatch_sample2.Common; + +using System.Data; +using System.Text; +using System.Collections; + +using Touryo.Infrastructure.Business.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace RerunnableBatch_sample2.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic + { + #region UOCメソッド + + #region SelectPkList + + /// 主キー一覧を取得 + /// 引数クラス + private void UOC_SelectPkList(VoidParameterValue parameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + SelectPkListReturnValue returnValue = new SelectPkListReturnValue(); + this.ReturnValue = returnValue; + + // ↓業務処理----------------------------------------------------- + + DataTable pkTable = new DataTable(); + + // ↓DBアクセス----------------------------------------------------- + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + // 動的SQLを指定 + cmnDao.SQLFileName = "SelectAllOrderID.xml"; + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(pkTable); + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + ArrayList pkList = new ArrayList(); + for (int index = 0; index < pkTable.Rows.Count; index++) + { + //データテーブルからArrayListに詰め直す + pkList.Add(pkTable.Rows[index]["OrderID"]); + } + returnValue.PkList = pkList; + + // ↑業務処理----------------------------------------------------- + + } + + #endregion + + #region ExecuteBatchProcess + + /// バッチ処理を実行する + /// 引数クラス + private void UOC_ExecuteBatchProcess(ExecuteBatchProcessParameterValue parameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + this.ReturnValue = new VoidReturnValue(); + + // ↓業務処理----------------------------------------------------- + + ArrayList pkList = parameter.SubPkList; //主キー一覧(1トランザクション分) + DataTable dataTable = new DataTable(); //データ一覧(主キーを元に検索したデータ) + + //Ordersテーブルからデータを検索する + // ↓DBアクセス----------------------------------------------------- + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + // 動的SQLを指定 + cmnDao.SQLFileName = "SelectInOrderID.xml"; + + // パラメータを設定 + cmnDao.SetParameter("OrderID", pkList); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dataTable); + // ↑DBアクセス----------------------------------------------------- + + + //Orders2テーブルに複数件まとめて追加する。 + StringBuilder sb = new StringBuilder(); + + for (int index = 0; index < dataTable.Rows.Count; index++) + { + DataRow row = dataTable.Rows[index]; //1件分のデータ + + //todo：編集処理など + + // ↓DBアクセス----------------------------------------------------- + // 自動生成Daoを生成 + DaoOrders2 dao = new DaoOrders2(this.GetDam()); + + // パラメータを設定 + dao.PK_OrderID = row["OrderID"]; + dao.CustomerID = row["CustomerID"]; + dao.EmployeeID = row["EmployeeID"]; + dao.OrderDate = row["OrderDate"]; + dao.RequiredDate = row["RequiredDate"]; + dao.ShippedDate = row["ShippedDate"]; + dao.ShipVia = row["ShipVia"]; + dao.Freight = row["Freight"]; + dao.ShipName = row["ShipName"]; + dao.ShipAddress = row["ShipAddress"]; + dao.ShipCity = row["ShipCity"]; + dao.ShipRegion = row["ShipRegion"]; + dao.ShipPostalCode = row["ShipPostalCode"]; + dao.ShipCountry = row["ShipCountry"]; + + // 自動生成Daoを実行 + sb.Append(dao.ExecGenerateSQL( + "DaoOrders2_S1_Insert.sql", new SQLUtility(DbEnum.DBMSType.SQLServer)) + ";\r\n"); + // "DaoOrders2_D1_Insert.xml", new SQLUtility(DbEnum.DBMSType.SQLServer)) + ";\r\n"); // 性能比較用 + + // ↑DBアクセス----------------------------------------------------- + } + + // 共通Daoでバッチ更新 + CmnDao cd = new CmnDao(this.GetDam()); + cd.SQLText = sb.ToString(); + cd.ExecInsUpDel_NonQuery(); + + // todo:中間コミット情報をDBに登録 ※最終処理主キー値の登録など + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs new file mode 100644 index 000000000..b036a64a9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.cs @@ -0,0 +1,45 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ExecuteBatchProcessParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Collections; +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace RerunnableBatch_sample2.Common +{ + /// + /// ExecuteBatchProcessParameterValue の概要の説明です + /// + public class ExecuteBatchProcessParameterValue : MyParameterValue + { + /// 1トランザクションで処理を行う主キー一覧 + public ArrayList SubPkList; + + #region コンストラクタ + + /// コンストラクタ + public ExecuteBatchProcessParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs new file mode 100644 index 000000000..709eed047 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.cs @@ -0,0 +1,33 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：SelectPkListReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Collections; +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample2.Common +{ + /// + /// SelectPkListReturnValueの概要の説明です + /// + public class SelectPkListReturnValue : MyReturnValue + { + /// PkList + public ArrayList PkList; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs new file mode 100644 index 000000000..07b2dc83d --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.cs @@ -0,0 +1,41 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：VoidParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace RerunnableBatch_sample2.Common +{ + /// + /// VoidParameterValue の概要の説明です + /// + public class VoidParameterValue : MyParameterValue + { + #region コンストラクタ + + /// コンストラクタ + public VoidParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs new file mode 100644 index 000000000..4658b412e --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.cs @@ -0,0 +1,30 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：VoidReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample2.Common +{ + /// + /// VoidReturnValueの概要の説明です + /// + public class VoidReturnValue : MyReturnValue + { + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs new file mode 100644 index 000000000..2ef66e266 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.cs @@ -0,0 +1,890 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoOrders2 +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoOrders2 : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoOrders2(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// OrderID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_OrderID + { + set + { + this.HtParameter["OrderID"] = value; + } + get + { + return this.HtParameter["OrderID"]; + } + } + + + + /// CustomerID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CustomerID + { + set + { + this.HtParameter["CustomerID"] = value; + } + get + { + return this.HtParameter["CustomerID"]; + } + } + + /// EmployeeID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object EmployeeID + { + set + { + this.HtParameter["EmployeeID"] = value; + } + get + { + return this.HtParameter["EmployeeID"]; + } + } + + /// OrderDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object OrderDate + { + set + { + this.HtParameter["OrderDate"] = value; + } + get + { + return this.HtParameter["OrderDate"]; + } + } + + /// RequiredDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object RequiredDate + { + set + { + this.HtParameter["RequiredDate"] = value; + } + get + { + return this.HtParameter["RequiredDate"]; + } + } + + /// ShippedDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShippedDate + { + set + { + this.HtParameter["ShippedDate"] = value; + } + get + { + return this.HtParameter["ShippedDate"]; + } + } + + /// ShipVia列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipVia + { + set + { + this.HtParameter["ShipVia"] = value; + } + get + { + return this.HtParameter["ShipVia"]; + } + } + + /// Freight列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Freight + { + set + { + this.HtParameter["Freight"] = value; + } + get + { + return this.HtParameter["Freight"]; + } + } + + /// ShipName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipName + { + set + { + this.HtParameter["ShipName"] = value; + } + get + { + return this.HtParameter["ShipName"]; + } + } + + /// ShipAddress列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipAddress + { + set + { + this.HtParameter["ShipAddress"] = value; + } + get + { + return this.HtParameter["ShipAddress"]; + } + } + + /// ShipCity列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipCity + { + set + { + this.HtParameter["ShipCity"] = value; + } + get + { + return this.HtParameter["ShipCity"]; + } + } + + /// ShipRegion列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipRegion + { + set + { + this.HtParameter["ShipRegion"] = value; + } + get + { + return this.HtParameter["ShipRegion"]; + } + } + + /// ShipPostalCode列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipPostalCode + { + set + { + this.HtParameter["ShipPostalCode"] = value; + } + get + { + return this.HtParameter["ShipPostalCode"]; + } + } + + /// ShipCountry列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipCountry + { + set + { + this.HtParameter["ShipCountry"] = value; + } + get + { + return this.HtParameter["ShipCountry"]; + } + } + + + /// Set_OrderID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_OrderID_forUPD + { + set + { + this.HtParameter["Set_OrderID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_OrderID_forUPD"]; + } + } + + + /// Set_CustomerID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CustomerID_forUPD + { + set + { + this.HtParameter["Set_CustomerID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CustomerID_forUPD"]; + } + } + + + /// Set_EmployeeID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_EmployeeID_forUPD + { + set + { + this.HtParameter["Set_EmployeeID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_EmployeeID_forUPD"]; + } + } + + + /// Set_OrderDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_OrderDate_forUPD + { + set + { + this.HtParameter["Set_OrderDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_OrderDate_forUPD"]; + } + } + + + /// Set_RequiredDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_RequiredDate_forUPD + { + set + { + this.HtParameter["Set_RequiredDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_RequiredDate_forUPD"]; + } + } + + + /// Set_ShippedDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShippedDate_forUPD + { + set + { + this.HtParameter["Set_ShippedDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShippedDate_forUPD"]; + } + } + + + /// Set_ShipVia_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipVia_forUPD + { + set + { + this.HtParameter["Set_ShipVia_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipVia_forUPD"]; + } + } + + + /// Set_Freight_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Freight_forUPD + { + set + { + this.HtParameter["Set_Freight_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Freight_forUPD"]; + } + } + + + /// Set_ShipName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipName_forUPD + { + set + { + this.HtParameter["Set_ShipName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipName_forUPD"]; + } + } + + + /// Set_ShipAddress_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipAddress_forUPD + { + set + { + this.HtParameter["Set_ShipAddress_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipAddress_forUPD"]; + } + } + + + /// Set_ShipCity_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipCity_forUPD + { + set + { + this.HtParameter["Set_ShipCity_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipCity_forUPD"]; + } + } + + + /// Set_ShipRegion_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipRegion_forUPD + { + set + { + this.HtParameter["Set_ShipRegion_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipRegion_forUPD"]; + } + } + + + /// Set_ShipPostalCode_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipPostalCode_forUPD + { + set + { + this.HtParameter["Set_ShipPostalCode_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipPostalCode_forUPD"]; + } + } + + + /// Set_ShipCountry_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipCountry_forUPD + { + set + { + this.HtParameter["Set_ShipCountry_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipCountry_forUPD"]; + } + } + + + + /// OrderID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object OrderID_Like + { + set + { + this.HtParameter["OrderID_Like"] = value; + } + get + { + return this.HtParameter["OrderID_Like"]; + } + } + + + /// CustomerID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CustomerID_Like + { + set + { + this.HtParameter["CustomerID_Like"] = value; + } + get + { + return this.HtParameter["CustomerID_Like"]; + } + } + + + /// EmployeeID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object EmployeeID_Like + { + set + { + this.HtParameter["EmployeeID_Like"] = value; + } + get + { + return this.HtParameter["EmployeeID_Like"]; + } + } + + + /// OrderDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object OrderDate_Like + { + set + { + this.HtParameter["OrderDate_Like"] = value; + } + get + { + return this.HtParameter["OrderDate_Like"]; + } + } + + + /// RequiredDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object RequiredDate_Like + { + set + { + this.HtParameter["RequiredDate_Like"] = value; + } + get + { + return this.HtParameter["RequiredDate_Like"]; + } + } + + + /// ShippedDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShippedDate_Like + { + set + { + this.HtParameter["ShippedDate_Like"] = value; + } + get + { + return this.HtParameter["ShippedDate_Like"]; + } + } + + + /// ShipVia_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipVia_Like + { + set + { + this.HtParameter["ShipVia_Like"] = value; + } + get + { + return this.HtParameter["ShipVia_Like"]; + } + } + + + /// Freight_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Freight_Like + { + set + { + this.HtParameter["Freight_Like"] = value; + } + get + { + return this.HtParameter["Freight_Like"]; + } + } + + + /// ShipName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipName_Like + { + set + { + this.HtParameter["ShipName_Like"] = value; + } + get + { + return this.HtParameter["ShipName_Like"]; + } + } + + + /// ShipAddress_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipAddress_Like + { + set + { + this.HtParameter["ShipAddress_Like"] = value; + } + get + { + return this.HtParameter["ShipAddress_Like"]; + } + } + + + /// ShipCity_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipCity_Like + { + set + { + this.HtParameter["ShipCity_Like"] = value; + } + get + { + return this.HtParameter["ShipCity_Like"]; + } + } + + + /// ShipRegion_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipRegion_Like + { + set + { + this.HtParameter["ShipRegion_Like"] = value; + } + get + { + return this.HtParameter["ShipRegion_Like"]; + } + } + + + /// ShipPostalCode_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipPostalCode_Like + { + set + { + this.HtParameter["ShipPostalCode_Like"] = value; + } + get + { + return this.HtParameter["ShipPostalCode_Like"]; + } + } + + + /// ShipCountry_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipCountry_Like + { + set + { + this.HtParameter["ShipCountry_Like"] = value; + } + get + { + return this.HtParameter["ShipCountry_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoOrders2_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoOrders2_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoOrders2_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoOrders2_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoOrders2_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoOrders2_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoOrders2_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoOrders2_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoOrders2_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs new file mode 100644 index 000000000..4a4c8db84 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs @@ -0,0 +1,151 @@ +//********************************************************************************** +//* リラン可能バッチ処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：サンプル バッチ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using RerunnableBatch_sample2.Business; +using RerunnableBatch_sample2.Common; + +using System; +using System.Collections; +using System.Collections.Generic; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Str; +using Touryo.Infrastructure.Public.Util; + +namespace RerunnableBatch_sample2 +{ + /// Program + class Program + { + /// + /// 中間コミットを行う件数 + /// + /// + /// ※ サンプルデータの件数が少ない(830件)ため小さい値としている + /// + public const int INTERMEDIATE_COMMIT_COUNT = 100; + + /// Main + static void Main(string[] args) + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // コマンドラインをバラす関数がある。 + List valsLst = null; + Dictionary argsDic = null; + StringVariableOperator.GetCommandArgs('/', out argsDic, out valsLst); + + // 引数クラス値（B層実行用） + string screenId = System.Reflection.Assembly.GetExecutingAssembly().Location; + string controlId = "-"; + string actionType = "SQL"; // argsDic["/DAP"] + "%" + argsDic["/MODE1"] + "%" + argsDic["/MODE2"] + "%" + argsDic["/EXROLLBACK"]; + MyUserInfo myUserInfo = new MyUserInfo("userName", "ipAddress"); + + // B層クラス + LayerB layerB = new LayerB(); + + // ↓B層実行：主キー値を全て検索(ORDER BY 主キー)----------------------------------------------------- + + // 引数クラスを生成 + VoidParameterValue selectPkListParameterValue = new VoidParameterValue(screenId, controlId, "SelectPkList", actionType, myUserInfo); + + // Ｂ層呼出し + SelectPkListReturnValue selectPkReturnValue = (SelectPkListReturnValue)layerB.DoBusinessLogic(selectPkListParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // 実行結果確認 + if (selectPkReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + selectPkReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + selectPkReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + selectPkReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + return; //バッチ処理終了 + } + + // 戻り値取得 + ArrayList pkList = selectPkReturnValue.PkList; + + // ↑B層実行：主キー値を全て検索(ORDER BY 主キー)----------------------------------------------------- + + int recordCount = pkList.Count; // 全レコード数 + int initialIndex = 0; // 処理開始インデックス ※ todo:リラン時に途中から再開する場合は初期値を変更する + int transactionCount = Convert.ToInt32(Math.Ceiling(((double)(recordCount - initialIndex)) / INTERMEDIATE_COMMIT_COUNT)); // 更新B層実行回数 + + // 性能測定 + // 性能測定 - 開始 + PerformanceRecorder pr = new PerformanceRecorder(); + pr.StartsPerformanceRecord(); + + for (int transactionIndex = 0; transactionIndex < transactionCount; transactionIndex++) + { + ArrayList subPkList; // 主キー一覧(1トランザクション分) + int subPkStartIndex; // 主キー(1トランザクション分)の開始位置 + int subPkCount; // 主キー数(1トランザクション分) + + // 取り出す主キーの開始、数を取得 + subPkStartIndex = initialIndex + (transactionIndex * INTERMEDIATE_COMMIT_COUNT); + if (subPkStartIndex + INTERMEDIATE_COMMIT_COUNT - 1 > recordCount - 1) + { + subPkCount = (recordCount - initialIndex) % INTERMEDIATE_COMMIT_COUNT; + } + else + { + subPkCount = INTERMEDIATE_COMMIT_COUNT; + } + + // 主キー一覧(1トランザクション分)を取り出す + subPkList = new ArrayList(); + subPkList.AddRange(pkList.GetRange(subPkStartIndex, subPkCount)); + + // ↓B層実行：バッチ処理を実行(1トランザクション分)---------------------------------------------------- + + // 引数クラスを生成 + ExecuteBatchProcessParameterValue executeBatchProcessParameterValue = new ExecuteBatchProcessParameterValue(screenId, controlId, "ExecuteBatchProcess", actionType, myUserInfo); + executeBatchProcessParameterValue.SubPkList = subPkList; + + // Ｂ層呼出し + VoidReturnValue executeBatchProcessReturnValue = (VoidReturnValue)layerB.DoBusinessLogic(executeBatchProcessParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // 実行結果確認 + if (selectPkReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + selectPkReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + selectPkReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + selectPkReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + return; // バッチ処理終了 + } + + // ↑B層実行：バッチ処理を実行(1トランザクション分)---------------------------------------------------- + } + + // 性能測定 - 終了 + Console.WriteLine(pr.EndsPerformanceRecord()); + Console.ReadKey(); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj new file mode 100644 index 000000000..800a5b3ef --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj @@ -0,0 +1,96 @@ + + + + Exe + net5.0 + + + + full + true + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln new file mode 100644 index 000000000..0d5e3488c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {04F03B41-9A44-4F3A-B572-7696FBBB13C7} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json new file mode 100644 index 000000000..6acfed80c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json @@ -0,0 +1,19 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + "FxSqlTraceLog": "on", + "FxSqlCacheSwitch": "off", + "FxSqlEncoding": "utf-8", + "FxSqlCommandTimeout": "30", + "SqlTextFilePath": "./Dao" + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs new file mode 100644 index 000000000..ca5bf37b8 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Business/LayerB.cs @@ -0,0 +1,146 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using RerunnableBatch_sample3.Common; + +using System; +using System.Data; +using System.Text; +using System.Collections; + +using Touryo.Infrastructure.Business.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace RerunnableBatch_sample3.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic + { + #region UOCメソッド + + #region SelectPkList + + /// 主キー一覧を取得 + /// 引数クラス + private void UOC_SelectPkList(VoidParameterValue parameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + SelectPkListReturnValue returnValue = new SelectPkListReturnValue(); + this.ReturnValue = returnValue; + + // ↓業務処理----------------------------------------------------- + + DataTable pkTable = new DataTable(); + + // ↓DBアクセス----------------------------------------------------- + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + // 動的SQLを指定 + cmnDao.SQLFileName = "SelectAllOrderID.xml"; + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(pkTable); + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + ArrayList pkList = new ArrayList(); + for (int index = 0; index < pkTable.Rows.Count; index++) + { + //データテーブルからArrayListに詰め直す + pkList.Add(pkTable.Rows[index]["OrderID"]); + } + returnValue.PkList = pkList; + + // ↑業務処理----------------------------------------------------- + + } + + #endregion + + #region ExecuteBatchProcess + + /// バッチ処理を実行する + /// 引数クラス + private void UOC_ExecuteBatchProcess(ExecuteBatchProcessParameterValue parameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + this.ReturnValue = new VoidReturnValue(); + + // ↓業務処理----------------------------------------------------- + + ArrayList pkList = parameter.SubPkList; //主キー一覧(1トランザクション分) + DataTable dataTable = new DataTable(); //データ一覧(主キーを元に検索したデータ) + + //Ordersテーブルからデータを検索する + // ↓DBアクセス----------------------------------------------------- + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + // 動的SQLを指定 + cmnDao.SQLFileName = "SelectInOrderID.xml"; + + // パラメータを設定 + cmnDao.SetParameter("OrderID", pkList); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dataTable); + // ↑DBアクセス----------------------------------------------------- + + + //Orders2テーブルに複数件まとめて追加する。 + string insertHeader = "INSERT INTO [Orders2] {0} VALUES {1}"; + string columnList = ""; + + SQLUtility sQLUtility = new SQLUtility(DbEnum.DBMSType.SQLServer); + string[] insertSQLParts = sQLUtility.GetInsertSQLParts(dataTable); + + StringBuilder sb = new StringBuilder(); + foreach (string insertSQLPart in insertSQLParts) + { + if (string.IsNullOrEmpty(columnList)) + { + // columnList + columnList = insertSQLPart; + } + else + { + // insertSQLPart + sb.Append(string.Format(insertHeader, columnList, insertSQLPart) + Environment.NewLine); + } + } + + // 共通Daoでバッチ更新 + CmnDao cd = new CmnDao(this.GetDam()); + cd.SQLText = sb.ToString(); + cd.ExecInsUpDel_NonQuery(); + + // todo:中間コミット情報をDBに登録 ※最終処理主キー値の登録など + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs new file mode 100644 index 000000000..76933f641 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.cs @@ -0,0 +1,45 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ExecuteBatchProcessParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Collections; +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace RerunnableBatch_sample3.Common +{ + /// + /// ExecuteBatchProcessParameterValue の概要の説明です + /// + public class ExecuteBatchProcessParameterValue : MyParameterValue + { + /// 1トランザクションで処理を行う主キー一覧 + public ArrayList SubPkList; + + #region コンストラクタ + + /// コンストラクタ + public ExecuteBatchProcessParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs new file mode 100644 index 000000000..7b5089284 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.cs @@ -0,0 +1,33 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：SelectPkListReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Collections; +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample3.Common +{ + /// + /// SelectPkListReturnValueの概要の説明です + /// + public class SelectPkListReturnValue : MyReturnValue + { + /// PkList + public ArrayList PkList; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs new file mode 100644 index 000000000..d18c97123 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.cs @@ -0,0 +1,41 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：VoidParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace RerunnableBatch_sample3.Common +{ + /// + /// VoidParameterValue の概要の説明です + /// + public class VoidParameterValue : MyParameterValue + { + #region コンストラクタ + + /// コンストラクタ + public VoidParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs new file mode 100644 index 000000000..29eb847ce --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.cs @@ -0,0 +1,30 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：VoidReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技セ +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using Touryo.Infrastructure.Business.Common; + +namespace RerunnableBatch_sample3.Common +{ + /// + /// VoidReturnValueの概要の説明です + /// + public class VoidReturnValue : MyReturnValue + { + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs new file mode 100644 index 000000000..2ef66e266 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.cs @@ -0,0 +1,890 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoOrders2 +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +/// 自動生成Ｄａｏクラス +public class DaoOrders2 : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoOrders2(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// OrderID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_OrderID + { + set + { + this.HtParameter["OrderID"] = value; + } + get + { + return this.HtParameter["OrderID"]; + } + } + + + + /// CustomerID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CustomerID + { + set + { + this.HtParameter["CustomerID"] = value; + } + get + { + return this.HtParameter["CustomerID"]; + } + } + + /// EmployeeID列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object EmployeeID + { + set + { + this.HtParameter["EmployeeID"] = value; + } + get + { + return this.HtParameter["EmployeeID"]; + } + } + + /// OrderDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object OrderDate + { + set + { + this.HtParameter["OrderDate"] = value; + } + get + { + return this.HtParameter["OrderDate"]; + } + } + + /// RequiredDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object RequiredDate + { + set + { + this.HtParameter["RequiredDate"] = value; + } + get + { + return this.HtParameter["RequiredDate"]; + } + } + + /// ShippedDate列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShippedDate + { + set + { + this.HtParameter["ShippedDate"] = value; + } + get + { + return this.HtParameter["ShippedDate"]; + } + } + + /// ShipVia列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipVia + { + set + { + this.HtParameter["ShipVia"] = value; + } + get + { + return this.HtParameter["ShipVia"]; + } + } + + /// Freight列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Freight + { + set + { + this.HtParameter["Freight"] = value; + } + get + { + return this.HtParameter["Freight"]; + } + } + + /// ShipName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipName + { + set + { + this.HtParameter["ShipName"] = value; + } + get + { + return this.HtParameter["ShipName"]; + } + } + + /// ShipAddress列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipAddress + { + set + { + this.HtParameter["ShipAddress"] = value; + } + get + { + return this.HtParameter["ShipAddress"]; + } + } + + /// ShipCity列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipCity + { + set + { + this.HtParameter["ShipCity"] = value; + } + get + { + return this.HtParameter["ShipCity"]; + } + } + + /// ShipRegion列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipRegion + { + set + { + this.HtParameter["ShipRegion"] = value; + } + get + { + return this.HtParameter["ShipRegion"]; + } + } + + /// ShipPostalCode列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipPostalCode + { + set + { + this.HtParameter["ShipPostalCode"] = value; + } + get + { + return this.HtParameter["ShipPostalCode"]; + } + } + + /// ShipCountry列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object ShipCountry + { + set + { + this.HtParameter["ShipCountry"] = value; + } + get + { + return this.HtParameter["ShipCountry"]; + } + } + + + /// Set_OrderID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_OrderID_forUPD + { + set + { + this.HtParameter["Set_OrderID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_OrderID_forUPD"]; + } + } + + + /// Set_CustomerID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CustomerID_forUPD + { + set + { + this.HtParameter["Set_CustomerID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CustomerID_forUPD"]; + } + } + + + /// Set_EmployeeID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_EmployeeID_forUPD + { + set + { + this.HtParameter["Set_EmployeeID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_EmployeeID_forUPD"]; + } + } + + + /// Set_OrderDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_OrderDate_forUPD + { + set + { + this.HtParameter["Set_OrderDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_OrderDate_forUPD"]; + } + } + + + /// Set_RequiredDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_RequiredDate_forUPD + { + set + { + this.HtParameter["Set_RequiredDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_RequiredDate_forUPD"]; + } + } + + + /// Set_ShippedDate_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShippedDate_forUPD + { + set + { + this.HtParameter["Set_ShippedDate_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShippedDate_forUPD"]; + } + } + + + /// Set_ShipVia_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipVia_forUPD + { + set + { + this.HtParameter["Set_ShipVia_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipVia_forUPD"]; + } + } + + + /// Set_Freight_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Freight_forUPD + { + set + { + this.HtParameter["Set_Freight_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Freight_forUPD"]; + } + } + + + /// Set_ShipName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipName_forUPD + { + set + { + this.HtParameter["Set_ShipName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipName_forUPD"]; + } + } + + + /// Set_ShipAddress_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipAddress_forUPD + { + set + { + this.HtParameter["Set_ShipAddress_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipAddress_forUPD"]; + } + } + + + /// Set_ShipCity_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipCity_forUPD + { + set + { + this.HtParameter["Set_ShipCity_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipCity_forUPD"]; + } + } + + + /// Set_ShipRegion_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipRegion_forUPD + { + set + { + this.HtParameter["Set_ShipRegion_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipRegion_forUPD"]; + } + } + + + /// Set_ShipPostalCode_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipPostalCode_forUPD + { + set + { + this.HtParameter["Set_ShipPostalCode_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipPostalCode_forUPD"]; + } + } + + + /// Set_ShipCountry_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipCountry_forUPD + { + set + { + this.HtParameter["Set_ShipCountry_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipCountry_forUPD"]; + } + } + + + + /// OrderID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object OrderID_Like + { + set + { + this.HtParameter["OrderID_Like"] = value; + } + get + { + return this.HtParameter["OrderID_Like"]; + } + } + + + /// CustomerID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CustomerID_Like + { + set + { + this.HtParameter["CustomerID_Like"] = value; + } + get + { + return this.HtParameter["CustomerID_Like"]; + } + } + + + /// EmployeeID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object EmployeeID_Like + { + set + { + this.HtParameter["EmployeeID_Like"] = value; + } + get + { + return this.HtParameter["EmployeeID_Like"]; + } + } + + + /// OrderDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object OrderDate_Like + { + set + { + this.HtParameter["OrderDate_Like"] = value; + } + get + { + return this.HtParameter["OrderDate_Like"]; + } + } + + + /// RequiredDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object RequiredDate_Like + { + set + { + this.HtParameter["RequiredDate_Like"] = value; + } + get + { + return this.HtParameter["RequiredDate_Like"]; + } + } + + + /// ShippedDate_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShippedDate_Like + { + set + { + this.HtParameter["ShippedDate_Like"] = value; + } + get + { + return this.HtParameter["ShippedDate_Like"]; + } + } + + + /// ShipVia_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipVia_Like + { + set + { + this.HtParameter["ShipVia_Like"] = value; + } + get + { + return this.HtParameter["ShipVia_Like"]; + } + } + + + /// Freight_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Freight_Like + { + set + { + this.HtParameter["Freight_Like"] = value; + } + get + { + return this.HtParameter["Freight_Like"]; + } + } + + + /// ShipName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipName_Like + { + set + { + this.HtParameter["ShipName_Like"] = value; + } + get + { + return this.HtParameter["ShipName_Like"]; + } + } + + + /// ShipAddress_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipAddress_Like + { + set + { + this.HtParameter["ShipAddress_Like"] = value; + } + get + { + return this.HtParameter["ShipAddress_Like"]; + } + } + + + /// ShipCity_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipCity_Like + { + set + { + this.HtParameter["ShipCity_Like"] = value; + } + get + { + return this.HtParameter["ShipCity_Like"]; + } + } + + + /// ShipRegion_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipRegion_Like + { + set + { + this.HtParameter["ShipRegion_Like"] = value; + } + get + { + return this.HtParameter["ShipRegion_Like"]; + } + } + + + /// ShipPostalCode_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipPostalCode_Like + { + set + { + this.HtParameter["ShipPostalCode_Like"] = value; + } + get + { + return this.HtParameter["ShipPostalCode_Like"]; + } + } + + + /// ShipCountry_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipCountry_Like + { + set + { + this.HtParameter["ShipCountry_Like"] = value; + } + get + { + return this.HtParameter["ShipCountry_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoOrders2_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoOrders2_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoOrders2_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoOrders2_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoOrders2_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoOrders2_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoOrders2_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoOrders2_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoOrders2_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs new file mode 100644 index 000000000..270d3df17 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs @@ -0,0 +1,151 @@ +//********************************************************************************** +//* リラン可能バッチ処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：サンプル バッチ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using RerunnableBatch_sample3.Business; +using RerunnableBatch_sample3.Common; + +using System; +using System.Collections; +using System.Collections.Generic; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Str; +using Touryo.Infrastructure.Public.Util; + +namespace RerunnableBatch_sample3 +{ + /// Program + class Program + { + /// + /// 中間コミットを行う件数 + /// + /// + /// ※ サンプルデータの件数が少ない(830件)ため小さい値としている + /// + public const int INTERMEDIATE_COMMIT_COUNT = 100; + + /// Main + static void Main(string[] args) + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // コマンドラインをバラす関数がある。 + List valsLst = null; + Dictionary argsDic = null; + StringVariableOperator.GetCommandArgs('/', out argsDic, out valsLst); + + // 引数クラス値（B層実行用） + string screenId = System.Reflection.Assembly.GetExecutingAssembly().Location; + string controlId = "-"; + string actionType = "SQL"; // argsDic["/DAP"] + "%" + argsDic["/MODE1"] + "%" + argsDic["/MODE2"] + "%" + argsDic["/EXROLLBACK"]; + MyUserInfo myUserInfo = new MyUserInfo("userName", "ipAddress"); + + // B層クラス + LayerB layerB = new LayerB(); + + // ↓B層実行：主キー値を全て検索(ORDER BY 主キー)----------------------------------------------------- + + // 引数クラスを生成 + VoidParameterValue selectPkListParameterValue = new VoidParameterValue(screenId, controlId, "SelectPkList", actionType, myUserInfo); + + // Ｂ層呼出し + SelectPkListReturnValue selectPkReturnValue = (SelectPkListReturnValue)layerB.DoBusinessLogic(selectPkListParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // 実行結果確認 + if (selectPkReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + selectPkReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + selectPkReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + selectPkReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + return; //バッチ処理終了 + } + + // 戻り値取得 + ArrayList pkList = selectPkReturnValue.PkList; + + // ↑B層実行：主キー値を全て検索(ORDER BY 主キー)----------------------------------------------------- + + int recordCount = pkList.Count; // 全レコード数 + int initialIndex = 0; // 処理開始インデックス ※ todo:リラン時に途中から再開する場合は初期値を変更する + int transactionCount = Convert.ToInt32(Math.Ceiling(((double)(recordCount - initialIndex)) / INTERMEDIATE_COMMIT_COUNT)); // 更新B層実行回数 + + // 性能測定 + // 性能測定 - 開始 + PerformanceRecorder pr = new PerformanceRecorder(); + pr.StartsPerformanceRecord(); + + for (int transactionIndex = 0; transactionIndex < transactionCount; transactionIndex++) + { + ArrayList subPkList; // 主キー一覧(1トランザクション分) + int subPkStartIndex; // 主キー(1トランザクション分)の開始位置 + int subPkCount; // 主キー数(1トランザクション分) + + // 取り出す主キーの開始、数を取得 + subPkStartIndex = initialIndex + (transactionIndex * INTERMEDIATE_COMMIT_COUNT); + if (subPkStartIndex + INTERMEDIATE_COMMIT_COUNT - 1 > recordCount - 1) + { + subPkCount = (recordCount - initialIndex) % INTERMEDIATE_COMMIT_COUNT; + } + else + { + subPkCount = INTERMEDIATE_COMMIT_COUNT; + } + + // 主キー一覧(1トランザクション分)を取り出す + subPkList = new ArrayList(); + subPkList.AddRange(pkList.GetRange(subPkStartIndex, subPkCount)); + + // ↓B層実行：バッチ処理を実行(1トランザクション分)---------------------------------------------------- + + // 引数クラスを生成 + ExecuteBatchProcessParameterValue executeBatchProcessParameterValue = new ExecuteBatchProcessParameterValue(screenId, controlId, "ExecuteBatchProcess", actionType, myUserInfo); + executeBatchProcessParameterValue.SubPkList = subPkList; + + // Ｂ層呼出し + VoidReturnValue executeBatchProcessReturnValue = (VoidReturnValue)layerB.DoBusinessLogic(executeBatchProcessParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + // 実行結果確認 + if (selectPkReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + selectPkReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + selectPkReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + selectPkReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + return; // バッチ処理終了 + } + + // ↑B層実行：バッチ処理を実行(1トランザクション分)---------------------------------------------------- + } + + // 性能測定 - 終了 + Console.WriteLine(pr.EndsPerformanceRecord()); + Console.ReadKey(); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj new file mode 100644 index 000000000..800a5b3ef --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj @@ -0,0 +1,96 @@ + + + + Exe + net5.0 + + + + full + true + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln new file mode 100644 index 000000000..c017b2d5a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58DE3839-8B8E-413A-BCA7-B2103A1161F7}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {04F03B41-9A44-4F3A-B572-7696FBBB13C7} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json new file mode 100644 index 000000000..6acfed80c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json @@ -0,0 +1,19 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + "FxSqlTraceLog": "on", + "FxSqlCacheSwitch": "off", + "FxSqlEncoding": "utf-8", + "FxSqlCommandTimeout": "30", + "SqlTextFilePath": "./Dao" + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Business/LayerB.cs new file mode 100644 index 000000000..0a288d919 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Business/LayerB.cs @@ -0,0 +1,847 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using SimpleBatch_sample.Common; +using SimpleBatch_sample.Dao; + +using System; +using System.Data; + +using Touryo.Infrastructure.Business.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Framework.Exceptions; + +namespace SimpleBatch_sample.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic + { + #region テンプレ + + /// 業務処理を実装 + /// 引数クラス + private void UOC_メソッド名(TestParameterValue testParameter) + { //メソッド引数にBaseParameterValueの派生の型を定義可能。 + + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + // 個別Dao + LayerD myDao = new LayerD(this.GetDam()); + //myDao.xxxx(testParameter, ref testReturn); + + // 共通Dao + CmnDao cmnDao = new CmnDao(this.GetDam()); + cmnDao.ExecSelectScalar(); + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #region UOCメソッド + + #region SelectCount + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectCount(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.xml"; + break; + } + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecSelectScalar(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D5_SelCnt(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectCount(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DT + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DT(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DT(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DS + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DS(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataSet ds = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 ds + ds = new DataSet(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DS(ds); + + // 戻り値を設定 + testReturn.Obj = ds; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 ds + ds = new DataSet(); + ds.Tables.Add(new DataTable()); + + // 自動生成Daoを実行 + genDao.D2_Select(ds.Tables[0]); + + // 戻り値を設定 + testReturn.Obj = ds; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DS(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DR + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DR(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // 共通Daoを実行 + IDataReader idr = cmnDao.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // DRのI/Fなし + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DR(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DSQL + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DSQL(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.xml"; + break; + } + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + cmnDao.SetUserParameter("COLUMN", " " + orderColumn + " "); + cmnDao.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 自動生成Daoを実行 + testReturn.Obj = dt; + + break; + + //case "generate": // 自動生成Daoを使用する。 + // // 当該SQLなし + // break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DSQL(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Select + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.S2_Select(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Select(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Insert + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + cmnDao.SQLFileName = "ShipperInsert.sql"; + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.CompanyName = testParameter.CompanyName; + genDao.Phone = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D1_Insert(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Insert(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Update + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + genDao.Set_CompanyName_forUPD = testParameter.CompanyName; + genDao.Set_Phone_forUPD = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S3_Update(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Update(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Delete + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S4_Delete(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Delete(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #endregion + + #region ロールバックのテスト + + /// ロールバックのテスト + /// 引数クラス + private void TestRollback(TestParameterValue testParameter) + { + switch ((testParameter.ActionType.Split('%'))[3]) + { + + case "Business": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // 業務例外のスロー + throw new BusinessApplicationException( + "ロールバックのテスト", + "ロールバックのテスト", + "エラー情報"); + //break; // 到達できないためコメントアウト + + case "System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // システム例外のスロー + throw new BusinessSystemException( + "ロールバックのテスト", + "ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外のスロー + throw new Exception("ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other-Business": + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（業務例外へ振り替え）のスロー + throw new Exception("Other-Business"); + //break; // 到達できないためコメントアウト + + case "Other-System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（システム例外へ振り替え）のスロー + throw new Exception("Other-System"); + //break; // 到達できないためコメントアウト + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs new file mode 100644 index 000000000..e8ed92733 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.cs @@ -0,0 +1,60 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +// ベースクラス +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Business.Common; + +namespace SimpleBatch_sample.Common +{ + /// + /// TestParameterValue の概要の説明です + /// + public class TestParameterValue : MyParameterValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + + /// OrderColumn + public string OrderColumn; + + /// OrderSequence + public string OrderSequence; + + #region コンストラクタ + + /// コンストラクタ + public TestParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs new file mode 100644 index 000000000..d4547286c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.cs @@ -0,0 +1,42 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +// ベースクラス +using Touryo.Infrastructure.Business.Common; + +namespace SimpleBatch_sample.Common +{ + /// + /// TestReturnValueの概要の説明です + /// + public class TestReturnValue : MyReturnValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs new file mode 100644 index 000000000..ed0e40965 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.cs @@ -0,0 +1,421 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoShippers +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +#region using + +// System～ +using System; +using System.IO; +using System.Data; +using System.Collections; + +// フレームワーク +using Touryo.Infrastructure.Framework.Dao; +using Touryo.Infrastructure.Framework.Common; + +// 部品 +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Util; + +// 業務フレームワーク +using Touryo.Infrastructure.Business.Dao; + +#endregion + +/// 自動生成Ｄａｏクラス +public class DaoShippers : MyBaseDao +{ + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoShippers(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// ShipperID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_ShipperID + { + set + { + this.HtParameter["ShipperID"] = value; + } + get + { + return this.HtParameter["ShipperID"]; + } + } + + + + /// CompanyName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CompanyName + { + set + { + this.HtParameter["CompanyName"] = value; + } + get + { + return this.HtParameter["CompanyName"]; + } + } + + /// Phone列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Phone + { + set + { + this.HtParameter["Phone"] = value; + } + get + { + return this.HtParameter["Phone"]; + } + } + + + /// Set_ShipperID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipperID_forUPD + { + set + { + this.HtParameter["Set_ShipperID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipperID_forUPD"]; + } + } + + + /// Set_CompanyName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CompanyName_forUPD + { + set + { + this.HtParameter["Set_CompanyName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CompanyName_forUPD"]; + } + } + + + /// Set_Phone_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Phone_forUPD + { + set + { + this.HtParameter["Set_Phone_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Phone_forUPD"]; + } + } + + + + /// ShipperID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipperID_Like + { + set + { + this.HtParameter["ShipperID_Like"] = value; + } + get + { + return this.HtParameter["ShipperID_Like"]; + } + } + + + /// CompanyName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CompanyName_Like + { + set + { + this.HtParameter["CompanyName_Like"] = value; + } + get + { + return this.HtParameter["CompanyName_Like"]; + } + } + + + /// Phone_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Phone_Like + { + set + { + this.HtParameter["Phone_Like"] = value; + } + get + { + return this.HtParameter["Phone_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoShippers_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoShippers_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoShippers_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoShippers_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoShippers_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoShippers_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoShippers_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoShippers_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoShippers_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs new file mode 100644 index 000000000..8646c06d9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Dao/LayerD.cs @@ -0,0 +1,517 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerD +//* クラス日本語名 ：Ｄ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using SimpleBatch_sample.Common; + +using System.Data; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace SimpleBatch_sample.Dao +{ + /// + /// LayerD の概要の説明です + /// + public class LayerD : MyBaseDao + { + /// + /// コンストラクタ + /// + public LayerD(BaseDam dam) : base(dam) { } + + #region テンプレ + + /// テンプレ + /// 引数クラス + /// 戻り値クラス + public void テンプレ(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + // ● 下記のいづれかの方法でSQLを設定する。 + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ファイル名"); + + // -- 直接指定する場合。 + this.SetSqlByCommand("SQL文"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 追加、更新、削除の場合（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // -- 先頭の１セル分の情報を返すSELECTクエリを実行する場合 + obj = this.ExecSelectScalar(); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データテーブル） + obj = new DataTable(); + this.ExecSelectFill_DT((DataTable)obj); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データセット） + obj = new DataSet(); + this.ExecSelectFill_DS((DataSet)obj); + + // -- データリーダを返す + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 参照系 + + #region 件数取得（SelectCount） + + /// 件数情報を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectCount(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperCount.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperCount.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + object obj; + + // -- 件数情報を返すSELECTクエリを実行する + obj = this.ExecSelectScalar(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 一覧取得（SelectAll） + + /// 一覧を返すSELECTクエリを実行する（DT） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DT(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する（DS） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DS(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 ds + DataSet ds = new DataSet(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DS(ds); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = ds; + } + + /// 一覧を返すSELECTクエリを実行する（DR） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DR(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // -- 一覧を返すSELECTクエリを実行する + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DSQL(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelectOrder.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelectOrder.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + this.SetUserParameter("COLUMN", " " + orderColumn + " "); + this.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + #endregion + + #region 参照 + + /// １レコードを返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Select(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelect.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelect.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- １レコードを返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + //// 戻り値を設定 // 不要 + //testReturn.Obj = dt; + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + } + + #endregion + + #endregion + + #region 更新系 + + #region 追加 + + /// Insertクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Insert(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ShipperInsert.sql"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 追加（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 更新 + + /// Updateクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Update(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperUpdate.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperUpdate.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 更新（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 削除 + + /// Deleteクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Delete(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperDelete.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperDelete.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 削除（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #endregion + } +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs new file mode 100644 index 000000000..5ef0d898b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs @@ -0,0 +1,93 @@ +//********************************************************************************** +//* 単純バッチ処理・サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：サンプル バッチ +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using SimpleBatch_sample.Business; +using SimpleBatch_sample.Common; + +using System; +using System.IO; +using System.Collections.Generic; + +using Touryo.Infrastructure.Business.Util; +using Touryo.Infrastructure.Public.Db; +using Touryo.Infrastructure.Public.Str; +using Touryo.Infrastructure.Public.Util; + +namespace SimpleBatch_sample +{ + /// Program + class Program + { + /// Main + static void Main(string[] args) + { + //////////////////////////////////////////////////////////////////////// + // 簡素なサンプルなので、 + // ・多重化（タスク毎、結果セットを分割） + // ・フェッチ・サイズ（メモリ消費量を抑える） + // ・コミット・インターバル、リラン + // 等の考慮が別途必要になることがあります。 + //////////////////////////////////////////////////////////////////////// + + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // コマンドラインをバラす関数がある。 + List valsLst = null; + Dictionary argsDic = null; + + StringVariableOperator.GetCommandArgs('/', out argsDic, out valsLst); + + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + System.Reflection.Assembly.GetExecutingAssembly().Location, "-", "SelectCount", + argsDic["/DAP"] + "%" + + argsDic["/MODE1"] + "%" + + argsDic["/MODE2"] + "%" + + argsDic["/EXROLLBACK"], + new MyUserInfo("", "")); + + // 戻り値 + TestReturnValue testReturnValue; + + // Ｂ層呼出し + LayerB layerB = new LayerB(); + testReturnValue = (TestReturnValue)layerB.DoBusinessLogic(testParameterValue, DbEnum.IsolationLevelEnum.ReadCommitted); + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + string error = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + error += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + error += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + + Console.WriteLine(error); + Console.ReadKey(); + } + else + { + // 結果（正常系） + Console.WriteLine(testReturnValue.Obj.ToString() + "件のデータがあります"); + Console.ReadKey(); + } + } + } +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj new file mode 100644 index 000000000..adf810757 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj @@ -0,0 +1,62 @@ + + + + Exe + net5.0 + + + + full + true + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + + + + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln new file mode 100644 index 000000000..75bafee17 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{4E1E7400-A012-49E2-8D28-A361F0E1BEE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4E1E7400-A012-49E2-8D28-A361F0E1BEE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E1E7400-A012-49E2-8D28-A361F0E1BEE2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E1E7400-A012-49E2-8D28-A361F0E1BEE2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E1E7400-A012-49E2-8D28-A361F0E1BEE2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3D69CB54-D2E7-441E-B62A-0E3FC8FD87CB} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json new file mode 100644 index 000000000..748953abb --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json @@ -0,0 +1,19 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + "FxSqlTraceLog": "on", + "FxSqlCacheSwitch": "off", + "FxSqlEncoding": "utf-8", + "FxSqlCommandTimeout": "30", + "SqlTextFilePath": "C:/root/files/resource/Sql" + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/readme.txt b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/readme.txt similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/readme.txt rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/readme.txt diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml new file mode 100644 index 000000000..dd451d3eb --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs new file mode 100644 index 000000000..2036cd6df --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/App.xaml.cs @@ -0,0 +1,35 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：App +//* クラス日本語名 ：App.xaml の相互作用ロジック +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Windows; + +using Touryo.Infrastructure.Public.Util; + +namespace WSClientWPF_sample +{ + /// App.xaml の相互作用ロジック + public partial class App : Application + { + private void Application_Startup(object sender, StartupEventArgs e) + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs new file mode 100644 index 000000000..240b4e336 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.cs @@ -0,0 +1,78 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：AsyncFunc +//* クラス日本語名 ：サンプル アプリ 非同期処理クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using WSIFType_sample; + +using Touryo.Infrastructure.Business.RichClient.Asynchronous; +using Touryo.Infrastructure.Framework.Transmission; + +namespace WSClientWPF_sample +{ + public class AsyncFunc : MyBaseAsyncFunc + { + /// コンストラクタ + /// WPFやWinFormの要素 + public AsyncFunc(object _this) : base(_this) { } + + /// サービスの論理名 + public string LogicalName = ""; + + /// 非同期 + /// 引数 + /// 結果 + /// + /// ここは副スレッドから実行されるので注意。 + /// 非同期処理クラスに非同期処理を定義すると、 + /// メンバ変数を引数として利用できる。 + /// + public object btn6_Exec(object param) + { + // 戻り値（キャスト） + TestParameterValue testParameterValue = (TestParameterValue)param; + + // 戻り値 + TestReturnValue testReturnValue; + + // 呼出し制御部品（スレッドセーフでないため副スレッド内で作る） + CallController callCtrl = new CallController(""); + + // Invoke + testReturnValue = (TestReturnValue)callCtrl.Invoke( + this.LogicalName, testParameterValue); + + //// 進捗表示のテスト + //this.ChangeProgress = delegate(object o) + //{ + // MessageBox.Show(o.ToString()); + //}; + + //this.ExecChangeProgress("進捗表示"); + + //// 非同期メッセージボックス表示のテスト + //MessageBoxResult mr = this.ShowAsyncMessageBoxWPF( + // "メッセージ", "タイトル", MessageBoxButton.YesNo, MessageBoxImage.Information); + //// 非同期メッセージボックス表示のテスト（エラー） + //System.Windows.Forms.DialogResult dr = this.ShowAsyncMessageBoxWin("メッセージ", "タイトル", + // System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Information); + + // 結果表示 + return testReturnValue; + } + } +} diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj new file mode 100644 index 000000000..608fa701e --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj @@ -0,0 +1,88 @@ + + + + WinExe + net5.0-windows + true + WSClientWPF_sample + WSClientWPF_sample + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + ..\..\Build\net5.0-windows\WSIFType_sample.dll + + + ..\..\Build\net5.0-windows\WSServer_sample.dll + + + + + + Always + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln new file mode 100644 index 000000000..ca5facab9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebServiceCore", "..\..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Debug|x86.ActiveCfg = Debug|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Debug|x86.Build.0 = Debug|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|Any CPU.Build.0 = Release|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|x86.ActiveCfg = Release|Any CPU + {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|x86.Build.0 = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|x86.ActiveCfg = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|x86.Build.0 = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|Any CPU.Build.0 = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|x86.ActiveCfg = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml new file mode 100644 index 000000000..fcf416bdc --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs new file mode 100644 index 000000000..01b155172 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.cs @@ -0,0 +1,40 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Window0 +//* クラス日本語名 ：Window0 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Windows; + +namespace WSClientWPF_sample +{ + /// + /// Window0.xaml の相互作用ロジック + /// + public partial class Window0 : Window + { + public Window0() + { + InitializeComponent(); + } + + private void button1_Click(object sender, RoutedEventArgs e) + { + Window w = new Window1(); + w.Show(); + } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml new file mode 100644 index 000000000..e10f02d84 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs new file mode 100644 index 000000000..f7668ddb1 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.cs @@ -0,0 +1,682 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Window1 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using WSIFType_sample; + +using System; +using System.Data; +using System.Threading; +using System.Windows.Controls; +using System.Windows; + +using Touryo.Infrastructure.Business.RichClient.Asynchronous; +using Touryo.Infrastructure.Business.RichClient.Util; +using Touryo.Infrastructure.Business.Util; + +using Touryo.Infrastructure.Framework.RichClient.Asynchronous; +using Touryo.Infrastructure.Framework.Transmission; +using Touryo.Infrastructure.Framework.Util; + +namespace WSClientWPF_sample +{ + /// Window1.xaml の相互作用（サンプル アプリ画面） + public partial class Window1 : Window + { + /// ユーザ情報 + MyUserInfo myUserInfo; + + /// 呼出し制御部品 + CallController CallCtrl; + + #region 初期処理 + + /// コンストラクタ + public Window1() + { + InitializeComponent(); + } + + /// ロード イベント + private void Window_Loaded(object sender, RoutedEventArgs e) + { + // ddlDap + this.ddlDap.Items.Add(new ComboBoxItem("SQL Server / SQL Client", "SQL")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / OLEDB.NET", "OLE")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / ODCB.NET", "ODB")); + this.ddlDap.Items.Add(new ComboBoxItem("Oracle / ODP.NET", "ODP")); + this.ddlDap.Items.Add(new ComboBoxItem("DB2 / DB2.NET", "DB2")); + this.ddlDap.Items.Add(new ComboBoxItem("HiRDB / HiRDB-DP", "HIR")); + this.ddlDap.Items.Add(new ComboBoxItem("MySQL Cnn/NET", "MCN")); + this.ddlDap.Items.Add(new ComboBoxItem("PostgreSQL / Npgsql", "NPS")); + this.ddlDap.SelectedIndex = 0; + + // ddlMode1 + this.ddlMode1.Items.Add(new ComboBoxItem("個別Ｄａｏ", "individual")); + this.ddlMode1.Items.Add(new ComboBoxItem("共通Ｄａｏ", "common")); + this.ddlMode1.Items.Add(new ComboBoxItem("自動生成Ｄａｏ（更新のみ）", "generate")); + this.ddlMode1.SelectedIndex = 0; + + // ddlMode2 + this.ddlMode2.Items.Add(new ComboBoxItem("静的クエリ", "static")); + this.ddlMode2.Items.Add(new ComboBoxItem("動的クエリ", "dynamic")); + this.ddlMode2.SelectedIndex = 0; + + // ddlIso + this.ddlIso.Items.Add(new ComboBoxItem("ノットコネクト", "NC")); + this.ddlIso.Items.Add(new ComboBoxItem("ノートランザクション", "NT")); + this.ddlIso.Items.Add(new ComboBoxItem("ダーティリード", "RU")); + this.ddlIso.Items.Add(new ComboBoxItem("リードコミット", "RC")); + this.ddlIso.Items.Add(new ComboBoxItem("リピータブルリード", "RR")); + this.ddlIso.Items.Add(new ComboBoxItem("シリアライザブル", "SZ")); + this.ddlIso.Items.Add(new ComboBoxItem("スナップショット", "SS")); + this.ddlIso.Items.Add(new ComboBoxItem("デフォルト", "DF")); + this.ddlIso.SelectedIndex = 1; + + // WSでは使用しない（設定できないので）。 + this.ddlIso.IsEnabled = false; + + // ddlExRollback + this.ddlExRollback.Items.Add(new ComboBoxItem("正常時", "-")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外", "Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外", "System")); + this.ddlExRollback.Items.Add(new ComboBoxItem("その他、一般的な例外", "Other")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外への振替", "Other-Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外への振替", "Other-System")); + this.ddlExRollback.SelectedIndex = 0; + + // ddlTransmission + //this.ddlTransmission.Items.Add(new ComboBoxItem("ASP.NET Webサービス呼出", "testWebService")); + //this.ddlTransmission.Items.Add(new ComboBoxItem("WCF Webサービス呼出", "testWebService2")); + //this.ddlTransmission.Items.Add(new ComboBoxItem("WCF TCPサービス呼出", "testWebService3")); + this.ddlTransmission.Items.Add(new ComboBoxItem("ASP.NET WebAPI呼出", "testWebService4")); + this.ddlTransmission.Items.Add(new ComboBoxItem("インプロセス呼出", "testInProcess")); + this.ddlTransmission.SelectedIndex = 0; + + // ddlOrderColumn + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c1", "c1")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c2", "c2")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c3", "c3")); + this.ddlOrderColumn.SelectedIndex = 0; + + // ddlOrderSequence + this.ddlOrderSequence.Items.Add(new ComboBoxItem("ASC", "A")); + this.ddlOrderSequence.Items.Add(new ComboBoxItem("DESC", "D")); + this.ddlOrderSequence.SelectedIndex = 0; + + // ユーザ情報 + this.myUserInfo = new MyUserInfo("userName", Environment.MachineName); + + // 呼出し制御部品 + this.CallCtrl = new CallController(""); + + // スレッドプール + ThreadPool.SetMinThreads(10, 10); // 待機状態スレッド数 + ThreadPool.SetMaxThreads(10, 10); // 最大スレッド起動数 + } + + #region コンボボックス用 + + /// コンボボックス用インナークラス + private class ComboBoxItem + { + /// 表示名 + private string m_name = ""; + + /// 値 + private string m_value = ""; + + /// コンストラクタ + public ComboBoxItem(string name, string value) + { + m_name = name; + m_value = value; + } + + /// 表示名 + public string Name + { + get + { + return m_name; + } + } + + /// 値 + public string Value + { + get + { + return m_value; + } + } + + /// + /// オーバーライドしたメソッド + /// これがコンボボックスに表示される + /// + public override string ToString() + { + return m_name; + } + } + + #endregion + + #endregion + + #region ＣＲＵＤ処理メソッド + + #region 参照系 + + /// 件数取得 + /// + /// 非同期フレームワークを使用してB層の呼び出し処理を非同期化 + /// （非同期実行、結果表示の双方に匿名デリゲードを使用するパターン） + /// + private void button1_Click(object sender, RoutedEventArgs e) + { + // 非同期処理クラスを生成 + // 匿名デリゲードの場合は、ベース２で良い。 + MyBaseAsyncFunc af = new MyBaseAsyncFunc(this); + + // 引数を纏め非同期処理クラスに設定 + af.Parameter = (object)new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectCount", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 画面上のデータは退避する + //（オブジェクトであれば、クローンする。） + string logicalName = ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value; + + // 非同期実行するメソッドを指定（匿名デリゲード） + // ここは副スレッドから実行されるので注意 + // （画面上のメンバに触らないこと！）。 + af.AsyncFunc = delegate(object param) + { + // 引数クラス（キャスト） + TestParameterValue testParameterValue = (TestParameterValue)param; + + // 戻り値 + TestReturnValue testReturnValue; + + // 呼出し制御部品（スレッドセーフでないため副スレッド内で作る） + CallController callCtrl = new CallController(""); + + // Invoke + testReturnValue = (TestReturnValue)callCtrl.Invoke( + logicalName, testParameterValue); + + //// 進捗表示のテスト + //af.ChangeProgress = delegate(object o) + //{ + // MessageBox.Show(o.ToString()); + //}; + + //af.ExecChangeProgress("進捗表示"); + + //// 非同期メッセージボックス表示のテスト + //MessageBoxResult mr = af.ShowAsyncMessageBoxWPF( + // "メッセージ", "タイトル", MessageBoxButton.YesNo, MessageBoxImage.Information); + //// 非同期メッセージボックス表示のテスト（エラー） + //System.Windows.Forms.DialogResult dr = af.ShowAsyncMessageBoxWin("メッセージ", "タイトル", + // System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Information); + + // 結果表示 + return testReturnValue; + }; + + // 結果表示のメソッドを指定（匿名デリゲード） + // このメソッドは必ず主スレッドで実行される。 + // （画面上のメンバを更新できる！）。 + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + RcMyCmnFunction.ShowErrorMessageWPF((Exception)retVal, "非同期処理で例外発生！"); + } + else + { + // 正常時 + + // 戻り値（キャスト） + TestReturnValue testReturnValue = (TestReturnValue)retVal; + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.labelMessage.Content = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + } + }; + + // 非同期実行する。 + if (!af.StartByThreadPool()) + { + MessageBox.Show("別の非同期処理が実行中です。"); + } + } + + /// 一覧取得（dt） + private void button2_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DT", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGrid1.Columns.Clear(); + this.dataGrid1.DataContext = testReturnValue.Obj; + } + } + + /// 一覧取得（ds） + private void button3_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DS", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGrid1.Columns.Clear(); + this.dataGrid1.DataContext = ((DataSet)testReturnValue.Obj).Tables[0]; + } + } + + /// 一覧取得（dr） + private void button4_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DR", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGrid1.Columns.Clear(); + this.dataGrid1.DataContext = testReturnValue.Obj; + } + } + + /// 一覧取得（動的sql） + private void button5_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "SelectAll_DSQL", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = ((ComboBoxItem)this.ddlOrderColumn.SelectedItem).Value; + testParameterValue.OrderSequence = ((ComboBoxItem)this.ddlOrderSequence.SelectedItem).Value; + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGrid1.Columns.Clear(); + this.dataGrid1.DataContext = testReturnValue.Obj; + } + } + + /// 参照処理 + /// + /// 非同期フレームワークを使用してB層の呼び出し処理を非同期化 + /// （結果表示にだけ匿名デリゲードを使用するパターン） + /// + private void button6_Click(object sender, RoutedEventArgs e) + { + // 非同期処理クラスを生成 + AsyncFunc af = new AsyncFunc(this); + + // 引数を纏める + TestParameterValue testParameterValue = new TestParameterValue( + this.Name, ((Button)sender).Name, "Select", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + + // 引数を非同期処理クラスに設定 + af.Parameter = testParameterValue; + + // 画面上のデータは退避する（オブジェクトであれば、クローンする。） + af.LogicalName = ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value; + + // 非同期実行するメソッドを指定 + // ここは副スレッドから実行されるので注意。 + af.AsyncFunc = new BaseAsyncFunc.AsyncFuncDelegate(af.btn6_Exec); + + // 結果表示のメソッドを指定（匿名デリゲード） + // このメソッドは必ず主スレッドで実行される。 + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + RcMyCmnFunction.ShowErrorMessageWPF((Exception)retVal, "非同期処理で例外発生！"); + } + else + { + // 正常時 + + // 戻り値（キャスト） + TestReturnValue testReturnValue = (TestReturnValue)retVal; + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.textBox1.Text = testReturnValue.ShipperID.ToString(); + this.textBox2.Text = testReturnValue.CompanyName; + this.textBox3.Text = testReturnValue.Phone; + } + } + }; + + // 非同期実行する。 + if (!af.StartByThreadPool()) + { + MessageBox.Show("別の非同期処理が実行中です。"); + } + } + + #endregion + + #region 更新系 + + /// 追加処理 + private void button7_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Insert", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件追加"; + } + } + + /// 更新処理 + private void button8_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Update", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件更新"; + } + } + + /// 削除処理 + private void button9_Click(object sender, RoutedEventArgs e) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, ((Button)sender).Name, "Delete", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + this.myUserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(textBox1.Text); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Content = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + labelMessage.Content = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + labelMessage.Content += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + labelMessage.Content += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + labelMessage.Content = testReturnValue.Obj.ToString() + "件削除"; + } + } + + #endregion + + #endregion + + #region その他 + + /// クリア + private void button10_Click(object sender, RoutedEventArgs e) + { + this.dataGrid1.Columns.Clear(); + this.dataGrid1.DataContext = null; + } + + /// メッセージ取得（埋め込まれたリソース対応） + private void button11_Click(object sender, RoutedEventArgs e) + { + this.textBox5.Text = GetMessage.GetMessageDescription(this.textBox4.Text); + } + + /// 共有情報取得（埋め込まれたリソース対応） + private void button12_Click(object sender, RoutedEventArgs e) + { + this.textBox7.Text = GetSharedProperty.GetSharedPropertyValue(this.textBox6.Text); + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json new file mode 100644 index 000000000..dcee014fb --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json @@ -0,0 +1,72 @@ +{ + // appSettings section + "appSettings": { + + // フレームワークの使用するパラメータ - start + + // Webサービスの名前解決定義へのパス + + // リソース ファイルの場合 + // In case of using IIS + //"FxXMLTMProtocolDefinition": "TMProtocolDefinition.xml", + // In case of using IIS Express + "FxXMLTMProtocolDefinition": "TMProtocolDefinition2.xml", + "FxXMLTMInProcessDefinition": "TMInProcessDefinition.xml", + + // 埋め込まれたリソースの場合 + // In case of using IIS + //"FxXMLTMProtocolDefinition": "WSClientWPF_sample.TMProtocolDefinition.xml", + // In case of using IIS Express + //"FxXMLTMProtocolDefinition": "WSClientWPF_sample.TMProtocolDefinition2.xml", + //"FxXMLTMInProcessDefinition": "WSClientWPF_sample.TMInProcessDefinition.xml", + + // その他、定義ファイルへのパス + + // リソース ファイルの場合 + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + + // 埋め込まれたリソースの場合 + //"FxXMLMSGDefinition": "WSClientWPF_sample.MSGDefinition.xml", + //"FxXMLSPDefinition": "WSClientWPF_sample.SPDefinition.xml", + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + // "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // 埋め込まれたリソースの場合 + "FxLog4NetConfFile": "WSClientWPF_sample.SampleLogConf2CS.xml", + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "C:/root/files/resource/Sql", + // アプリケーションの使用するパラメータ - end + }, + + // 2層C/S用（Windows） + // connectionStrings section + "connectionStrings": { + // SQL Server / SQL Client用 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + // Multi-DB / ODCB.NET用 + "ConnectionString_ODBC": "Dsn=odbc_test1", + // Oracle / ODP.NET用 + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + // MySQL / MySQL Connector/NET用 + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + // PostgreSQL / Npgsql用 + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs new file mode 100644 index 000000000..8ef1d62c1 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.cs @@ -0,0 +1,73 @@ +namespace WSClientWin2_sample +{ + partial class ByReturn + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.btnStart = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(35, 12); + this.label1.TabIndex = 0; + this.label1.Text = "label1"; + // + // btnStart + // + this.btnStart.Location = new System.Drawing.Point(194, 9); + this.btnStart.Name = "btnStart"; + this.btnStart.Size = new System.Drawing.Size(86, 23); + this.btnStart.TabIndex = 1; + this.btnStart.Text = "開始します"; + this.btnStart.UseVisualStyleBackColor = true; + this.btnStart.Visible = false; + // + // ByReturn + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 37); + this.Controls.Add(this.btnStart); + this.Controls.Add(this.label1); + this.Name = "ByReturn"; + this.Text = "ByReturn"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btnStart; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs new file mode 100644 index 000000000..d55fe759c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.cs @@ -0,0 +1,109 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：ByReturn +//* クラス日本語名 ：初期化画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Business.RichClient.Asynchronous; +using Touryo.Infrastructure.Framework.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Asynchronous; + +namespace WSClientWin2_sample +{ + /// ByReturn + public partial class ByReturn : MyBaseControllerWin + { + /// コンストラクタ + public ByReturn() + { + InitializeComponent(); + + Program.FlagEnd = true; //フラグ初期化 + } + + /// 現在の折り返し処理回数 + private int Current = 1; + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + int wait = 1; + int max = 5; + + MyBaseAsyncFunc af = new MyBaseAsyncFunc(this); + + // 非同期処理本体 + af.AsyncFunc = delegate(object param) + { + for (this.Current = 1; this.Current <= max; this.Current++) + { + // ダミー + System.Threading.Thread.Sleep(wait * 1000); + + // 進捗表示 + af.ExecChangeProgress(string.Format( + "処理中です・・・:{0}/{1}", this.Current.ToString(), max.ToString())); + } + + return "処理が完了しました。"; + }; + + // 進捗報告・無名関数デレゲード + af.ChangeProgress = delegate(object param) + { + this.label1.Text = (string)param; + }; + + // 結果設定・無名関数デレゲード + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + this.label1.Text = (retVal as Exception).ToString(); + } + else + { + this.label1.Text = (string)retVal; + this.btnStart.Visible = true; + } + }; + + if (af.Start()) + { + //正常に実行 + this.label1.Text = string.Format( + "処理中です・・・:{0}/{1}", this.Current.ToString(), max.ToString()); + } + else + { + // ここは通らないが念のため + this.label1.Text = string.Format( + "非同期スレッドが最大数に達しています。:{0}", BaseAsyncFunc.ThreadCount.ToString()); + } + } + + /// 開始 + private void UOC_btnStart_Click(RcFxEventArgs rcFxEventArgs) + { + Program.FlagEnd = false; // フラグ完了 + this.Close(); + } + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs new file mode 100644 index 000000000..86b273a4c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.cs @@ -0,0 +1,83 @@ +namespace WSClientWin2_sample +{ + partial class Form0 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnOpenForm1 = new System.Windows.Forms.Button(); + this.btnClose = new System.Windows.Forms.Button(); + this.btnOpenForm3 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnOpenForm1 + // + this.btnOpenForm1.Location = new System.Drawing.Point(12, 12); + this.btnOpenForm1.Name = "btnOpenForm1"; + this.btnOpenForm1.Size = new System.Drawing.Size(518, 23); + this.btnOpenForm1.TabIndex = 0; + this.btnOpenForm1.Text = "Form1(スレッド制御と画面制御の動作確認サンプル)を開く"; + this.btnOpenForm1.UseVisualStyleBackColor = true; + // + // btnClose + // + this.btnClose.Location = new System.Drawing.Point(12, 70); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(518, 23); + this.btnClose.TabIndex = 2; + this.btnClose.Text = "終了"; + this.btnClose.UseVisualStyleBackColor = true; + // + // btnOpenForm3 + // + this.btnOpenForm3.Location = new System.Drawing.Point(12, 41); + this.btnOpenForm3.Name = "btnOpenForm3"; + this.btnOpenForm3.Size = new System.Drawing.Size(518, 23); + this.btnOpenForm3.TabIndex = 3; + this.btnOpenForm3.Text = "Form3(種々のコントロールのイベント動作サンプル)を開く"; + this.btnOpenForm3.UseVisualStyleBackColor = true; + // + // Form0 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(542, 103); + this.Controls.Add(this.btnOpenForm3); + this.Controls.Add(this.btnClose); + this.Controls.Add(this.btnOpenForm1); + this.Name = "Form0"; + this.Text = "Form0"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button btnOpenForm1; + private System.Windows.Forms.Button btnClose; + private System.Windows.Forms.Button btnOpenForm3; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs new file mode 100644 index 000000000..ec6b1fb9b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.cs @@ -0,0 +1,61 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form0 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace WSClientWin2_sample +{ + /// Form0 + public partial class Form0 : MyBaseControllerWin + { + /// コンストラクタ + public Form0() + { + InitializeComponent(); + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + } + + /// Form1を表示 + private void UOC_btnOpenForm1_Click(RcFxEventArgs rcFxEventArgs) + { + Form f = new Form1(); + f.Show(); + } + + /// Form3を表示 + private void UOC_btnOpenForm3_Click(RcFxEventArgs rcFxEventArgs) + { + Form f = new Form3(); + f.Show(); + } + + /// 自分を閉じる + private void UOC_btnClose_Click(RcFxEventArgs rcFxEventArgs) + { + this.Close(); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs new file mode 100644 index 000000000..c94c0218b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.cs @@ -0,0 +1,299 @@ +namespace WSClientWin2_sample +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnSync = new System.Windows.Forms.Button(); + this.txtStatus = new System.Windows.Forms.TextBox(); + this.btnOpenForm2 = new System.Windows.Forms.Button(); + this.btnButton1 = new System.Windows.Forms.Button(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.btnASync = new System.Windows.Forms.Button(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.label1 = new System.Windows.Forms.Label(); + this.cbxDialog = new System.Windows.Forms.CheckBox(); + this.cbxWindow = new System.Windows.Forms.CheckBox(); + this.cbxClick = new System.Windows.Forms.CheckBox(); + this.cbxDoClick = new System.Windows.Forms.CheckBox(); + this.btnButton2 = new System.Windows.Forms.Button(); + this.btnHdnBtn1 = new Touryo.Infrastructure.Framework.RichClient.Presentation.HiddenButton(); + this.cbxDoClick2 = new System.Windows.Forms.CheckBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.textBox4 = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // btnSync + // + this.btnSync.Location = new System.Drawing.Point(201, 12); + this.btnSync.Name = "btnSync"; + this.btnSync.Size = new System.Drawing.Size(75, 23); + this.btnSync.TabIndex = 5; + this.btnSync.Text = "同期実行"; + this.btnSync.UseVisualStyleBackColor = true; + // + // txtStatus + // + this.txtStatus.Location = new System.Drawing.Point(18, 170); + this.txtStatus.MaxLength = 1000000000; + this.txtStatus.Multiline = true; + this.txtStatus.Name = "txtStatus"; + this.txtStatus.ReadOnly = true; + this.txtStatus.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.txtStatus.Size = new System.Drawing.Size(464, 257); + this.txtStatus.TabIndex = 6; + this.txtStatus.TextChanged += new System.EventHandler(this.txtStatus_TextChanged); + // + // btnOpenForm2 + // + this.btnOpenForm2.Location = new System.Drawing.Point(363, 12); + this.btnOpenForm2.Name = "btnOpenForm2"; + this.btnOpenForm2.Size = new System.Drawing.Size(119, 23); + this.btnOpenForm2.TabIndex = 10; + this.btnOpenForm2.Text = "Form2を開く"; + this.btnOpenForm2.UseVisualStyleBackColor = true; + // + // btnButton1 + // + this.btnButton1.Location = new System.Drawing.Point(19, 41); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.Size = new System.Drawing.Size(256, 23); + this.btnButton1.TabIndex = 11; + this.btnButton1.Text = "メソッドの実装されているボタン"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "テスト（処理中も操作可能１）", + "テスト（処理中も操作可能２）", + "テスト（処理中も操作可能３）", + "テスト（処理中も操作可能４）", + "テスト（処理中も操作可能５）", + "テスト（処理中も操作可能６）", + "テスト（処理中も操作可能７）", + "テスト（処理中も操作可能８）", + "テスト（処理中も操作可能９）"}); + this.comboBox1.Location = new System.Drawing.Point(281, 41); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(201, 20); + this.comboBox1.TabIndex = 12; + // + // btnASync + // + this.btnASync.Location = new System.Drawing.Point(282, 12); + this.btnASync.Name = "btnASync"; + this.btnASync.Size = new System.Drawing.Size(75, 23); + this.btnASync.TabIndex = 13; + this.btnASync.Text = "非同期実行"; + this.btnASync.UseVisualStyleBackColor = true; + // + // numericUpDown1 + // + this.numericUpDown1.Location = new System.Drawing.Point(75, 15); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(120, 19); + this.numericUpDown1.TabIndex = 14; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.TabIndex = 15; + this.label1.Text = "実行時間"; + // + // cbxDialog + // + this.cbxDialog.AutoSize = true; + this.cbxDialog.Location = new System.Drawing.Point(18, 126); + this.cbxDialog.Name = "cbxDialog"; + this.cbxDialog.Size = new System.Drawing.Size(205, 16); + this.cbxDialog.TabIndex = 16; + this.cbxDialog.Text = "(2) 結果表示でダイアログを表示する。"; + this.cbxDialog.UseVisualStyleBackColor = true; + // + // cbxWindow + // + this.cbxWindow.AutoSize = true; + this.cbxWindow.Location = new System.Drawing.Point(18, 104); + this.cbxWindow.Name = "cbxWindow"; + this.cbxWindow.Size = new System.Drawing.Size(203, 16); + this.cbxWindow.TabIndex = 17; + this.cbxWindow.Text = "(1) 結果表示でウィンドウを表示する。"; + this.cbxWindow.UseVisualStyleBackColor = true; + // + // cbxClick + // + this.cbxClick.AutoSize = true; + this.cbxClick.Location = new System.Drawing.Point(233, 104); + this.cbxClick.Name = "cbxClick"; + this.cbxClick.Size = new System.Drawing.Size(230, 16); + this.cbxClick.TabIndex = 18; + this.cbxClick.Text = "(3) 結果表示でClickイベントを発生させる。"; + this.cbxClick.UseVisualStyleBackColor = true; + // + // cbxDoClick + // + this.cbxDoClick.AutoSize = true; + this.cbxDoClick.Location = new System.Drawing.Point(233, 126); + this.cbxDoClick.Name = "cbxDoClick"; + this.cbxDoClick.Size = new System.Drawing.Size(254, 16); + this.cbxDoClick.TabIndex = 19; + this.cbxDoClick.Text = "(4) 結果表示でDoClickでイベントを発生させる。"; + this.cbxDoClick.UseVisualStyleBackColor = true; + // + // btnButton2 + // + this.btnButton2.Location = new System.Drawing.Point(19, 70); + this.btnButton2.Name = "btnButton2"; + this.btnButton2.Size = new System.Drawing.Size(256, 23); + this.btnButton2.TabIndex = 20; + this.btnButton2.Text = "メソッドの実装されていないボタン"; + this.btnButton2.UseVisualStyleBackColor = true; + // + // btnHdnBtn1 + // + this.btnHdnBtn1.Location = new System.Drawing.Point(282, 70); + this.btnHdnBtn1.Name = "btnHdnBtn1"; + this.btnHdnBtn1.Size = new System.Drawing.Size(200, 23); + this.btnHdnBtn1.TabIndex = 21; + this.btnHdnBtn1.Text = "hiddenButton1"; + this.btnHdnBtn1.UseVisualStyleBackColor = true; + this.btnHdnBtn1.Visible = false; + // + // cbxDoClick2 + // + this.cbxDoClick2.AutoSize = true; + this.cbxDoClick2.Location = new System.Drawing.Point(18, 148); + this.cbxDoClick2.Name = "cbxDoClick2"; + this.cbxDoClick2.Size = new System.Drawing.Size(458, 16); + this.cbxDoClick2.TabIndex = 22; + this.cbxDoClick2.Text = "(5) 結果表示でDoClickでイベントを発生させ、そのイベント内で更に非同期呼び出しを行う。"; + this.cbxDoClick2.UseVisualStyleBackColor = true; + // + // panel1 + // + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.cbxDoClick2); + this.panel1.Controls.Add(this.btnSync); + this.panel1.Controls.Add(this.btnHdnBtn1); + this.panel1.Controls.Add(this.txtStatus); + this.panel1.Controls.Add(this.btnButton2); + this.panel1.Controls.Add(this.btnOpenForm2); + this.panel1.Controls.Add(this.cbxDoClick); + this.panel1.Controls.Add(this.btnButton1); + this.panel1.Controls.Add(this.cbxClick); + this.panel1.Controls.Add(this.comboBox1); + this.panel1.Controls.Add(this.cbxWindow); + this.panel1.Controls.Add(this.btnASync); + this.panel1.Controls.Add(this.cbxDialog); + this.panel1.Controls.Add(this.numericUpDown1); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(499, 441); + this.panel1.TabIndex = 23; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 459); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(119, 19); + this.textBox1.TabIndex = 24; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(137, 459); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(119, 19); + this.textBox2.TabIndex = 25; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(267, 459); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(119, 19); + this.textBox3.TabIndex = 26; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(392, 459); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(119, 19); + this.textBox4.TabIndex = 27; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(521, 494); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.panel1); + this.Name = "Form1"; + this.Text = "Form1"; + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnSync; + private System.Windows.Forms.TextBox txtStatus; + private System.Windows.Forms.Button btnOpenForm2; + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Button btnASync; + private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.CheckBox cbxDialog; + private System.Windows.Forms.CheckBox cbxWindow; + private System.Windows.Forms.CheckBox cbxClick; + private System.Windows.Forms.CheckBox cbxDoClick; + private System.Windows.Forms.Button btnButton2; + private Touryo.Infrastructure.Framework.RichClient.Presentation.HiddenButton btnHdnBtn1; + private System.Windows.Forms.CheckBox cbxDoClick2; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox4; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs new file mode 100644 index 000000000..4b464703e --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.cs @@ -0,0 +1,280 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Diagnostics; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Business.RichClient.Asynchronous; +using Touryo.Infrastructure.Framework.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Asynchronous; + +namespace WSClientWin2_sample +{ + /// Form1 + public partial class Form1 : MyBaseControllerWin + { + /// コンストラクタ + public Form1() + { + InitializeComponent(); + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + this.numericUpDown1.Value = 5; + this.comboBox1.SelectedIndex = 0; + } + + /// 同期実行 + protected void UOC_btnSync_Click(RcFxEventArgs rcFxEventArgs) + { + int wait = (int)this.numericUpDown1.Value; + + this.AddStatus(string.Format("主スレッド実行中: {0}秒待つ", wait)); + + Thread.Sleep(wait * 1000); + + this.AddStatus("スレッド実行終了"); + + // 結果表示のテスト + this.TestOfResultDisplay(); + } + + /// 非同期実行 + private void UOC_btnASync_Click(RcFxEventArgs rcFxEventArgs) + { + int wait = (int)this.numericUpDown1.Value; + + MyBaseAsyncFunc af = new MyBaseAsyncFunc(this); + //MyBaseAsyncFunc af = new MyBaseAsyncFunc(this.panel1); + + // 非同期処理本体・無名関数デレゲード + af.AsyncFunc = delegate(object param) + { + // 進捗報告 + af.ExecChangeProgress(string.Format("スレッド実行中: {0}秒待つ", wait)); + + System.Threading.Thread.Sleep(wait * 1000); + + return "終わり"; + }; + + // 進捗報告・無名関数デレゲード + af.ChangeProgress = delegate(object param) + { + string text = (string)param; + this.AddStatus(text); + }; + + // 結果設定・無名関数デレゲード + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + Exception ex = (Exception)retVal; + this.AddStatus(string.Format("スレッド実行終了: エラー発生:{0}", ex.Message)); + } + else + { + this.AddStatus("スレッド実行終了"); + //throw new Exception("SetResultでエラーとなった場合。"); + } + + // 結果表示のテスト + this.TestOfResultDisplay(); + + // フォーカス制御をする場合、 + this.BeginInvoke(new MethodInvoker(this.SetForcus)); + + }; + + // 非同期処理を開始させる。 + if (af.Start()) + { + this.AddStatus(string.Format( + "キューイングされました、現在のスレッド数:{0}", + BaseAsyncFunc.ThreadCount.ToString())); + } + else + { + this.AddStatus(string.Format( + "非同期スレッドが最大数に達しています。:{0}", + BaseAsyncFunc.ThreadCount.ToString())); + } + } + + /// フォーカス制御のメソッド + private void SetForcus() + { + if (this.Enabled) + { + this.textBox3.Focus(); + } + else + { + // Form.Enabled=falseの場合、再キューイング + this.BeginInvoke(new MethodInvoker(this.SetForcus)); + } + } + + /// テキストボックスに書き込み + /// 追加するテキスト + private void AddStatus(string text) + { + this.txtStatus.Text = + string.Format("{0}{1}\r\n", this.txtStatus.Text, text); + } + + /// 結果表示のテスト + private void TestOfResultDisplay() + { + if (cbxWindow.Checked) + { + // ダイアログの表示 + Form2 f = new Form2(); + f.Show(); + return; + } + else if (cbxDialog.Checked) + { + // フォームの表示 + Form2 f = new Form2(); + f.ShowDialog(); + return; + } + else if (cbxClick.Checked) + { + // PerformClickは動作しない。 + this.btnButton1.PerformClick(); + return; + } + else if (cbxDoClick.Checked || cbxDoClick2.Checked) + { + // DoClickは動作する。 + this.btnHdnBtn1.DoClick(); + return; + } + } + + /// 画面起動 + protected void UOC_btnOpenForm2_Click(RcFxEventArgs rcFxEventArgs) + { + if (MyBaseControllerWin.GetWindowsCount(typeof(Form2)) > 3) + { + MessageBox.Show("５画面以上は起動できません。"); + } + else + { + Form2 f = new Form2(); + f.Show(); + + //// イベント二重登録対策のテスト + //f.ShowDialog(); + //f.Hide(); + //f.ShowDialog(); + //// ココで、Form2のイベントが2回実行される。 + //f.Hide(); + } + } + + /// メソッド実装あり + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + MessageBox.Show("UOC_btnButton1_Click"); + } + + /// 隠しボタンのイベント実装 + protected void UOC_btnHdnBtn1_Click(RcFxEventArgs rcFxEventArgs) + { + MessageBox.Show("UOC_btnHdnBtn1_Click"); + + if (cbxDoClick2.Checked && txtStatus.Text.Length < 500) + { + //// 反転 + //cbxDoClick2.Checked = !cbxDoClick2.Checked; + + int wait = (int)this.numericUpDown1.Value; + + //MyBaseAsyncFunc af = new MyBaseAsyncFunc(this); + MyBaseAsyncFunc af = new MyBaseAsyncFunc(this.panel1); + + // 非同期処理本体・無名関数デレゲード + af.AsyncFunc = delegate(object param) + { + // 進捗報告 + af.ExecChangeProgress(string.Format("スレッド実行中: {0}秒待つ", wait)); + + System.Threading.Thread.Sleep(wait * 1000); + + return "終わり"; + }; + + // 進捗報告・無名関数デレゲード + af.ChangeProgress = delegate(object param) + { + string text = (string)param; + this.AddStatus(text); + }; + + // 結果設定・無名関数デレゲード + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + Exception ex = (Exception)retVal; + this.AddStatus(string.Format("スレッド実行終了: エラー発生:{0}", ex.Message)); + } + else + { + this.AddStatus("スレッド実行終了"); + } + + // 結果表示のテスト + this.TestOfResultDisplay(); + }; + + // 非同期処理を開始させる。 + if (af.Start()) + { + this.AddStatus(string.Format( + "キューイングされました、現在のスレッド数:{0}", + BaseAsyncFunc.ThreadCount.ToString())); + } + else + { + this.AddStatus(string.Format( + "非同期スレッドが最大数に達しています。:{0}", + BaseAsyncFunc.ThreadCount.ToString())); + } + } + } + + /// SetResultで動作するか確認する。 + private void txtStatus_TextChanged(object sender, EventArgs e) + { + Debug.WriteLine("txtStatus_TextChanged"); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs new file mode 100644 index 000000000..cfd56fd20 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.cs @@ -0,0 +1,106 @@ +namespace WSClientWin2_sample +{ + partial class Form2 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnClose = new System.Windows.Forms.Button(); + this.txtStatus = new System.Windows.Forms.TextBox(); + this.txtGuid = new System.Windows.Forms.TextBox(); + this.btnFormList = new System.Windows.Forms.Button(); + this.btnFormCount = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnClose + // + this.btnClose.Location = new System.Drawing.Point(318, 12); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(78, 52); + this.btnClose.TabIndex = 0; + this.btnClose.Text = "閉じる"; + this.btnClose.UseVisualStyleBackColor = true; + // + // txtStatus + // + this.txtStatus.Location = new System.Drawing.Point(12, 70); + this.txtStatus.Name = "txtStatus"; + this.txtStatus.ReadOnly = true; + this.txtStatus.Size = new System.Drawing.Size(384, 19); + this.txtStatus.TabIndex = 1; + // + // txtGuid + // + this.txtGuid.Location = new System.Drawing.Point(12, 95); + this.txtGuid.Name = "txtGuid"; + this.txtGuid.ReadOnly = true; + this.txtGuid.Size = new System.Drawing.Size(384, 19); + this.txtGuid.TabIndex = 2; + // + // btnFormList + // + this.btnFormList.Location = new System.Drawing.Point(12, 12); + this.btnFormList.Name = "btnFormList"; + this.btnFormList.Size = new System.Drawing.Size(300, 23); + this.btnFormList.TabIndex = 3; + this.btnFormList.Text = "Formを識別するIDをリストする。"; + this.btnFormList.UseVisualStyleBackColor = true; + // + // btnFormCount + // + this.btnFormCount.Location = new System.Drawing.Point(12, 41); + this.btnFormCount.Name = "btnFormCount"; + this.btnFormCount.Size = new System.Drawing.Size(300, 23); + this.btnFormCount.TabIndex = 4; + this.btnFormCount.Text = "全Formインスタンス数を表示する。"; + this.btnFormCount.UseVisualStyleBackColor = true; + // + // Form2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(408, 126); + this.Controls.Add(this.btnFormCount); + this.Controls.Add(this.btnFormList); + this.Controls.Add(this.txtGuid); + this.Controls.Add(this.txtStatus); + this.Controls.Add(this.btnClose); + this.Name = "Form2"; + this.Text = "Form2"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnClose; + private System.Windows.Forms.TextBox txtStatus; + private System.Windows.Forms.TextBox txtGuid; + private System.Windows.Forms.Button btnFormList; + private System.Windows.Forms.Button btnFormCount; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs new file mode 100644 index 000000000..33f935677 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.cs @@ -0,0 +1,90 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form2 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace WSClientWin2_sample +{ + /// Form2 + public partial class Form2 : MyBaseControllerWin + { + /// テストのため画面を識別するID + public string ID = ""; + + /// コンストラクタ + public Form2() + { + InitializeComponent(); + + // テストのため画面を識別するIDを付与する。 + this.ID = Guid.NewGuid().ToString(); + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + //base.UOC_FormInit(); + + // 画面数とIDを画面に表示する。 + this.txtStatus.Text = string.Format("現在 {0}枚目の表示", + MyBaseControllerWin.GetWindowsCount(this.GetType())); + + this.txtGuid.Text = string.Format("画面を識別するID:{0}", this.ID); + } + + /// Formを識別するIDをリストする + protected void UOC_btnFormList_Click(RcFxEventArgs rcFxEventArgs) + { + string temp = ""; + + // 当該Formインスタンスリストを取得する。 + List
fl = + MyBaseControllerWin.GetWindowInstances(this.GetType()); + + // 表示する文字列を作成する。 + foreach (Form2 f2 in fl) + { + temp += "・" + f2.ID +"\r\n"; + } + + // メッセージボックスにリストする。 + MessageBox.Show(temp, "Form2のID一覧", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + /// 全Formインスタンス数を表示する + protected void UOC_btnFormCount_Click(RcFxEventArgs rcFxEventArgs) + { + // メッセージボックスに表示する。 + MessageBox.Show(BaseControllerWin.GetWindowsCount().ToString(), + "全Formインスタンス数", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + /// 自分を閉じる + protected void UOC_btnClose_Click(RcFxEventArgs rcFxEventArgs) + { + this.Close(); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs new file mode 100644 index 000000000..3ddd2d43a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.cs @@ -0,0 +1,473 @@ +namespace WSClientWin2_sample +{ + partial class Form3 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form3)); + this.btnButton1 = new System.Windows.Forms.Button(); + this.cbxCheckBox1 = new System.Windows.Forms.CheckBox(); + this.cbbComboBox1 = new System.Windows.Forms.ComboBox(); + this.lbxListBox1 = new System.Windows.Forms.ListBox(); + this.pbxPictureBox1 = new System.Windows.Forms.PictureBox(); + this.rbnRadioButton1 = new System.Windows.Forms.RadioButton(); + this.rbnRadioButton2 = new System.Windows.Forms.RadioButton(); + this.pbxPictureBox2 = new System.Windows.Forms.PictureBox(); + this.lbxListBox2 = new System.Windows.Forms.ListBox(); + this.cbbComboBox2 = new System.Windows.Forms.ComboBox(); + this.cbxCheckBox2 = new System.Windows.Forms.CheckBox(); + this.btnButton2 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.btnUCRemove = new System.Windows.Forms.Button(); + this.btnUCAdd = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.userControl31 = new WSClientWin2_sample.UserControl3(); + this.label3 = new System.Windows.Forms.Label(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.tsmiItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiItem21ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiItem22ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiItem221ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiItem222ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiItem3 = new System.Windows.Forms.ToolStripMenuItem(); + this.btnElse1 = new System.Windows.Forms.Button(); + this.btnElse2 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pbxPictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbxPictureBox2)).BeginInit(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.contextMenuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // btnButton1 + // + this.btnButton1.Location = new System.Drawing.Point(33, 67); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.Size = new System.Drawing.Size(75, 23); + this.btnButton1.TabIndex = 0; + this.btnButton1.Text = "button1"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // cbxCheckBox1 + // + this.cbxCheckBox1.AutoSize = true; + this.cbxCheckBox1.Location = new System.Drawing.Point(33, 176); + this.cbxCheckBox1.Name = "cbxCheckBox1"; + this.cbxCheckBox1.Size = new System.Drawing.Size(80, 16); + this.cbxCheckBox1.TabIndex = 1; + this.cbxCheckBox1.Text = "checkBox1"; + this.cbxCheckBox1.UseVisualStyleBackColor = true; + // + // cbbComboBox1 + // + this.cbbComboBox1.FormattingEnabled = true; + this.cbbComboBox1.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.cbbComboBox1.Location = new System.Drawing.Point(33, 198); + this.cbbComboBox1.Name = "cbbComboBox1"; + this.cbbComboBox1.Size = new System.Drawing.Size(80, 20); + this.cbbComboBox1.TabIndex = 2; + // + // lbxListBox1 + // + this.lbxListBox1.FormattingEnabled = true; + this.lbxListBox1.ItemHeight = 12; + this.lbxListBox1.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.lbxListBox1.Location = new System.Drawing.Point(33, 224); + this.lbxListBox1.Name = "lbxListBox1"; + this.lbxListBox1.Size = new System.Drawing.Size(80, 40); + this.lbxListBox1.TabIndex = 3; + // + // pbxPictureBox1 + // + this.pbxPictureBox1.ErrorImage = null; + this.pbxPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pbxPictureBox1.Image"))); + this.pbxPictureBox1.Location = new System.Drawing.Point(33, 103); + this.pbxPictureBox1.Name = "pbxPictureBox1"; + this.pbxPictureBox1.Size = new System.Drawing.Size(75, 45); + this.pbxPictureBox1.TabIndex = 4; + this.pbxPictureBox1.TabStop = false; + // + // rbnRadioButton1 + // + this.rbnRadioButton1.AutoSize = true; + this.rbnRadioButton1.Location = new System.Drawing.Point(33, 154); + this.rbnRadioButton1.Name = "rbnRadioButton1"; + this.rbnRadioButton1.Size = new System.Drawing.Size(88, 16); + this.rbnRadioButton1.TabIndex = 5; + this.rbnRadioButton1.TabStop = true; + this.rbnRadioButton1.Text = "radioButton1"; + this.rbnRadioButton1.UseVisualStyleBackColor = true; + // + // rbnRadioButton2 + // + this.rbnRadioButton2.AutoSize = true; + this.rbnRadioButton2.Location = new System.Drawing.Point(131, 154); + this.rbnRadioButton2.Name = "rbnRadioButton2"; + this.rbnRadioButton2.Size = new System.Drawing.Size(88, 16); + this.rbnRadioButton2.TabIndex = 11; + this.rbnRadioButton2.TabStop = true; + this.rbnRadioButton2.Text = "radioButton2"; + this.rbnRadioButton2.UseVisualStyleBackColor = true; + // + // pbxPictureBox2 + // + this.pbxPictureBox2.ErrorImage = null; + this.pbxPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pbxPictureBox2.Image"))); + this.pbxPictureBox2.Location = new System.Drawing.Point(131, 103); + this.pbxPictureBox2.Name = "pbxPictureBox2"; + this.pbxPictureBox2.Size = new System.Drawing.Size(75, 45); + this.pbxPictureBox2.TabIndex = 10; + this.pbxPictureBox2.TabStop = false; + // + // lbxListBox2 + // + this.lbxListBox2.FormattingEnabled = true; + this.lbxListBox2.ItemHeight = 12; + this.lbxListBox2.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.lbxListBox2.Location = new System.Drawing.Point(131, 224); + this.lbxListBox2.Name = "lbxListBox2"; + this.lbxListBox2.Size = new System.Drawing.Size(80, 40); + this.lbxListBox2.TabIndex = 9; + // + // cbbComboBox2 + // + this.cbbComboBox2.FormattingEnabled = true; + this.cbbComboBox2.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.cbbComboBox2.Location = new System.Drawing.Point(131, 198); + this.cbbComboBox2.Name = "cbbComboBox2"; + this.cbbComboBox2.Size = new System.Drawing.Size(80, 20); + this.cbbComboBox2.TabIndex = 8; + // + // cbxCheckBox2 + // + this.cbxCheckBox2.AutoSize = true; + this.cbxCheckBox2.Location = new System.Drawing.Point(131, 176); + this.cbxCheckBox2.Name = "cbxCheckBox2"; + this.cbxCheckBox2.Size = new System.Drawing.Size(80, 16); + this.cbxCheckBox2.TabIndex = 7; + this.cbxCheckBox2.Text = "checkBox2"; + this.cbxCheckBox2.UseVisualStyleBackColor = true; + // + // btnButton2 + // + this.btnButton2.Location = new System.Drawing.Point(131, 67); + this.btnButton2.Name = "btnButton2"; + this.btnButton2.Size = new System.Drawing.Size(75, 23); + this.btnButton2.TabIndex = 6; + this.btnButton2.Text = "button2"; + this.btnButton2.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(31, 36); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(56, 12); + this.label1.TabIndex = 13; + this.label1.Text = "メソッドあり"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(129, 36); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 14; + this.label2.Text = "メソッドなし"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.groupBox5); + this.groupBox1.Controls.Add(this.btnUCRemove); + this.groupBox1.Controls.Add(this.btnUCAdd); + this.groupBox1.Controls.Add(this.groupBox4); + this.groupBox1.Controls.Add(this.groupBox3); + this.groupBox1.Controls.Add(this.groupBox2); + this.groupBox1.Location = new System.Drawing.Point(264, 10); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(685, 342); + this.groupBox1.TabIndex = 15; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "ここは、ユーザコントロール"; + // + // groupBox5 + // + this.groupBox5.Location = new System.Drawing.Point(500, 99); + this.groupBox5.Margin = new System.Windows.Forms.Padding(2); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Padding = new System.Windows.Forms.Padding(2); + this.groupBox5.Size = new System.Drawing.Size(172, 62); + this.groupBox5.TabIndex = 4; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "userControlParent-Child2"; + this.groupBox5.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.groupBox_ControlAdded); + this.groupBox5.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.groupBox_ControlRemoved); + // + // btnUCRemove + // + this.btnUCRemove.Location = new System.Drawing.Point(575, 300); + this.btnUCRemove.Name = "btnUCRemove"; + this.btnUCRemove.Size = new System.Drawing.Size(91, 23); + this.btnUCRemove.TabIndex = 5; + this.btnUCRemove.Text = "btnUCRemove"; + this.btnUCRemove.UseVisualStyleBackColor = true; + // + // btnUCAdd + // + this.btnUCAdd.Location = new System.Drawing.Point(494, 300); + this.btnUCAdd.Name = "btnUCAdd"; + this.btnUCAdd.Size = new System.Drawing.Size(75, 23); + this.btnUCAdd.TabIndex = 4; + this.btnUCAdd.Text = "btnUCAdd"; + this.btnUCAdd.UseVisualStyleBackColor = true; + // + // groupBox4 + // + this.groupBox4.Location = new System.Drawing.Point(500, 33); + this.groupBox4.Margin = new System.Windows.Forms.Padding(2); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Padding = new System.Windows.Forms.Padding(2); + this.groupBox4.Size = new System.Drawing.Size(172, 62); + this.groupBox4.TabIndex = 3; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "userControlParent-Child1"; + this.groupBox4.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.groupBox_ControlAdded); + this.groupBox4.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.groupBox_ControlRemoved); + // + // groupBox3 + // + this.groupBox3.Location = new System.Drawing.Point(263, 33); + this.groupBox3.Margin = new System.Windows.Forms.Padding(2); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Padding = new System.Windows.Forms.Padding(2); + this.groupBox3.Size = new System.Drawing.Size(226, 290); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "userControl32"; + this.groupBox3.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.groupBox_ControlAdded); + this.groupBox3.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.groupBox_ControlRemoved); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.userControl31); + this.groupBox2.Location = new System.Drawing.Point(19, 33); + this.groupBox2.Margin = new System.Windows.Forms.Padding(2); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Padding = new System.Windows.Forms.Padding(2); + this.groupBox2.Size = new System.Drawing.Size(226, 290); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "userControl31"; + // + // userControl31 + // + this.userControl31.Location = new System.Drawing.Point(6, 18); + this.userControl31.Margin = new System.Windows.Forms.Padding(4); + this.userControl31.Name = "userControl31"; + this.userControl31.Size = new System.Drawing.Size(212, 264); + this.userControl31.TabIndex = 0; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(307, 356); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(214, 12); + this.label3.TabIndex = 16; + this.label3.Text = "このFormはKeyPreviewをTrueにしています。"; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsmiItem1, + this.tsmiItem2, + this.tsmiItem3}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(126, 70); + // + // tsmiItem1 + // + this.tsmiItem1.Name = "tsmiItem1"; + this.tsmiItem1.Size = new System.Drawing.Size(125, 22); + this.tsmiItem1.Text = "tsmiItem1"; + // + // tsmiItem2 + // + this.tsmiItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsmiItem21ToolStripMenuItem, + this.tsmiItem22ToolStripMenuItem}); + this.tsmiItem2.Name = "tsmiItem2"; + this.tsmiItem2.Size = new System.Drawing.Size(125, 22); + this.tsmiItem2.Text = "tsmiItem2"; + // + // tsmiItem21ToolStripMenuItem + // + this.tsmiItem21ToolStripMenuItem.Name = "tsmiItem21ToolStripMenuItem"; + this.tsmiItem21ToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.tsmiItem21ToolStripMenuItem.Text = "tsmiItem21"; + // + // tsmiItem22ToolStripMenuItem + // + this.tsmiItem22ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsmiItem221ToolStripMenuItem, + this.tsmiItem222ToolStripMenuItem}); + this.tsmiItem22ToolStripMenuItem.Name = "tsmiItem22ToolStripMenuItem"; + this.tsmiItem22ToolStripMenuItem.Size = new System.Drawing.Size(131, 22); + this.tsmiItem22ToolStripMenuItem.Text = "tsmiItem22"; + // + // tsmiItem221ToolStripMenuItem + // + this.tsmiItem221ToolStripMenuItem.Name = "tsmiItem221ToolStripMenuItem"; + this.tsmiItem221ToolStripMenuItem.Size = new System.Drawing.Size(137, 22); + this.tsmiItem221ToolStripMenuItem.Text = "tsmiItem221"; + // + // tsmiItem222ToolStripMenuItem + // + this.tsmiItem222ToolStripMenuItem.Name = "tsmiItem222ToolStripMenuItem"; + this.tsmiItem222ToolStripMenuItem.Size = new System.Drawing.Size(137, 22); + this.tsmiItem222ToolStripMenuItem.Text = "tsmiItem222"; + // + // tsmiItem3 + // + this.tsmiItem3.Name = "tsmiItem3"; + this.tsmiItem3.Size = new System.Drawing.Size(125, 22); + this.tsmiItem3.Text = "tsmiItem3"; + // + // btnElse1 + // + this.btnElse1.Location = new System.Drawing.Point(12, 286); + this.btnElse1.Name = "btnElse1"; + this.btnElse1.Size = new System.Drawing.Size(236, 32); + this.btnElse1.TabIndex = 17; + this.btnElse1.Text = "いろいろテスト1"; + this.btnElse1.UseVisualStyleBackColor = true; + // + // btnElse2 + // + this.btnElse2.Location = new System.Drawing.Point(12, 324); + this.btnElse2.Name = "btnElse2"; + this.btnElse2.Size = new System.Drawing.Size(236, 32); + this.btnElse2.TabIndex = 18; + this.btnElse2.Text = "いろいろテスト2"; + this.btnElse2.UseVisualStyleBackColor = true; + // + // Form3 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(959, 377); + this.Controls.Add(this.btnElse2); + this.Controls.Add(this.btnElse1); + this.Controls.Add(this.label1); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.label2); + this.Controls.Add(this.label3); + this.Controls.Add(this.btnButton1); + this.Controls.Add(this.rbnRadioButton2); + this.Controls.Add(this.pbxPictureBox2); + this.Controls.Add(this.lbxListBox2); + this.Controls.Add(this.cbbComboBox2); + this.Controls.Add(this.cbxCheckBox2); + this.Controls.Add(this.btnButton2); + this.Controls.Add(this.rbnRadioButton1); + this.Controls.Add(this.pbxPictureBox1); + this.Controls.Add(this.lbxListBox1); + this.Controls.Add(this.cbbComboBox1); + this.Controls.Add(this.cbxCheckBox1); + this.KeyPreview = true; + this.Name = "Form3"; + this.Text = "Form3"; + ((System.ComponentModel.ISupportInitialize)(this.pbxPictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbxPictureBox2)).EndInit(); + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.CheckBox cbxCheckBox1; + private System.Windows.Forms.ComboBox cbbComboBox1; + private System.Windows.Forms.ListBox lbxListBox1; + private System.Windows.Forms.PictureBox pbxPictureBox1; + private System.Windows.Forms.RadioButton rbnRadioButton1; + private System.Windows.Forms.RadioButton rbnRadioButton2; + private System.Windows.Forms.PictureBox pbxPictureBox2; + private System.Windows.Forms.ListBox lbxListBox2; + private System.Windows.Forms.ComboBox cbbComboBox2; + private System.Windows.Forms.CheckBox cbxCheckBox2; + private System.Windows.Forms.Button btnButton2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.GroupBox groupBox1; + private UserControl3 userControl31; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem tsmiItem1; + private System.Windows.Forms.ToolStripMenuItem tsmiItem2; + private System.Windows.Forms.ToolStripMenuItem tsmiItem3; + private System.Windows.Forms.Button btnElse1; + private System.Windows.Forms.Button btnElse2; + private System.Windows.Forms.ToolStripMenuItem tsmiItem21ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tsmiItem22ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tsmiItem221ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tsmiItem222ToolStripMenuItem; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.Button btnUCRemove; + private System.Windows.Forms.Button btnUCAdd; + private System.Windows.Forms.GroupBox groupBox5; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs new file mode 100644 index 000000000..0dfde877a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.cs @@ -0,0 +1,600 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form3 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Diagnostics; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Business.RichClient.Util; +using Touryo.Infrastructure.Framework.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Util; + +namespace WSClientWin2_sample +{ + public partial class Form3 : MyBaseControllerWin + { + /// コンストラクタ + public Form3() + { + InitializeComponent(); + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + // 表示する。 + this.ContextMenuStrip = this.contextMenuStrip1; + + // ここで設定する。 + this.contextMenuStrip1.Items[0].Click += new EventHandler(this.Item_Click); + this.contextMenuStrip1.Items[1].Click += new EventHandler(this.Item_Click); + this.contextMenuStrip1.Items[2].Click += new EventHandler(this.Item_Click); + + this.tsmiItem21ToolStripMenuItem.Click += new EventHandler(this.Item_Click); + this.tsmiItem22ToolStripMenuItem.Click += new EventHandler(this.Item_Click); + this.tsmiItem221ToolStripMenuItem.Click += new EventHandler(this.Item_Click); + this.tsmiItem222ToolStripMenuItem.Click += new EventHandler(this.Item_Click); + } + + #region Ctrlイベント + + /// UOC_btnButton1_Click + /// RcFxEventArgs + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_btnButton1_Click"); + } + + /// UOC_pbxPictureBox1_Click + /// RcFxEventArgs + protected void UOC_pbxPictureBox1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_pbxPictureBox1_Click"); + } + + /// UOC_rbnRadioButton1_CheckedChanged + /// RcFxEventArgs + protected void UOC_rbnRadioButton1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_rbnRadioButton1_CheckedChanged"); + } + + /// UOC_cbxCheckBox1_CheckedChanged + /// RcFxEventArgs + protected void UOC_cbxCheckBox1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_cbxCheckBox1_CheckedChanged"); + } + + /// UOC_cbbComboBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_cbbComboBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_cbbComboBox1_SelectedIndexChanged"); + } + + /// UOC_lbxListBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_lbxListBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_lbxListBox1_SelectedIndexChanged"); + } + + /// UOC_tsmiItem1_Click + /// RcFxEventArgs + protected void UOC_tsmiItem1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem1_Click"); + } + + /// UOC_tsmiItem2_Click + /// RcFxEventArgs + protected void UOC_tsmiItem2_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem2_Click"); + } + + /// UOC_tsmiItem21_Click + /// RcFxEventArgs + protected void UOC_tsmiItem21_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem21_Click"); + } + + /// UOC_tsmiItem22_Click + /// RcFxEventArgs + protected void UOC_tsmiItem22_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem22_Click"); + } + + /// UOC_tsmiItem221_Click + /// RcFxEventArgs + protected void UOC_tsmiItem221_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem221_Click"); + } + + /// UOC_tsmiItem222_Click + /// RcFxEventArgs + protected void UOC_tsmiItem222_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem222_Click"); + } + + /// UOC_tsmiItem3_Click + /// RcFxEventArgs + protected void UOC_tsmiItem3_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_tsmiItem3_Click"); + } + + /// テスト１ + protected void UOC_btnElse1_Click(RcFxEventArgs rcFxEventArgs) + { + // newだけした場合・・・ + Form f = new Form2(); + + MessageBox.Show("画面総数:" + BaseControllerWin.GetWindowsCount().ToString() + + ", Form2総数:" + BaseControllerWin.GetWindowsCount(typeof(Form2)).ToString()); + } + + /// テスト２ + protected void UOC_btnElse2_Click(RcFxEventArgs rcFxEventArgs) + { + //throw new Exception("てすと"); + + Thread th = new Thread(new ThreadStart(this.ThMe)); + th.Start(); + } + + /// バックグラウンド・スレッド + private void ThMe() + { + throw new Exception("てすと"); + } + + #endregion + + #region Formイベント + // プロジェクト独自 + + /// UOC_Form_Enter_KeyDown + /// RcFxEventArgs + protected void UOC_Form_Enter_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_Enter_KeyDown"); + } + + /// UOC_Form_F1_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F1_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F1_KeyDown"); + } + + /// UOC_Form_F2_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F2_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F2_KeyDown"); + } + + /// UOC_Form_F3_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F3_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F3_KeyDown"); + } + + /// UOC_Form_F4_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F4_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F4_KeyDown"); + } + + /// UOC_Form_F5_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F5_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F5_KeyDown"); + } + + /// UOC_Form_F6_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F6_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F6_KeyDown"); + } + + /// UOC_Form_F7_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F7_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F7_KeyDown"); + } + + /// UOC_Form_F8_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F8_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F8_KeyDown"); + } + + /// UOC_Form_F9_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F9_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F9_KeyDown"); + } + + /// UOC_Form_F10_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F10_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F10_KeyDown"); + } + + /// UOC_Form_F11_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F11_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F11_KeyDown"); + } + + /// UOC_Form_F12_KeyDown + /// RcFxEventArgs + protected void UOC_Form_F12_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_F12_KeyDown"); + } + + /// UOC_Form_AltAndF4_KeyDown + /// RcFxEventArgs + protected void UOC_Form_AltAndF4_KeyDown(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_AltAndF4_KeyDown"); + } + + /// UOC_Form_Closing + /// RcFxEventArgs + protected void UOC_Form_Closing(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_Form_Closing"); + } + + #endregion + + #region 未解放イベント + + // ログが出過ぎるので + + ///// UOC_Form_KeyDown + ///// RcFxEventArgs + //protected void UOC_Form_KeyDown(RcFxEventArgs rcFxEventArgs) + //{ + // Debug.WriteLine("UOC_Form_KeyDown"); + //} + + ///// UOC_Form_KeyPress + ///// RcFxEventArgs + //protected void UOC_Form_KeyPress(RcFxEventArgs rcFxEventArgs) + //{ + // Debug.WriteLine("UOC_Form_KeyPress"); + //} + + ///// UOC_Form_KeyUp + ///// RcFxEventArgs + //protected void UOC_Form_KeyUp(RcFxEventArgs rcFxEventArgs) + //{ + // Debug.WriteLine("UOC_Form_KeyUp"); + //} + + #endregion + + #region UserControlイベント + + // UserControlよりFormに実装されたメソッドが優先される。 + // ※ ボタン名は一意である必要がある（イベントを識別できなくなる）。 + + // #region UserControlイベント ～ #endregionをコメント・アウトすると、 + // User Control上のイベント・ハンドラが呼び出される。 + + #region userControl3 + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl3_btnUCButton1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl3_btnUCButton1_Click"); + } + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl3_pbxUCPictureBox1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl3_pbxUCPictureBox1_Click"); + } + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl3_rbnUCRadioButton1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl3_rbnUCRadioButton1_CheckedChanged"); + } + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl3_cbxUCCheckBox1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl3_cbxUCCheckBox1_CheckedChanged"); + } + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl3_cbbUCComboBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl3_cbbUCComboBox1_SelectedIndexChanged"); + } + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl3_lbxUCListBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl3_lbxUCListBox1_SelectedIndexChanged"); + } + + #endregion + + #region userControl31 + + /// UOC_userControl31_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl31_btnUCButton1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl31_btnUCButton1_Click"); + } + + /// UOC_userControl31_pbxUCPictureBox1_Click + /// RcFxEventArgs + protected void UOC_userControl31_pbxUCPictureBox1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl31_pbxUCPictureBox1_Click"); + } + + /// UOC_userControl31_rbnUCRadioButton1_CheckedChanged + /// RcFxEventArgs + protected void UOC_userControl31_rbnUCRadioButton1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl31_rbnUCRadioButton1_CheckedChanged"); + } + + /// UOC_userControl31_cbxUCCheckBox1_CheckedChanged + /// RcFxEventArgs + protected void UOC_userControl31_cbxUCCheckBox1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl31_cbxUCCheckBox1_CheckedChanged"); + } + + /// UOC_userControl31_cbbUCComboBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_userControl31_cbbUCComboBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl31_cbbUCComboBox1_SelectedIndexChanged"); + } + + /// UOC_userControl31_lbxUCListBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_userControl31_lbxUCListBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl31_lbxUCListBox1_SelectedIndexChanged"); + } + + #endregion + + #region userControl32 + + /// UOC_userControl32_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_userControl32_btnUCButton1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl32_btnUCButton1_Click"); + } + + /// UOC_userControl32_pbxUCPictureBox1_Click + /// RcFxEventArgs + protected void UOC_userControl32_pbxUCPictureBox1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl32_pbxUCPictureBox1_Click"); + } + + /// UOC_userControl32_rbnUCRadioButton1_CheckedChanged + /// RcFxEventArgs + protected void UOC_userControl32_rbnUCRadioButton1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl32_rbnUCRadioButton1_CheckedChanged"); + } + + /// UOC_userControl32_cbxUCCheckBox1_CheckedChanged + /// RcFxEventArgs + protected void UOC_userControl32_cbxUCCheckBox1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl32_cbxUCCheckBox1_CheckedChanged"); + } + + /// UOC_userControl32_cbbUCComboBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_userControl32_cbbUCComboBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl32_cbbUCComboBox1_SelectedIndexChanged"); + } + + /// UOC_userControl32_lbxUCListBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_userControl32_lbxUCListBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_userControl32_lbxUCListBox1_SelectedIndexChanged"); + } + + #endregion + + #region userControlChild + + ///// UOC_userControlChild_btnUCButton1_Click + ///// RcFxEventArgs + //protected void UOC_userControlChild_btnUCButton1_Click(RcFxEventArgs rcFxEventArgs) + //{ + // Debug.WriteLine("UOC_userControlChild_btnUCButton1_Click"); + //} + + #endregion + + #endregion + + #region UserControlの動的な追加/削除 + + /// UOC_btnUCAdd_Click + /// RcFxEventArgs + protected void UOC_btnUCAdd_Click(RcFxEventArgs rcFxEventArgs) + { + // userControl32の動的ロード + UserControl3 userControl32 = new UserControl3(); + userControl32.Location = new System.Drawing.Point(8, 23); + userControl32.Margin = new Padding(5); + userControl32.Name = "userControl32"; + userControl32.Size = new System.Drawing.Size(283, 330); + userControl32.TabIndex = 0; + this.groupBox3.Controls.Add(userControl32); + + + // userControlParentの動的ロード + UserControlParent userControlParent = null; + + userControlParent = new UserControlParent(); + userControlParent.Location = new System.Drawing.Point(5, 17); + userControlParent.Name = "userControlParent1"; + userControlParent.Size = new System.Drawing.Size(160, 40); + userControlParent.TabIndex = 0; + this.groupBox4.Controls.Add(userControlParent); + + userControlParent = new UserControlParent(); + userControlParent.Location = new System.Drawing.Point(5, 17); + userControlParent.Name = "userControlParent2"; + userControlParent.Size = new System.Drawing.Size(160, 40); + userControlParent.TabIndex = 0; + this.groupBox5.Controls.Add(userControlParent); + } + + /// UOC_btnUCRemove_Click + /// RcFxEventArgs + protected void UOC_btnUCRemove_Click(RcFxEventArgs rcFxEventArgs) + { + this.groupBox3.Controls.RemoveByKey("userControl32"); + this.groupBox4.Controls.RemoveByKey("userControlParent1"); + this.groupBox5.Controls.RemoveByKey("userControlParent2"); + } + + /// MethodInvoker + /// Type + /// T + delegate void MethodInvoker(T obj); + + /// 動的に追加したコントロールをLstUserControlに追加する + /// object + /// ControlEventArgs + private void groupBox_ControlAdded(object sender, ControlEventArgs e) + { + // UOC_イベントハンドラ内で追加/削除すると例外が発生するのでBeginInvokeで書く。 + this.BeginInvoke( + (MethodInvoker)((x) => + { + // UserControlの追加処理 + if (x is UserControl) + { + // コントロール検索＆イベントハンドラ設定（ルートから１回だけ行う） + RcFxCmnFunction.GetCtrlAndSetClickEventHandler2( + x, this.CreatePrefixAndEvtHndHt(), this.ControlHt); // Base + RcMyCmnFunction.GetCtrlAndSetClickEventHandler2( + x, this.MyCreatePrefixAndEvtHndHt(), this.ControlHt); // MyBase + + // UserControlのLstUserControlへの追加（は再帰的に行う） + this.AddToLstUserControl(x); + } + }), + new object[] { e.Control }); + } + + /// AddToLstUserControl + /// Control + private void AddToLstUserControl(Control c) + { + // UserControlの追加 + if (c is UserControl) + { + this.LstUserControl.Add((UserControl)c); + } + + // 再帰検索 + foreach (Control _c in c.Controls) + { + this.AddToLstUserControl(_c); + } + } + + /// 動的に追加したコントロールをLstUserControlから削除する + /// object + /// ControlEventArgs + private void groupBox_ControlRemoved(object sender, ControlEventArgs e) + { + // UOC_イベントハンドラ内で追加/削除すると例外が発生するのでBeginInvokeで書く。 + this.BeginInvoke( + (MethodInvoker) ((x) => + { + // UserControlのLstUserControlからの削除（は再帰的に行う） + if (x is UserControl) + { + this.RemoveFromLstUserControl(x); + } + }), + new object[] { e.Control }); + } + + /// RemoveFromLstUserControl + /// Control + private void RemoveFromLstUserControl(Control c) + { + // UserControlの削除 + if (c is UserControl) + { + this.LstUserControl.Remove((UserControl)c); + } + + // 再帰検索 + foreach (Control _c in c.Controls) + { + this.RemoveFromLstUserControl(_c); + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx new file mode 100644 index 000000000..2d404e16c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx @@ -0,0 +1,1040 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + /9j/4AAQSkZJRgABAgEBLAEsAAD/7gAOQWRvYmUAZAAAAAAB/+EASkV4aWYAAE1NACoAAAAIAAMBGgAF + AAAAAQAAADIBGwAFAAAAAQAAADoBKAADAAAAAQACAAAAAAAAASwAAAABAAABLAAAAAEAAP/bAEMADAgI + CAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM + DP/bAEMBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwM + DAwMDAwMDAwMDP/AABEIAlgDIAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJ + Cgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKC + CQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImK + kpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T1 + 9vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncA + AQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RF + RkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1 + tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTc0Zpu + 4Um7861scnMPzRmmZFLmiwcw7NGabmjNFg5h2aM03NGaVg5h3NGabmjNOwcw7NGabmjNKwXHZozTc0Zo + sHMOzRmkzRmgdx2aM03NGaLC5h2aKbmjNFguOzRmm5ozRYdx2aM03NGaLBcdmjNJmigdxaM0maM0WDmH + ZpM0maM0WDmFzRSZozQFxaM0lJmgLjs0ZpuaM0WDmHUZpM0ZosFxc0ZpuaXIosHMOzRTc0ZosFx2aM03 + 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 + KKbCJIh/KhumBz60UUdCeo126Ainbcrx1oooH0VhCPl96YaKKQ0Oj/8A106TnpRRT6CfxCIvQn/IqTI7 + 9aKKaFLcjY8j+VAwf60UUdR9Bw54pCCMiiimIOc5o7ZoooAXn6U3ndj9KKKARJjOBSMMMQP0oooEJjAp + o6cdKKKBocPu/U0inBOKKKA7iv60IPlxjmiigOgEfJnFC8j3oooDp8xV5GDxmmZx+VFFALqPTsPzpq8H + H4UUUB3F6MR6d6XqQaKKBDSMNx3NPPFFFAPoMY4x705TRRQPof/Z + + + + + /9j/4AAQSkZJRgABAgEBLAEsAAD/7gAOQWRvYmUAZAAAAAAB/+EASkV4aWYAAE1NACoAAAAIAAMBGgAF + AAAAAQAAADIBGwAFAAAAAQAAADoBKAADAAAAAQACAAAAAAAAASwAAAABAAABLAAAAAEAAP/bAEMADAgI + CAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM + DP/bAEMBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwM + DAwMDAwMDAwMDP/AABEIAlgDIAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJ + Cgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKC + CQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImK + kpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T1 + 9vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncA + AQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RF + RkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1 + tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTc0Zpu + 4Um7861scnMPzRmmZFLmiwcw7NGabmjNFg5h2aM03NGaVg5h3NGabmjNOwcw7NGabmjNKwXHZozTc0Zo + sHMOzRmkzRmgdx2aM03NGaLC5h2aKbmjNFguOzRmm5ozRYdx2aM03NGaLBcdmjNJmigdxaM0maM0WDmH + ZpM0maM0WDmFzRSZozQFxaM0lJmgLjs0ZpuaM0WDmHUZpM0ZosFxc0ZpuaXIosHMOzRTc0ZosFx2aM03 + NGaQ7jqM03NGaAuOozTc0ZoC47NGabmloC4uaM03NGaAuOzRmm5ozQFx2aSkzRTC47NGabRQFx2aM03N + GaAuOzRmkzSZpBcdmjNJRmgLi0ZptGaAuOzRmm5ozQFx1FNzS5oC4uaM0maM0BcWjNNzS5oC4tGabmlz + QO4tGaTNGaAuLRmkzRmgLi5ozSZpM0WFcXNGaTNIW696dhcw7NGaiaRwOF5PQVDsnY5LY9qpR7uxEqtt + k2W80ZqoIZQfv/jUkYYdWJ96HFd7iVVveLRPmjNMGR3o3c1Ni+YfmjJpuaM0WC47dRupuaTNFg5h+6jN + MzRmiwcw/NGaZmjNFg5x+aM0zNGaLD5yPNGTTSTQDV2Mbjs80Zpuf/10posK4uTn+VGaTNGf0osFxc0u + 7tTc0ZosFx2aM03rRn8qLBcdu5o3UyjPFFh3H7qN3FR5oB5osFyTd+VLu4qPdwKATRYLkm6jdTM8YozR + YLj91G6mZ/GjNFguPzRuplGT2osFx+6jdTM0AmiwXJM0bqjzzRmlYOYk3UbqZ3oJzRYfMPzRupmc0f5O + aLBcfmjcKZQc0WDmH7qN1Mz+FHNFg5mP3Ubv0qMmiiwcxJuo3VH045oosHMyTdRuqPPH1oosHMyTdRuq + P8aCfxosHMyQNRuqPNGTRYOYk3CjdUefSjdRyhzEm6l3VCW6etG49qOUOYm3CjdUO6jdRyhzk26k31Fu + o3d+1PlFzku4UbhUW40m7FHKPnJt4o31CGo3GjlDnJtwo3iod2DxSBj+fSjlFzk++jcOlQ76A3ejlHzk + 2+jfUO73/Ggt2o5Q5ybfRuqHdRu60coc5NuFG6od5NJv/wAmjlFzk+6jdUO40bzRyj5ybdRu5qHf6cel + G80coc5PuFG6oN5pN5HFHKHOWN1G7tVfdS7jRyhzk+6kLgd6g3E0UcoucmMyDvSeenrUWB+FAxT5ULnl + 5E3moB1o85R3qE4pe9LlQc8iTzlzTTMSDt/M03j/ABpOPw9KdkHNLuPEp70vmqf8ajGMUoxRZBzMf5i9 + KXzM9qjzS0WQ+Zj94o3jNMzRnrSsF2P3GjdTM0v+c0WC47NLk0zOaM0WHcduFLmmZoz/AIUWC4/NJnnm + m5oJosFxwNLmmZH4UZNFguPJozTc0CiwXIs88UA/pUfmLR5gq+Uy513JSRRux+NR+YtG4fnRYOZdyTPr + RnpTN4oDr/8AWosHMu4/PftRnnmmFwD1o3joaLBzIkzSbsU3cKQMPWiwcw/NGaZuFG78aLD5h4PP1o60 + zdS5osFx3WlzTNwoB/OlYLjxiim7vejcKLDuO/Sl6U3dkUm7nrRYLjs0Z/Cm7scUu4UWC4ueaOKbkUbs + UWC47P4ClzTAR9KXIosFx3ajPNN3ZHNANKwXHZ5pdwpmR/8AWoyKLBcfSZppIH+FKCOhosFx2RRmmZoD + DqaLBcdmjim55oyPX8KLBcdxx3ozTcj1pM4osFx+aM0zcKXdzxTsFxxNBamZoJzxRYLjieKCaaDSZHfm + iwXH5HHH4UZFMzk0E9xzRYLj85pDSZpM5osFx2aM9qTNJmiwXHZpOopDxQD/AProELQDTevAozx60wuO + zRTcijNADqOh49MU3NGfXrRYBxo7c0mcUlADvWj9aaWoziiwC8Yo7AUmeOKOfpQAtGfak9aDQAufWikz + Rk9qLALmjOKTNJnmgBxNJ2/lSZ60fjTsIdk0meaTjuOKOAKBi+v86UGkNHU/40gHZ/Kjd2ptGT/SiwD8 + 0BvypuaP0osA7NGetNzjjtQD7UrDHD/9VHFNz6UBqLAPz/hQT/n2pu6jdj8aLBcdkYzR/Om5/Ojd2osO + 47vRmm5o3YosFx/vR2FNyKTPrzRYB39aU8Gm5/8Ar0butFgHZpOhpAaNw60WGOJOPekBpN3Q5o3UWAdm + lBBpmcUZpWC5VIFAHGOlO9qBW1zlsJgZoxTsUn0pXCwnp7UZ4pccUY/IUBYQUUY5oNAWDtRS0cZoCwh9 + RS9v50lH9aBjs0ZpKP8AJoAXccUpbtTcUv8AKgYuT0FJnqKT8etFADsn8u9ISf8ACgnmjn/61ILsUMe9 + GTSfqKO3HegLsdu6UmTnGaSjPUigLi7u+aN1IKMc0BcduOOtG6m5o/lRYLscGP4UbqbnvS0WC7F3UBuc + mm9aXv8AzosF2Lu9KMk03PYdDS8UWC7F3nr3oDHFJ1pO+O3egLsXOR7Ubjiij/OaB6hvNG40nejFGgtR + d1G454ptLRYeou9s0m8+lFJx+NMLsXe1G+k4pelFgu+4u71o35pvrml7f1pWC7Hbx+FAfmmfyozmiwcz + H7qN3rTOR9aT3osHMSbgaAR+NM/GjJ5osPmY8UbuKj3fnS7jRYOYfkZ9cd6M0zJzSZosHMSdaCwz71Hk + /wCNLnn/AAp2DmH/AM6M0zNG706deaVg5h+eOKXI/Kowx6ZxS7vTmiwcw7PPNGe1N3HFGewosFx2R689 + aXOfrUe7pSk96LDuOo4pobFGc0WC47I60Z560zPqKOPpRYLj88etGeaZx06UcUWC4/PrRmm4FHFFguOz + 3oJ496bx17UvoBRYLjs+9BJx1powDRjmiwXHE/lRn1ptAFILjsignik6UnNA7js579aMnNNz680Z55os + Fx2TRn9aZk0ufwp2C47NJnmm570ZosFx5NG7mmZNBPHFFguOyaN3XpTc96M4osFx2fzo3c00mkzRYLj9 + 2KN/rTCfrRmiwXH7/wAKUNUefzoz6UWDmDdSZzQfajP/AOumZC8etBIpO1H0NAXFzk/ypMj86KSmAuaX + 2/Km9P5Uc8UBcdmj8aaKP85oC47PtmjtxSZ6+1HNAC9PpRxSUZ70gFzj8aOKQf8A66KAF9KM8fSk+nNK + CKAA0dqOPxooAXNGf1pKOP8A69AB1/Clyc+ntSUe3rQAe5o7UY7UnegBRR70dRRkfhQAZ5ozRkUgP40B + cXJpQcn0pv8A+qjOTRYLjs0fjzTevWjP60WC47OKKTPOPXvQDQO4vvRmkz60UWFcXPFIe3P/AOqk+vNG + elA7i5oz2pPqaM+hoC4v+RRSZpCaLBccCaO9NzRmnYVx2RRTaWgLi5o479aSjP5ikO4p/wAmjNJRyadh + XDjqOPejOKM9qTpj+VA7i9qD/Kkz+HtQOtAXFzQKTtRn/wDXQFxTRj2pCTSmgLi0U3J/Gg/lQF0LS46Z + pM+1FAaBR/OjIozigNBcUcUmRRzQF0L+FHH4Um78qTNA7oWgD/61JmgGgLoUfpR9KQml70BoFH0ozRkd + O1AaByKXOOPWkzRnP9aAuKTRnv3puaXPtSsFxcj9aM/pSZoyKLDuOzzQDTcijP8A9aiwXFyaDSbvwoz7 + 0WAXOaKT8eaCaADNFGeOKO9MAoJ45pCTRQAvajPeko4oAU0ZyaSg4H4UALnp6Gik4ooAX+lGaT9PSj2o + AU9aT/OKDSA0EC5x+NFJRn0oELmjJ+lJmigBTRSZ9KCf5UALRnmk96M0ALkUZ4pCaOPyosAuce9GaSjP + FADs5xmjPc9abnNGT0osAvHel4603mgUAOHPSj9cU3NBPvRYB2aKTJFGaLALn1opPp9aOv8AWgBT060Z + pDRk0AKTRnFJ7flSE0AOz+FJkUmaP8igBcj/AOtRx+dJnmj+dADhRnrTetKM0ALmjPFNzj3oyRRYBxbF + Gf8AIpMnp6Uh4oAcTSd8mkzQTmnYBc//AKqKTntRz2oAXrzR/KkB5pPb1oGLS9fekB9aM0AL/KgkdKTN + G4fnSEKfrij9TSZNHvQAUUf5xRxTAX3NHTnvSZ70Aj/69ABnPf6Uue1JntSZzQA7+lJRnmkz75oAdz60 + Umf/AK1JnNAC570e/TvSZwaM/jQA7mkpM0ZoAdmkzQOtGaADmgH0pKCaADPNFHf3pPf9aAFBopOaKAHZ + HU0DrTenFGaAHZNJnNGaTJoAXNFJR0oAXJ/+tRn/ABpO1FMBc0Z55pDRmgLi0Z49qbS0rBcXJozSUdqB + 3F+tGeaQ0Z7YpgOzxxSZpM0UguLk0H60gNH60ALz/wDWozSUZFMBcmkzmjvR06UALnFLmm0maLBcdk4o + B/KkzRmkFxSeeKTPFB68UlOxNx1Jmk+tGf8A9VFguOye9JSZ/Skz/wDrosFx+aM/nTe9BI/GiwXFzRmm + 8ml7/wAqLBcXNGcUme9GeOtFguKDRmkGKM0WC47NH9KbRnmiwXHe9FNzgUtKwXFzS5puf/r0Z5wKLBcX + J/ClJH+FNyKPagdx1IfzpOlKTQFxRR0OfypOMcUZoFcXikpM9KX+VAB0o96T9KCfSgB3FIPXvSA8UZ9K + AuOGfr6UfhTc0vpQMX/OKO9JmgUCF/yKP6UlJ3oGO6e/vScYzSZNGaAF7Ud6T+dJ9KYDjRyOaTJzRzj6 + 0gFpKKKYC/T8qT2oo/CkAtHH4UmaKAF/lSUUDpTAP6UZo7fypKAHZ96QUZz9aPpQAZozSdKXNAB24pRS + daOKAA4/ClpM0e1AC0UcY+lJnn0pAKMUUmaXJoAKQ9qPwoyKYATSdaPr3pTQAUHrSe3p0pe9ABnvR9KM + 0fpQAfSk5oz+tLQAlGKOwxS0AH40nal96T2xQAcflRS9vxpKACjp7UH3oOaADj8aKM/pR6+9ABn3o7fy + pOxozTAXvRSUUgFJ/wAmikznmigBaM80n9KBTADmlpBRQAv0oNFHFIAzQT+dApO/86YAT+FIDTCx6ikD + dQadjPmRLSZ5pu8H2pc+lFh3F9aMmk/nRn9aAFz6UZ5pM0ueaQXAnilpM0Z4H8qAFzSUntR9fwoC47+f + ej3pKM0AKKKTNGcUDF5FFJ70ZFAXHZ4o+lNzml69KAuL9KOtJ3o5oC4ooz/+ukzR1pBcWjPT3pM/pRnv + QFx1FNzRn86LBcXPFGeaT0PaigLij3/CjNN5opgOJo70maM9qAuLkUZpKP8AIpALnIo5pM/jR2pgKMUf + zpKCeaAF6mikH5UUBcXOMUuf1pM0n9KQ7i9R9aXp0ptHf+tMB30oz702j9aVhXFyKM0g6UUDHfypM5pO + /H40ucE8/jQAUe1IfzozTAO/PSjmjtRQAtJmiigBe1FJ9e1HTpQAuaM9PWkz3/OjNAC5yaCT+VIMYoz+ + VAC9RRmkyelJ60WAXI/Kl9qb/Sl60ALxn60maTPvxRQA7PtRz0zSdPxoBoAWgmk+lH86AFoyKTpRQAua + MnikHtQfbrSAX3/OjpR/k0n1oAXPvQKSigBaKSjNMA7UfSkyBQf1oAXtSCij+dAC8/jQaTNGeKADtS5p + KM0ALR3pPejB6UAL39KM0maQYoAcTmjNJmigBe1FJnmj6UBchPNBOaDSd/8AGtDEXIHWlBPam8dqKQXH + 7/Wl3Lz1qOiiw+ZkgZTwKdmos9/Tk0Z7jvSsHMSFgB1oyOOai5pc0WDmJC6j3ppdqbSU7C5mO3NQHb86 + b6/pS0WC7Hhz0P6Ubx7mo6O2KLD5mP3tSbj+PpTRSg0WFcfvPHpShwTxxUeaM0WHzMmoJqHI7Uu49zSs + PmJc0UzeaN4pWHzIf39KDTdw680m8daLBcfkc+lGabuBpdw7HmiwXF60Z/H3pOtGe/pQAZ/KjrSbhQXF + FguOz3pM0m5cYzRkf/qosO47/JoNJSZoAXJpaaKXNAC96D0pKSgB1HH1FJR39qAFo4pBgUhYUBcU5xS8 + dulM3YFKGGfeiwXHUp46U0GjPakFx2f/ANVJ70nNFAXFzRmkyB3pMjpTAdzRnvSA8UfyNAXFz+tHv0pv + 6UUDFzSg/nTf5UUCHZFGfem0dqAuOzRmm0ZosMdmgmm5FHaiwXHUmaPek5zQA7Pp9KQdaSl/WgBfbv6U + g/WkoGelAXHZ4opPr1ozxQAvWikBopAKKXmm54ozQA7NJ7Un+c0Z5oAdkUmaTPajOaAuLkd6KTNGeeaY + C8f4UdfrSZ9KBzQAtJR+NHagBaSjr9KPWgAyf8aKSj/IoAXP4CjP/wBejJpM8daAF9KAaT/IooAXOaO1 + JmjjFACjNGaQUc/jQFxcg0ZpM0Z60WAiIwaQGkPP+NJ2wa0sYjj060e1IaCf/rUCuOHYUe9Nyc0ZpWGL + jvil9+1JnjNJnBoAdSdOKKOvagBRR/Wkz6frR3/nQAuKPak5FL0oAPr+VHP0pOfwo470AHT8KPxo5x60 + ZoAPWjgUnQ5/ClpgA6e1Boo/T1pALkijJB9qQfXmjvQA7I/+vRnNNNLQMXNGaTIooAXNBOaT/OaKAuLR + QODRntQAUUf5FJ7UAO3Gjeabn2/OlNKwXY4OaN1NpOlFh3Y/JPPWjPFN4oz+VFguOH8qM0mefpRnjmgB + e9FITmigBaOKTmigA/GlyfWko68n8qAuLuNJn8aKQUALkdvxoz/9akooAXNH86SjtQAuTRuNJRmgLi5P + SjJx1pPrRQFxcnv0pQ3rxTcjHtR0oC7H5FBP0z3phPNH05osPmJKKjBx+NLuPTNKwXHk0n+RTdxzRuNF + h3H80c0zcfWk/rRYLj+KKZnNGeKdhcw/+YpfxqPJ9aMmlYdyToaOmBUeTS7j0osHMPBopgf2pdwosFx2 + c0Z4zTeozSj8qBi0Umfzo7cc0AFLSUc9O1AC/rRn0/KkyKPSgBc5FGeKb0pc0ALSZpOelLQAE+tGRiko + zQAuePegfrSZo/pQApORmjOKbmiiwDgfeim+9HegBc9KMjHH50n0oFMBf85oyAP60lFICE4pc0h6+tJ9 + K0MR30/CjNN5paAF7etGaTOO/NGeaAFPSlpoNGf/ANVADgeM0maTPpS0gFyKM88dabxwKXPp+NAXHZo/ + GmA96XOOlFgFzRn86TP40EigBaM0nHfpR1oGLmiko9aAF5oPr3ozR+lABz1z9aXPfvSUntQA7pR/kUlH + egBc+lA9KTn8qO9AC8mjjFJkUf0oAWik/Cg/rQAufypc03P5UE570gFzSg8U3pR/kU7AOBz1/Cik70Uh + i0UmfxpfWgBaTij2FFAC5o68D6UmehNFACk0ZpOBzRzQAtHWkz+VICaLAO/yKTp/WjOaO31oAX+VJRnN + Gc0ALnp3FGaT3ozQAvtSeuaQ/nS55oGLmjvxTaWgA/zil5FNFFAC59aOKTNFAC5oo70lAC//AK6P5UmT + 9aX1oAXNJSfSjjFACg0UZ7UnegBevTrQaTvS0AFHbNH0o60AGaPajjpSA80ALn3x7UoJ+tJ70lAD9xzR + uA/GmfXpR9aLDuyTcDRmo/al/lSsFx3Sl60zJz7Ubj+FFguPzxxRnjr0pm7PWjdx/Oiw7jqOlJmjdz6U + WC4uaM0m7NJnj3osA7P6UmaOPpSZoAdmjNJx3pOPwoAdnFJmkzSj9aYBn1ozzxR1pM88fnQA7NGeKbS5 + /SkBCcZpO4pT156+tJ34rQxFz+dFIaDQAtJzmjnHFKetAB2ozxSD1ooAXGKTPFFH+RQAvNA/Oko60DFy + Pzpab/nFKOBSELnNH19KQn0pM0DFGM9aBxSZ/WjPrTAcDxRSZANGRSAdnrRTc96UGiwB2z60vbikznmj + J/8Ar0ALS0xnVQS3SoWuT0UY5601FvYV0ixRkdyMetUmkduSfpTcnqetV7PzFzlpriMcdaQ3Q7LVbPXn + ijdVezQuZln7UnoQKDdKP4c1WJJpN3pR7NBzssG6b+6Me9DXTdlA+vNV+9GafJHsLmZN9ok7nFPS6PRg + Pwqtz+dA9utHIuw+Z9y+kiN0PPpS7lzjIJ71Qzn/ABoyc+vep9n5j5/I0P50d+KpLNIo4b86kF0QOVya + l02PnRZz2pQahS4jYc8H3qQMCNykEe1S01uirroLmikJA7ijep6EZ+tKwC5pc4/+vSZ55o4xQAtGeP5U + g5GaPb8aADPvSk4+lJRQMXPP9aSignv60AGeM0Z596TPPFFAC5/wpc5NN5H0o+tFgHA9fekJH0FAzRmg + AyKM/lQPrRQAuaKbS0WAM8ZNKDSUfhQAuaM00E9OtHINAC+1B9qO3WkoAXrzR7UelHWgBQaPwpD1o6fS + gBc+lAPeko60AL/OkFGT2ooGA+lLSUlAC9vWj8aKM0ALnmjNIDRQAvH1pOtH0ozjmgAo/lR/OjtQAe1G + aDQBQAc0UlKf84oAX8aTJ/OiigLi7qXrTf596SiwXH0nX6Umaa0yIMuQPqaLMdx/9KMiqkmoxgYjBY+p + 4FQHUJmGAAuOverVGb6W9SXUiutzTzSE1li+uRnJB+oqzDqCOQso2E9COlDoyXn6AqkWTnjNJmgntSf0 + pEC9eKDwOTSZ45o478UCFBpO+c80xpkBz1PtTfPGehquV9guibmjPr+FReevfIpRNH60uV9guiT6UcUw + SIedwxShlPfNFh3F9+1L3zSZx+NHT/GkAdKXPp26GkHWjPXv6UAFGfwzRijP696YC+3Sj3pPfrRwBSAO + 9A44pplQd6Y1wABj5qai30FdE31pGYKOT+FV2nfGBwfWo2djyTye5qlB9Qcidp1z8vI9aYbhz0IWos0n + 1q1BE8zHFievJ70nFIPyoOPzp2ELmgmkx/8AqpaADNAxyDScmj3oABS0ho/nTAOp57Ufh9fSjg5o70CD + t79qM+31oz/+oUZ5oGHp60oxjH6UmaM0AGTn3ozig0nYYoAdRn8PSk7Y60d6QDtw9aAc/Wm/5IoosBIs + 0i9G/wD1VKLs/wAQ/Liq4/I0egpOKfQak0XkuI36HHrmn5zWd3zShmAwCQP61DpdmUpmgKXIrPWaQYOf + z96lS7b+IcCk6b9R86LWffBo/lUazxvjnGfWngg4x07VFmiri0UmaXOaADP/ANekOKO9Gf8A9dAxelJ7 + 0ZOKB0xQIXtSE0dvrRmgYuaTIoGMUdBz0HJoAP5GlqF7iJerD0wKja9jHCgmqUJPoLmXctZNGaqG+GPu + ENj8KYb2TjgYpqlLsLnj3Luf/wBVL3qgb2UnsKd9ufsB75o9lIOdF3ijgcnpVD7ZNnjH0prXMzggtge1 + P2UvIXOi+zoo+YgUx7mFOrZPYCs5m3HLEn60mR6dKpUV1YnUfQvG/QZ+UmmHUDghU/Wqe78u1G6q9lHs + LnZaa9mJyMDHagX0o6harZGaO2DT9nHsLml3Ly3sfGVIz1qVLiB+jDniszOaXv8ASpdGPmhqo+prcdP5 + 0p5rMjuZEPXco7GrKXyN94Ffccis5UpLzLU0/Itf0oFRpLG4+VwcU/j/ADzUWKD+lLmk5pjyxocMQO4o + tcB9GfSoBeRZwenrTHvoxnYCfftVKEuwuZdy1xR7/pVJtQOMKnOeDmmNfTZ4wPwpqlPsLniaAPNFZovp + wckjHpR9vmBOcY5OKfsZeQvaI0u9IWAGTj8eKzGv5zwCF+lRNK7D5mLY6Z5pqhLq7A6i6Go91Cn8Wc8c + c1XfUDn5F/OqG40bjWioxW+pLqMsSXc7nGcA9hUJJPU803NJmtFFLZWJbbHZoyOlN96KdhDs96AcdfrT + c0uaLAWCzgnBIxT0uJF5J3D3qJuvWk6H1rOya1C5ObliCCdtIW3HJOc1D0/rRnnNHKugXJsn+lBNRhz9 + aduBpWAdn86MjtzSUUAL/SjPvij9aPx6UgHh2B6nNL58nrn61Fk0fTmjlXYd2S+fJ7c09bgdG/HuKr/z + o4//AFUuVdh3ZbaZMcHNRm4OeKg69aOtJQQczJDKxHXjOaaWJ6k800k9D+dHFVZCuLmimlh2o3H+lOwC + 9/elzTd3OccGk3c80WAd396KTIo4xQIXmj+tHP40d6BhnNBooBoEJil6CkHpR9aAF5/KgUZPpRQAd6MU + n44pST+FAxKWk4o60CF4HtntSdOv0o/nS/zoGBoz680ho7UAA4o9fzozn8KM0AL9OvagAYpM+nWjPU0A + KDx/KjPpRn86KAE5ApeDScdKM/nQAuT/APWopOOuKMigAJ9alimZOP4fSo8gng8Um5cYz9KTV9LDTLqT + o/HT0zUnvjBrNLLg44p3nspGGPtUOl2KU+5oc0dOtUPtb+pPvTWuJGzzkHtR7KQ+dGhvXuwHc0CSMnhh + WX5jUm5uBT9j5i5/I02niUZZh+HNQteKB8o+mapZYijJFUqS66ic2Ttdyn2+lMaaVhjcSOpqIn0o+tWo + JdCeZ9xx9aOnFMz/APXop2EPLYpC/b8qbkfSkosMduzz2oLGm0v1GadhDiTikPXrR+PSkz/9Y0ALRQfX + 0oBBHHPvQAZ5x+VBz602ORZASpyAcH8Kj+0xiN37x549aLPsBNmiqpvkLqq9CpZj6EDNV01NggBG5uuf + xqlCQ9TS/wA4ozj+tZb6i7Km04bcc/TotI1+374d2+6f0p+zYWNQvjGe5wPrTRcRFiAeQcfiBurIF5Jm + LP3Y8fjiozNJklSQSS35/LT9kFjWlv4Y0Yrgt2AqJNVlCMQ20ZUBfqPmrLyfXk0hJx14p+zj2uOxtnUx + ujQsfmGWOeBxUa6nEztvOADwfXnisjnv+FFHso9gsbMd9G1uZXwCCVI96mSdHG5TwQP1rnwTj27U5ZH2 + 4DYB60OmgsbpnQqWHO3OfwojlWRAynhuRWGJHAZAflb71OS4kQqAT8pyBR7MVjb5orMXUn8t93L5Gz86 + YNQmAznJz07AUuRhZmt7Unf+lZ41E+WwP385X0xViO7Roy2eRwAfYUuVoVrFjP6UtR+am4DPX3oSaNxw + eemPcUrMB+aKTIzj2zQcUAGfWlNNz2/GjPbtQA6k9qQkAAk9elMaZVl2MQPl3ZosBbP/ANekyKRupGaK + iwC9P6UZ5/rSfQ0Z9aLAO4I+tGTTc/hRniiwh4bHSnBs9ajH6UZ49aVhkoOf8KXOKiyB0o3UrASfr60t + RhvTmgv26etFgHlgOvWkLgfSmZ7UZosA7cTQCT3pvNGfxzTsAuaXJzxTc0UWAdkdaM03+npRnmiwDify + pT1pueKM8UWAXIpfxpue1A6CiwDsk0bvx96bmgYNKwDg2D60bh0puaDRYB+eaP6UzOPagN60WAef1oJ7 + UgIIz3ozigBc+lA//WKbmgk0WAdkUhNNzR/nNFgHZPY9aQbgTQMc/wA6O1AAR70fWjOeKM80AHOKM9zS + ZoyKYxf5dKXPH9aZnvRu/Ciwh5Pek3AdaYSe9GaLAO3GjefyptHQ0WAdv9KaTR/+uj8adgCjOKOPwpKA + FzxSdaMdzS+lAB0FAxSe4/GgnrQAtJ7j86ODQaACkNB6Uf55pgHvRxjNH86Q4oAOaKM0fTt2pgHej0pp + dUwSQAfy4qKe68sxbSCHP6dKLNgT0veqkt75ayEEEg4UfTG6oE1FvM+b7h5z7U1BsLF/zY9m8nCjv9Di + kaeNSFzzgn8utYzzs/HYEn86R5nfGT0BA/E5q/Z+Y7GkdRQoGxgkkEegAqjBdyQvkEkEYwagJ4oz3qlF + IdiWO4dFZFPDHNM3lhjPHNM6dKOmKYxQxHOcYoz3ptLwAPamADP5Uo9fWjPHHHrRnFIBcdM0DAGf0pCa + P50AJxk0uTikUZ4J696UYCmgAYcAfjRzjFIeoP6UE4OKAD2pM9aXPek55NAB2/WjnH0NBPGf0o+lMAzi + lJH50nOfWl6UgDOfrigMcYzgc8UY59qBjHSgB4lfHXpyD9KckzoevBOSPqMVHnIOKaT0oAsx3ki7snJw + Av4GrEeogg7xg4yp96zwQVz1NJwQKXKmKyLj3ri4DAjavy+xFOu7srKUXoMZ9+Ko5Gc9u+KG3FiT16nN + OyCxaN7IVQf3MfiRVdnZzknJpm7tSjOM9aLDsdGx5+tJk0hPJ7ijOKwsZi5ozzSUZoAXNLn/APVTc80Z + 9/eiwD80ZpnNGRSsA/PejvTaM+tFgHZoyKbnp60UWAd09z2ozTc8cUZosA4HBoz+dNpc0WAcfagH/wCv + Tc+9HSiwDs0ZFNo696LAOz60ZxTTjiikA7PNAPam5oosA7JoGM+1Jz60Z5oGLmlzTaKLCHGgkU3OKXPA + osMUdPajI60maTPGfWiwDqXr0pmcUZ7dqLAPzRUe7mgt2zRYCTPc0mcVGTQT6c0WAkyKCcVFS5PTt3p2 + AeXpCT0Pamg0Z9OlFgHUE9+9NyKM0WAdzR0PFNzS5oAXNGeabmlHWgBRRnj0pN3P0pRzQAfy9aUCkzx7 + 0ZzSAUn8qCfzpp/X0ozRYBaM0meKTNMB1IT7Un49KaXVSMnBOBg0WAf7dc0nX8aqyX0YEgHDoDjPftUU + 95tlYA/JtX86pQYF53Cqx67Rz+FRidfIEx4BXOKzpbtnMuD8rEYFRPcswVM8Ku3H86pUx2L817lYjGcZ + fBFRS3jrcSegGwVQ3nH0ORSFmJLHvzVqCQ7E73LPEI2OdpJH5VG8zuFBPCDAHtTO+KOn86dgsBJPB5A7 + fWjOMmjuM96QmmMXJ5OaTqDSDn25xSgknAGKADqKUdKSjIAx60AKefzo4pM+nB6Cj174oAXPFGO9ICAO + O9GRn270gFxjrQQM0me1KPegBOgpc5/Kjg0nf9KAF6UDkCkJ4IoHIBFABxx+dDAkZH50h+7kUue3bFAC + ZG2lz/jRjIH6UnP5UAB4FHI6fWkbqKXHb0pgLu4BoPJ96aevsKXPHHWgBQcmjPr0NHHX14pMjA9qAHc5 + /lSYxj270D+dJk4oAXGM/SkU9PUUpP8An60nHPqfSgBw496QnjJ79vrSZA6dMUE8A/QUAJ3ANOGQCKTj + OBQf5UAdCcZpM9KU8n2pKwMxc80Un8qAfxzQAuTR2pM0UALRmkzRmgBaXJP0pvvRmgB1GfSm5pc0ALmi + k7/Sj8KQC8+tGaTtRQA6j6U2jrRYBfx/Cj6UdsUlADv1JozTc/hTZJEjUu5wBRYCTJozmqUupQRvtzkY + PNVptZIY+WvA6E1SgxqLNYH1qKW6ghIEjYJxj8axTqVyVKhuuST9agkneZt0h6DA/CmqfcpQ7m9JqFqi + k7wSpxt7nmoTq8G4bQSCDk+hrF4P1pMjbj86pQiPkRqHWWMmQuUPY/SkbWJA+QvyFRx71m4xx2zSDjAz + 7inyx7Byo149ZQ53rj0xUy6nbnOThc4U+tYZ/wDr0DdjHpS5Ihyo6NbqJywzjYQvPqelOWRH3bTnaSG9 + iK5wO4zyRkgn8KkjupogdjEbutL2fYTgdD9KSsWPUbgAJnnsTV5NShZlQ8ZHJ9DUuDXmS4tFwUVTTU4X + k2AYGQA1TSXUSFATnfn9KOV9hWZNRTfNQFRn7/T/AD+NLuG7bnnGce1KwCg0cUHig/nQAZ/Ol+lNzRni + iwDs0ZpuaAaLAOzRk03I/CiiwDs0BjTc0Z4NKwDycUm4U32NIadgH7hS7uKj3AED14FQyXcUfXkgkYHq + KOUZZz6fhTJZRHGz5BwO9Z/9ouJAcfJnOKrSTM+R2yTj6nNUqfcLMvXV6yCNoSDuByDVa4u2eYOvRcY/ + nUDMzKoPRRgfzpp96tRSKSHMxZiT1J5/GkJwf0obr9KQEZzVAJQR607jbSHigYnpS9vemml70AKc0men + 86G/OkBOfagBcg8+lJnjjrzR3JFGetABS5xzTM9s5oJ59u9AxQc/0o68/SkJwDilGMUABJ5x2pMn/wDV + 2oGc/WkC9c96AF3YpAeaXj8qMgf0oAMnHHWjJGc9OopA3ajdkfSgBQT0oDNTc/rSAHOewoAlDe4pQy9K + g7fjRyWpBYm+h+tJ/Fn2qIkg4p2SBnNMCQdOetL7iow/rShh/wDWpAOx69qCMZpNw6+tBOQOfagQdcig + HoD2oz070jD+dMBW+XnOaTHbp3pWA28f5xQDzntjFAw3ZGenekJyM0Y5pO1AC854pev4UmBjj0pFJxmg + B205z+FJnA756UZxSHP50APUAjNBGOvemg/L6YpQT3oEdATzSZ5/pQetA45rEzFzRmk/zmkyaAHZozSd + aTof5UAOzRTTS55680AKaWmk/maTdxRYB/40hPNMJ5oFFgH7gKTfjtmmE/8A66QMp6EH1p2Ak3mk3E1W + a9iVFYngsR+VVv7VGz7uXx17Zp8o1FmmHNNaQKMswA61i/2hcH5d2MdKgeaRySzEknmnyFcjNt9Qt0ba + zevPoRVZtY+TgZbHU+tZJYkmhjT5UNQRdfU522k9QpX8+rVFJeTyoEdsgHP41X5wPzpVp2RXKhCc/jQc + fnTuOnShun6UDE3YFKvrTTzxS5wMUCFXqTnAo24yc47U0HtSljigBc9c8+9OXgBj6kGmnt2/+vSnkYz3 + oAMkYNJnpg9etIM8/wA6BzQA4tRnIx6UmB2PSgZx9KAHbuV/ClyOmeh60zPHuaTOR60BYeCQfof5UrOx + 5JzTARjnuaXgZHpQBIZnz1Ix05qWO9mjfzAxYgYIPpVb19aMiiwrI0k1V8EMMt/Xiry3MTqrgjDnA+tc + /kg9e1KHbAwcDP60nFCcDo+KXNYSXlwqna3BPOfWrbantkYjkbAF+vrU8rJcWaJIHWjIzjvjOPasqfUj + Im0DBBzn+VI18yhGU5YLhie5zmjkYcrNfvR2wKpPfKHXbzwSwzx0yKW4usTQBW68sPY0uVisy3TWmjUE + k429faq1xeBS6KfmHf0qjJK0js5P3utNR7jUTUe5UBgv3gu4Z6VDcXu1QExu9aoNKzEE9l2/hSFsge1U + ooLFiS6eTOT905BHHaq+cnJ5zSf1o4AB+tMY4EdelN7ikyMelHbigYHOAKV+G/nSFxgcdKQtuPvTAUn5 + jRzjPfOBSbhnP+eKCx57UgHbsDH5UhIJ96YW4FIWOaYDyR0oI4pn+RQW60AOz/8ArpM5b69KT60A8k4o + GLxtz6UBs/jTevtSqOPegAz17YpAcEE0H/61G7mgBepJoGOhppfIoB5xQA7cOfSm7s5FNz8xpSQTmgYo + 6n0wKA2PzpOKTPegB3ejIyKaDxSDt+tADuuAKUHgDrmmM2MAfnTge/frQAdufpig4/GkY4IoOevrQApJ + Bye9Ln9Kb6e1HrQAvUilz19aapH6Uo9aADPy89OtKSM0m7nmjpjPU9aAFyc0biOM9+aax5o/xoAdu9zQ + G+amg8jJ4pM0AKHPrTt3rTO9HagB5kxx1oDkcUznn3px6D2oAdu45oyDj0pg4HH4UA8UgsPyOmKXcMfh + 0qPPc8UZx9aAsdEcgkUmTQcHgUnvUGIu44oyc9aaSFGScDp1700yoP4sYyPyosBJuz9R0o3mo/Nj+Ybh + 8n3vbvUZu4QAd33iMU7BYsZJoyap/wBoQ/N1+U4GO9Qy6nyRGvHHX/x6iw1Fmj196RnRcAnGayZNQmJU + j5do59zUL3ErkMzEkdKfKNQZtNcQquSwAIzVV9UjVnAGQOFPrWYzE5yc8U3jFHKUoLqXX1KV02dCe4qs + tzKuQGxng/zpiA55pOuaZSSQpLn5c9Dn86QdcUo4BoHGTTGIDlqPX3oAAySaM5NACAfrSnp1ozzRk8mg + A4wPSgHGR60nahc0ABNK54pBz1pDmgBRnrQRxn86Mcc96T2pAA657Uo6HH5UDgU4HAzQAgY9TRmjI/A0 + Ek4zQAoPGD+FGTSCjIoEHGfpSjpjkUgweRQCeAaBik9PSjoOnFHX884owDxQIVcf4UcZznHrSYOeaBzi + gAA5460oOTk9KTH4ZpSefpQAp4NA6D2oUc+/emjOaAHZxuFAbIwfwpKVT19aAF60Zx9Kb3z2oByeevXN + ADyxP8qC7HDE+35U1sDoeR0pc5GPyoAN5OSTndSliFA7U3bxgflQcjNAEhkIHHak8w9e9MzjrRkEehoC + xL5g6mk3g+/NRn2pBkH+dArEuQRn0pcg9DUQOB/OgHkDNAWH8g0owO9Mz+lIT70ASZxSfU03qKM9u1AD + iM4wcelGM/1pvfn9aTnOf1oAcQeT+NB9aTd8tJn+dMY4kde/pRu5xjgCm55pM857UAOLYIpOOvvQME0h + OaAAk4oLAUYyKQg/jQAuOKB3NIc/l0o5oAD0460o7/lSdcjpQD1/I0AGaDjGKQ/1pccdaADt/Kk7YpQf + 0oHTNACNxg9qXtxQOmTR1GPegAPP4UpPH1pvHSl6nHrQAfxY9qKTuTSn1oAVT0pAetIOM+1Lnrj0oAMd + PUUpxnPYU3BxmlJ6UABGfalOPxpp/wDr0vf6UAHbH60EDGfSkyelKehx3oAPQ+tKP5UE+nakJ/KgBSOM + d+9IxoJ9KXjpmgBCMcCjJpcev1po/OgAyaCW7+tL69v/AK9Nzz7UAbMl+m4hTyA3X1H3aqLqMhzv+bJ4 + 7e9VGbLZ96aG7UrIXKixLdySgckAHd+NRGZ2JLMTu5qPOaOc0x2RJ5jZOCfm+9TN56Z6UhPXHWkoHYUM + c0Z60gAyKVV4OaADOTR3pSO9HGRSAD1NAHI96M//AF6TPrQA7I7UmePrSE4+lGfy9KAD60E9aQmg+goA + UnOKPxpuMn6UUAL2we9HTg0mecUGgYuTtxRz0pM9KXPfvQIUHFB6A0hGR9aD0+lACj0P4UZGCO/aj1GK + COpoAD0FGcnHak9/SkORQA49PrSe/rSelLQA7jOaAecdMmmHril6HPvQAuMZA/CgE4oBwx+tIc9KAHe9 + FIM4x270YHrQAvoaM4/DmkyMUvFAAScZ70Z9aQ45I6dqM0AOyMig/Wm5/OgNgUBYc3tRz+lG7oDQDzQI + UdMfrSHml/zigD8cUANbkClU4JHegnFJ3oAdkgY/zmgnP+NJ3NAP5UAKTg4/OjAHFAAI96TuaAFHT6ml + PcelJ6exozz9elAB7UfxAdqTPJzS55oACQOO3+NBPt9KQHJIPr1o9qAHcY9xzSZwMnp60g4PtS0AHOM9 + elBz9MUgPB9e1BGTQAuRzmjt/Sk7jHrzR9PXNMBc459aTtj0oznOBx6UhPFAC8AUccn2pvalzQADOMY4 + oJ/+vRyOPWgHHvSGL3yKTPFIf8ijtTAcTxx35pM80dRmkzQAHpn3pzdPfFNYc0E/yoAXGP0o7fSjP50g + 7UAO6L+tHT6UnOKM8CgQd+aX/IpD+dGeMUDD1ozx70lJnpQA49zRnj9KDwKbk96BDh6UdfoKTPpRQAp6 + 8+lLxSDofrikz3oGL0o6YpM9KUEYx6UCDPTPajPU0bsmjOBQAZyfrRSZNKSKAA/zFHQZ9aQHKn26fhQD + 8o+tIYuB+NBA6flSck0D9e1ACnG72pMelNOc/Q5pc4phYXgc0H0/GkJHApCf/wBdIBwIpCPT1pOfzoyM + jFAC8YPqOlBNJkUCgBSfWkpBzSg8UDFGMUZ6Uh4oNAB3oOMgUUmaAF4ozwaTPWk7YoAdnik96OlJQAuO + c+nWl7Y9KO1AOcemaAA+lJ3xS9/pScUAKaUn5frTcnml9jQAvf0pAT1oz82aTJ59+KAsOHSk7e5opCOm + PSgBwwTRnHFIDSZ5oCw49aD933pM0vXigAJGKTuKM5NAzn0xQAv+NHSkGeaD3I/KgBTij0pM4GO9L0/w + oAM+tGeRR9OT0pCTx+VAC9vr2peOBSdcGjIzQIUYpe2e1NGDTuduOmKAFOCc+tKMd+KZnjmlB6CgB23I + GOc0mMfh1o3cYpSTuHuKBCHHQUHhvY0vB6Dn1pMH+uaAA8celHODQcbc0h//AF0ALwDRjNJn1+lGefSg + BcfkaOOPzoJPYfhQDycnntQApxjP50nXOecUDlce9AOPagA69O1Hp+dGTn60h6e9AB60E/lRg7vrxSA8 + GgYoPpRzSZIo79eKYCjOaTvS9CaTkH60gF9v1pDmjqDRx+dABRQeo/KkFMBe9B7ZoI5xSMefSgBRkUf0 + pKAeaAFByefzoAyDSZyaUHg0AHvSkgc0n8qQ9aAHZpPTNIeO9KcEfSgBfftSCg+g6mjp+FAACKTt9DQO + tB7mgBSaCSQfWkB/+vRmgA9qKQ9aO1AC5wKM0hHalGPyoGAozg0UHB+lAhSOcUcYpCef50maAF4Jpe+P + Wmk0ZyaQC8mlOM4HSmg9vSlycCgAzQOPwpO+PelHemAh6k96M8UhJ59qP60irBknmjPNIfWgc4oAU8Uc + 9aRjzR1GKAFPSlzjFN/rSk/pQIOnNA64P1FJntQT0oHYX+lHUZpM8kGjJyKAsBJ/Cg96TOePelH6YoAU + nn9aQ96Tv+lKO+aADPSlH8jQD2ozxQAZ79qXOCPpTRxxRkUALn5v1NHBPNApBwKAHcUHjA9fWk7YpB0F + AhR0xS9s0gA70tACKcfWjJOTR3HvQe47daBh0zijHOfzob+dJ6/nQIcOuaOxNJ1/GjPBoAMjPtSk8ikH + Qnv2oPGDQAtIM8mjPP1o/wAmgA+lKeaTPbtQP0oAUZ/Khc0Z5wPrQcdqADvxRmkB5+goHT+VACijJxQO + lIO1AD855+maQHpSA8c0ZoAdjIJpc1HvGKaZlB/DFF0FmT7j+FAbFQ+cucdjzSmdB9aV0HK+xMcEcfU0 + h5bHaoxIuOvXpSpKhHPTOKLisx/X/GkPXcaAR2P+RSqflye9O4Dc5PtQev40u3AP6GmngjFAC5I6dqXO + RTeevvS8c80AA4yKU0DFJjrn8KAA9fekPt60uMkD+VAyTj1oAM5Bo4P9aMc0nt3oAXuKB2pDkc+lHQA0 + AKcd/wDOaTPHsKDikOcfSgBcUHr9aWm8GmAvegg5zSeopxxj1oAB60g60meaU0DAD+tANJnFBPFADu1J + 1P1oB4xQPWgQN0+lHakNKRQMB1BFB60DHak5zQIXrR3pKB1oGAoHTPr3o7GjHHtQAmTjFL2o7E0mTQAv + b3oz26k0DjjrRxSAO3vRnig/lmgn+dMA6ijuKOmPekyc5pAKD60d6DRx0oATuaX1pAepNHr70AL2/Wj6 + 0cnpRxjnigBGxk0g60Hvz3pOODQMX3pG4xil4x9KByM0AB+8KTPNBOR6UmQeaAFz1FB4GaT+tLntQMOM + e9B4OKQdKU9cGgA7kijPSkHQmlA4B7UABOKCe4oA3D+VHUfSgAzzSjNIaMdcdBQIB+tKcD8ab/OlwMe9 + AwzRjjNJ7UtAC46UDpR2pAOPxoEHQUvp6d6P6UUALnijjJo5z/KkJBoEAwRzQecmkOcUoPH6UDF7c9qT + npRnGRQTg4NACnpQeQaRhwMd6OMjH40AA7Ud8UDBIoOd1AB3+lL2NIOhowSKAAcij+GhThcU0ZyR3oAc + hOM0uaTgDAoyOSaAFPHPc9aQE7aQMCPzphmHGPTildDSbJM4A9KaZF+tRNISMHpUZbPTjg0nLsUodydp + uoA/Go/MPJz/AJFMzjA/OkJ2n270rspRQ8MSOaQ5OOaQnbSCkVYcQSKMHjn2pMkcZoXgDvzzQIUE59qV + GYH3poP+NJkkkDrQFiQMw/GnrcuBsPQdKi5J+tL39vWncTS6onW5+YZ6ZOfpUpZDhQfTFUscYpyMyMGP + PShSJcF0LhXAGetJggZqI3BLAn16e1OWYbfXJ/rVXI5WPU8YpR1wfSm7149SM04YJz7daZIdMe9AHBPv + TTx0o3/KfUc0APHJ/U0nA4PNRmYcH1601pSSOwpXGosmxz9elNHA+lQ+a3J/KjzCffNHMPkZKXXPWkMi + 4zUBbP8AOgHIz+dFyuQsCQGk3rnrUA64HajPBouHIicyDg9PalJGQc8HkVXB55pcnIFFw5CcH9aXnaTU + Ctgg0qSHoelFxOLJgaDjNR+ZjB/OpCwYkincTVgPFGeKaWyufXpTucCgQZpSaQjjIooADRnpR3pvfFMB + 1JnmlpB60AO7c0nbH5UA8UlIBT3pPu0UdqAEPCml7UnGOaKBi5/OkzxRzjNH8P1oAXNAzjn1pAeKU9CA + OlAAelHGRSduetFACkc/Xigdc/yoJ/OjJxmgAznFB6UDhR60oI70CGZ5ak/nSnjNIO9BQDkUo4AFJSg8 + r7UAI386ACCRS47+9B5P86AE96CeKQ0HpQAuaCelJnj8aUkYoAPWgcjFJnpS57UAGefoKXOaaBxj8KUc + H6UBYAaO31NGf1oIOKADnJpR/Kk3Y4P5UdsUALxx60ZzmkzxzR7UAKKF4/CkJ7UDAPPegBSeOO9L2FNO + aB2oAcTjmjODimg5FKck59utArBml5yM9Kbk4FK2c+9AC8ZJppOSDR9KU4oGBPGKMcBs0h60v8OKAAdv + SnHG0nvSYG3g0hyRigQ4Z2k00GgSBQQetRiTGSelK40myQkck0bl49c1XMmTjsaaC2eaXMVyE3nHpTGl + Jph4I+ppMnHPbH50rstRQ4EgYJppJAP14pN2AB60hOVAPbrSKSH/AMWKFAJpvTnuaTJC5+tAWF7/AEob + k/kaQ8D6jmgqSM+38qAFbJA9eKUDnB6DpTW4BoVsnnpQHQTP8XvTgevv0pMfKPc5/SlJ5HrigbF6N7UA + 4IpvOM+1LgEA0CHZ6/SgnB+mKaDjj2oIJUj0oFYVmwePWlz+hpo5wT1Pal/xoAVWILelOVulR5yB+VA7 + EdKAsSqxyD6fyp6ysMD0qDdgHmlBPX1ouS4kxckHrzSEn1qLfTgfxp3DlsP9ulNI5x270bhnilJ9eKBA + 3BFGfTpQOT+tH8Q9qAE6tihQQSPSjpz2P9KXgDPr1pjE5PNKMdKQEDgUA5/CkAnHORTiPl4780nUEdM0 + p6HHTtQA0A59qXOMUAYxSY3D8elMBwxjJ/KlGcHmmgEfSjqAcdO1AhwJHGfpTvMO2oweOB3peNo96AaR + KsnyinBgeKhDdBS8Buv0ouTykoo43VHvIOKfvBp3E0xetL/OkyOucUH3607iDoaUik5zSseKBBikNBPS + jvQMD0oBoPPBpo6GgBwwSB0o9aOwooATngU7J575pO/NB96ADPBoJoPSk9/woAXJpe3PpSZzmgAHFABn + 1pW9exNBHak5CgHg96AGHk/WgcUhYbsZ5zS4HPvzSKAf5NA4ozxSjtQAhJBpQcUOM5PfNNHWmApoHFDd + c0h6A0gHH2puc0poA/KgAooOeMc0EYpgLtON1JgUuePxpM80hCkd6D0xQaTP6UwAj0FL34pAc0vrSAAc + ikFKoyD9M0gGSR+tAdxTyOKKU4oUUwEwaAOgzSck0q9eaQCKOcGnZGcen9aBgZB70hAyT6UwFI7jpScE + j34pxGMHp/hTNwGaQLUUKcn0FJml3qFPqKg80YPqKG0NJsnKjHWmGRcZ/D8qieUk5HSm5Pb61PMUodyc + SjaR0PHFMMpzkflUWcn6/wBKN3SldlKCHmQk5/L6U3dwPxzSZ6j04pP6UFJCkY5HYUvcY54pCTtI/Km8 + 4yOtAWHEkj9aM5I9CM00Hgc8Uufm9u1A7AwOR7EUDlvrSFuDmggllA9KQC55UUjfdx6GnECk6CgAU5yD + Rk4J/WlH3iR6UnfHYdaAGuc4pcHt7UMM8jtS5CjHfvQHQAetLn07UZBBpo5JP4UAOJypx9KByB701gQP + rS/xj0P9KYgySR69KcfTsaZ0Y49adkE/SgGg4Kg0cEUhOOBR0IAoAAQAB70c7RTe5pSeM0DsKeuKMkAY + pM5OfSlB6ZoAFIGfalycH2ppGFI70Z+XigLDt2QfWnGSmcZ+gpG6mgVkSBxmnZ6EVCQQ/wCPWnbiMCi4 + nElB5+ppP4sD8aQOMCkD96dxWY8AZOe1JxgnpRnJzSD0oEOA4ox27UjHAxRnsO1ADiccdaaDwc+tGSTj + 1pAelAWHZwv1oGeDSN0z3oz8g9eKAsO4GfSlBBJHpyKY2M0ZIGaAsHOAfenMBkEHHPNICDwaQHt6UASE + ZUY+ppvTB9aMnA9SORQRnGe3SgQoLdO3WgOR16dqRGJz7UjD5jn/ADmgLdGShw2BTtwxj2qFRtAz1pRk + DnmncnlXQmHY0DGT7VFkr+IoDYJwev8ASncXKTcdPSkXr+FN3/rQrYzxRcVmOHXmkH547UhfJz2oDjP1 + ouFmKe1HNJvGTk9KUv8AKOfwouOwHjNAoBBwDxmnAYz3p3EJgbfrQBj8aCSMCjdngUAGO+aDk4OKPalJ + GBQBn7yJMn1qT7R82B03Z/CoGIJ570Aj8axTZ1OKe6LSyqzLzjg5FP34ZV9s1SBwcinrIykZOSBgVSmQ + 6fYuk8fzFN6VFHIMZc8k4/CnCZevvxVcyI5WiTGTik+tNEq9SfWjePX3p3QrMd0OKUdM00tml3DAFAhc + 9B6dKQnijNGe1AC9uabycfWlzz/OjpQA4DmggDp0pAeaQkmgBQB60MADilA24z/k0NywNAuoLwP5UKcc + +tGOvakzyKAFPOO1LjB9fSkONv6Ckzgg8YNADlGM/lTRkc9aRpMA1F5mc9ueKVylFsl3A80iSAgk+tQF + jk/rSY9/oKXMVyIn87j39KiZyzdeBTeRj05poPHtilcpRSHAnuckmkxnGfxpAefakLHNIqw4nt+dKD19 + KYenv1oB4xQFh3OR9KTuM96A1JnlfagLC8ce/NITyfejuPxpG6mgaHZoz0zSZ4pfrQAY4x6GlbGARTR1 + oHX6UCFIPP4frQOPrSZ5ApT147GgYDrml43DHSmDpSn9aAsOJJP0oLDdSA8mg0CsL1JHTmg8Zz3/AKUm + aCfmHvQAvQYNITj9KXOW56Ckbpj6UAL1JzzxSZ+6QP8AJpcEHnoKTpgf56UAGcEkUcc0ncD2oOcGgYAn + P4UueopF6j6UfxH6UAH9TR2xQPuj60g6j3oAUdMUpA/GkPUY6UHjFAC54/ChenvjApMYGBSmgQEHk+3F + Lxt56gUYwMUpwSV7HpTAU4PfpSYBy1NHBKnmnZxwPSgVhOuMUikhSKVThfpQx6DrigfkKWPGO9P3VFnI + ApTkGgTRIecZpSox7nmoy2QPalycn6cUXFZjjng00YwCOuadkH8KRhxTuAuc5oB5xSHHYdKMjINAWHMR + z60h5GO+M0metGTnPtQKwuePel4yDSLQMjIoAcD0/WjOcCmd+OlKMg/XmgLCplQR60oOTjt0pO2aCcEU + CFYnpSk9qaT096BnBNAWFzkClA+bFNyQo9+aVX+bNAMCx+lLnA6/WhsHr3pHPXHegBwPGM0hOPxpRzx7 + daaMg8mgSQv8JPc80uSB0pO4z+VBPP60ABYk4p287evfimscMRTSeMUBYkEhwc+vFKJKj4I5/OlHTBoB + pEhdeuOSeaN4Ge46VHgA5HT0oJzx607i5UUj1z6HFHbJobqfrmkJ5AFYnUKO3vS54GOtMB6A9qdnn9aY + NDg5PWlBGKZ39hzig8gUCsSd/ajdz/KmZp38qBND/MODS+a2R7VEGycYpc9vSncXKuxMshxzQJz+dRbu + MUZxkdqd2LlROJhj6ClEwxk9BVcbSOtB+7j0NPmZPIiysimjzRuA9agBOCe9Ju5z6UczDkRZMy5IPagz + A4x2PSqrA5Jpe2e5/lRzMPZomaY9B05pvmngZ6c1GOgx1puSOv1pXY1BEvmEjGeh4pN5x9OlRkECgEni + gfKhxc565Jpd3r1pnp+tK3BoHYCcA0bvSkPSlGAaADdjNIDwv0oP8+KAcj6dKAFHBpD9760d6B0x3oGL + wRSDrQOuPSk6EGgBRS9qaeMUvY/SgAByDSds+tGOPY0MOBQAp7UmRQP5UY5xQApHegfeNBHHFBOFoEB6 + 5pe9J3pCfmoGKemKOtLjI+lNHAzQAA96WhaQ8D8aAFJ4oOcj1oPahsZz6CgBVPGaCaT0pD/OgQ5myKQn + 5hR/D9KQnkUDsOJy2aMjFJng0ZoFYO4oB5pT2pBnNAB2oHX6UA/zo7mgYA5agnJGaQZzn8KX+LFAC55o + 54pp+99KdznNAh2ccd80d8+nFJ1PPrmkwTn60CsKQAeOc0pPIPtikz0/Wlzk4oADwv45/Ol4BB9RzSDk + 5pc5APpwaAETHJFBOfrnNIMqxperZH4UAHXPuaCTx9KOM0deB2oAOSBjv1p2efUU0EbcdqBwfamIeGyf + 50oAAqMfrk5pd5B/nRcVhwxn69aQjDDHTpSZwxp/bFO4bCdDS55P6UHGPpR70CEORkUhPP0pTyB6nilK + jGPxoGNBpd3rRjA3CgD1oDQUH/Cgmk29+1B6UCH55HoKbjn60mSOO9HpQFhfbv1pTn8u31pucdacDn86 + AFzhhQSORTHPP407OfqKBWHHGM005NBPyk5pVxxu60AtA3Zb3FBHBPUmjA3Z7ignGDQAAfKOOaOgHOcU + uecHpSdvfPFAARxn86MHtS9eB3oYBR04oApN1P1pueSfSh+p+tN5H41lc6UhQfnP0ozyB7Uhzk/TrS8k + Zx0HWgY7PzfzoHvTOd2T36Uo5xQKw4cAD9aM8c005GAfelBGaAsOyePel9TTA3H0oBOCT0oFYeP0AzSg + jn2puecegoz/AIUxWH9PwpcgCozkNinrjn6UXE0LkdD0pOM5/ShSCKMBvwp3EKeSKQnn2NHSlwTzQABu + 1BPOfXik7j2oGCaYAclc0vQ5pAeMelKCP6UgEJ/KkbpmlPFIeV9qYwzkUvFGKTndQAHpx2oXp9aOxoxg + UALnkUE80h6fWjnINAADyTRQvfNIKAFbtSg8UnGc0LxxQAvG3PegHP4UhyRgfSkz2oCwp4PFHc/SlPPS + kzyaADNKeRimkY4peMUAHr7UjH5qUd6aQc/SgaHg8UGk/rR1NAhV60DnNIn3jQMdqAFzyKQ9aKQ9aAHe + lDDjHWkpc0AIv3TS7TgH8aROmKcDQDG9vrS0h6UooAD2NAzQelIen1oAUDqe1HU0nQUD3oAUUgPzUU0d + c9jQA/HPNOHWmn170KemKBdBcjdSgimE88d6d2+lANCZFOXhuaZTskMKADIzj60o7frTedxNOUcnP1oB + i7h+JoA+X8aARtHrSnPfoKBDcZbApcgH2oGOnpmkAGaAFYfKD2zSHjn3NLkcDHSjAI/WgAzkA0oOD9el + JgAEfSl46/gKBDgvYdSKG9uo60injI64pV5B9+tAgUnBzRnjg00DJJ7dqcAAMd+9O4MVT2+lBJBzSAZJ + x+FBOME/lTAXqvHSmk5x+tAP/wCqk7UBYfng00g9KA3OKUnpQGwMPmH6mjGOT0pWIFJnIz6UAK3Ocd6a + ue9O/wAaZnJH8qAQ/rn19aaM5Pt1pW4NAYH8aAEJO3IpXzwaQ8CjPy88UAOzgE0uSSM00Acg96XPAwe9 + Ah+fX8/amYPX06UpJAxjFA4oEKMjr260u849aj3HIp+Sfz7UBYoOQc+xpuDwRSnksKOxrE6hWHHFIp+U + ilxj60g6mgOgMeFHpSggEe1NboPrTiMUAI/UUdP0oxnBoPDcUALzjHvSDO3HpSk8jH40i8Z7UAOJwevW + kBoAyB707AJHt1piFBGefxo3Y4ppxtP1peozjtQKwK3NLu6jPvTU4Az3pRyCO9ANDw2OeopQRjNMB+XH + 60KeKdxNDwMNnt1peRz2pmc0buM++KLisO6mkx1x60A/Nn0pcjGe9MAAycHvRjt6UuMdKTt9RQIUDJzS + GjBAo7YpjD1FHbHpR0ORSHPA9aAFAJGPTpR1FGcH3pDwKQAB1pOp/ClzxSL3pgBpaax4petIYpPIpPX2 + o7ig+tMBe2aPfvRSY/WgQE5NKe1Iww2KKB9hc80nU80HrS45NAgPQUDGaD0pPegBQRQOtJ3oHXNADj0x + TfelPrSDpxQCFFGeaQdKUCgAU0pPzc0i5oP3qA6h3opP4hTv4Rj1NACdBSHgAUvb8KWX7/HrQAh6mkHH + Wg8k0pzQMWk4FKOlIT0oEKe/0pPSkJ4NGeRQApPzDFOz1ph+8Kd3INANCfjSnrTc07qSKAFAJ/GkH3hQ + Dxmk6UAOB7UZ/wAaQUnr7UCHA5z9KMHccdOtAPNGCOfagAOelOyWGB3zSFht/HFKo5znoP50CAMcbfXi + g8EgUmBuGPrTjjBbv6UAIw+UY7DH40AnJNHO3J6ZpBnofqTQA7p7jpSlsNTQMqe4BpxHylh2oEKMZ+n6 + 08lW4POeaiz8oJH40pPTHr1pisO2AD3pmCMe1OGe9KSTzQF2MOAc45oPJ570pHUkfWm80xjmI70q9AKY + eQaMkY9qAsOU8UqjByKanWkyScGgLbjm6D60FcYPXNJ1JpWJKD0oDsD8rxSc8D1oPIGKM8fSgAzyPagn + ByKQc5x0pTyR70AOYkD8qTf29+KQ4PHSgDsaAsrEnA5pu4DkdKQklSPSm4JH0oEkVBwTSjHHFDffPuaT + OBWB0jif5Ui84/WkyMUL60xBgHj06UrHlab/ABGnd/pQMB0prdvenqeCKRhkjtR0FfUXp9BSLznHWg9K + Iz370B0FzxRznA796b1PvmnDjB9KAFf7v86B0x7Ud+Og5ozgUxC5HWgcfjk0meMUpPNACK3y5pTxj6Um + QFOKM9B6igLDuwz6UhIA/nSdSRSjn5aBACc/WlLc/SmA889qCfmoHYkLHnHegP0X14qPJwPrQPvA+9Fx + cqJ9+Rk03PPtUeccfpT1IH0p3E42HcdKOh57HimjkD1NKD0NMQrDPP5UfwZ/GgkFfpQD8vFAhCRz64oH + 86CM0A8D8qBhxSY/+vQOMg0pOCRQMTuKQnrTv6Uz+I5oBD2/pSZwRQeaTPI9qAsOOM9KTv7UE80tAhD1 + H1pfX60Hk0N0zQMQn+VAHy5pTikz8tABSr0pueKcvpmgGHf9aFHFIc0oOBTF0EWlHWjvn1pKBgtL/FSD + ijncaAHHrmj+GkJ4pew96BCdhTn5Yntmm/40pOQTQA0cmlPSkAP405cHr3oGxval649qTGKBQAdjR0Ip + fak7g0AH8Wad/WmilzzigQEdxR0P5UZo685oAUfdpDyB6Up6N+lGPlA9aAEHSkU9TTiew7U1TxQA8gDB + FIWK0memaU8ttoFYUj7oHrmlPtTenPpS/wCNAADjpRkkH1NIDjPoDS579KAHNgR49v1pUGc59OKjJzjN + KrdfegLaEiDZuzzmkONp54P9aRjwDSdVb9KBW6j3UkfL0A/lQgyBnoKRTnJBwKQErkeoyKBdLCqcPg9u + 9ODDP160wklSe+etGMAn8jQFkShuMHmkwDz2pgc4FL2B/SncVg2cU0jipAS2O1IVz0oBPuMjpDnPt2pf + uk+maG//AFUyuovekzlcUn8RFK2MA0AJjjigEHrSg80hGDjtigBf4T6UA579KAaQ8MfegBwIyc0ZwfWm + k4pynOM0AL64PWk6EdhSdD/npQDnGaQrFR/vik9RTmxmmeuKxOgUc04AYz+lNU/LSqaAYcbhS/1pvfjp + S9BQADhmpSDgGm/xE04/dJxTBiN0oU8Uh5AFKvTFIOgZ5/Glz/OjuT7mj+A5piFJ+VsUnYe9Hc56EUh7 + etAATzS5yc0diT3pBzQMdwevehiO3YcU05yPeg9KBWHg8Z9aQNzSD7v4Uh659qAsKetOOMimtg4pw5zQ + DEyMYpc8daaOfxozyKAsO+6xPel4/TimknqO9OHUe1MTEU8j8aUEjik29T3HSl7/AIUAx2flFIG4xTRn + H0OaTtn6U7isS59KQ+opoPH4UBsgjuKLisOPWkbqMUoOSTSemKAQ5eh96TA6nqaD19qTIpgDZIyKOvPp + Tk9PxpG4JoDyE/ioHOaOhoXv7UDF9DQfpSdqM80CF/pQBR60gPIoAQ9Pxpw60gGaFzk0DYrdKQnAFL2N + NNAkOzxQelDcYpDwDQA7H5U3uacOlNHXmgEObpmjPApOoNC9QKAF7/rQehFJ0NLntTEIDwaVT1pF6UL1 + pD7iE80E0H72B60YyxFACjpmig5A+lFAAKAMsfpSqOPehfvn3FMO4DP+FH8Oe5oAx0ozlcelAgz/AA9j + SjqPakIwR+tDHigAb1oTnmg8ihD1oDoJ3FKeufzpSPTrSgZByM0AN2kjPbNGeTTxjtTMd6AuHYil7Ui8 + /nR1FAAeoFKBg0hP8qM8fWgBxOc++aAMggfePApB6e9OY/MDQIQLgYPp29aeDv4P0prEYBHUUcj5vU0C + 3A5XK/jRycL6mggF/bvSkYHHXPFAARtYfSl5UAdKacEqTQck8dB1oAeSQvWlzxxUY3bT7U7BP3Rn1oFY + UMrduvWkI4x1PWmoefrS8jkcgdaAtYRs5z60Nkr+HSpOCvI5PWmkZP4Yphf8Bg4x3pew96Xpj6frSHtj + kUDBRzTjgHpmmqOaVjg0B1EYcZoHUUvVTSHJGfSgA6A0DgfrSqvXPU9KQjBxQBVPUmkORSjqfU0H09ax + Nxo+71pVGTn86UjGR7U1M5GKB9BzAdQPbFJmnN7etJt4wetAkGBu+opWPykUncUvG38KAEHUUg4c0AHg + +tIT82aAHnrxSAcY+tKppBTAD1oJ+YUH19qTJz9KQDgecUAcHNICaVj/ACpiA9j70N93NGflxR1G0UAI + vKmnd801BgUpoB7gc5I9OaUHv6Ui4yfel420AxBj9aXPI+lNBp2M0AxB2pTncMd6QDpRxnNADs9PpSHg + 0D5s0Hrg0xC+1GeM0FhmkJytAC55NA+8TTemPcUq/eNADlPFJuxSKefSkOTxRcLDs859aM8/WkPT6UpH + zdfSgLChsNStzk01u5oU/rRcVuo88UnajPPpQvOQaYAPu0n9aUYxjvQMf1pgKOQabjB/CnjvTaBCA9aE + 4Oc0YxnHSlHX2oGLnk0znIp3ekGelAIVj0obp9aOooI45oAXNDdqQnnilGeaBAvSkX+lOQEA0u0BAf4u + 9AXGk80Z5FB4PpSHtQAo+7QhGSaD0AFNHSgBxAzmhepPrR1pSeOOBQAh5H1oIwM+vWk57c05vu9aAEBz + 0oXk59BSL0z2NPTH+NAPQAeM+tNHGe9L6im55NAkKDQOQf0obGOPSiMYGaB9LgDxQvGaVTzimjqaA7jv + 60A/4UlL0P60xADzg0HjjrRwTkUjGgBQCBz60uKTOaM0AGPWkUUuaUEYNACZ5peCM9xSEAt9RSDp+PNA + BninbvuimhCQWHbtQOSKB6C5OKcWyB603oMUD7p9jQIcxBH605cbcDqetMHLe1KCNxI6UCaHLkEg9+9I + jFSQD3o3c/U0h6j3JNArCluxqRdvI7H1qFzk5pVbHHWgGtCTAU49aOCee1NB6n0o3Aj09qBWHfKeD+Bp + GU5yOlNHoOfWnqQV+lAbCHrn8KY3X607ORjvSYG72pjQhOOKVTxj86HFIOP6UD6DgefamuRn8KGPNBxi + gLFUmlPY0h/rzTmGVHpWJsw601AR160Z+fA9aXnjNACN3peT+FG3dkDjFGeaABjwPbvRk4pGORmlyeKA + BTwM0084z6Uq9qQUDHA8e9J0oU8HFBGGH0oEL1xTf4iKdnIpB97FABnn60p6UjdeKGPy0B2D8KUdTTaU + Z5oAVevNBPSg9aTg4FACr1p38P400cNilz1x0poTGjG+nkfypuR1p3OB70AwBx9KOBn36UZ+Wmk/MKAH + A7R9KXgnPtikxkEjsM0g/WgBOc4NPJxQ33gSPxprdsdBQG9hGPIpRwc+tNPLD608nNAMRfvGlFNXIan/ + AMNAMb2p2efwpv8AWnEA4I7daAYh+6frSA4AxQ3Cn60DNAdB2RSqfmNMbg+9P4wP1pia/EQnLHFK3C00 + HB+tOblPegOwA9aCf8aap+bBpT/9agLC7h0NGBuxTD1608dc+1CYNWHHGcDtzTQOc0uefrRjinckBwM0 + nQGnA4+mDScdKYAfu5pQfloUc57elB7igBQ3vTiRtAFR9AKXkcUBYRugJ5oPb86G6GkA6+1A0PA4z6Uw + 8U4Z/CkPJ/GgSAUoNJ04pRwvNACrgE0j8Dj8qABnNB559KA6gPu4NCmg0g6nNAC/xfXrSHPb1peMUgoA + Vvu/rQh46daQ+lOB4A9OlAdBBxSEEEe9OI59+1J3oC4rDoR24pDkc+nWlB7DpQehoATtntSEcA+9KcgD + 3oIBFAB0NKo4NDdRx7UDpQLoInWlB5zQOM/SgfzoGxO/4Uv8OaTB60vagAjOFpAfnoX7vpilGOfWgXVg + TzQcjj15pvU5z+FObp9KABRxmhTzzS9sU3PJoDuL0Ofeg549c8UZyMUHqBQAdCD6daU4yMUZHzehpGA4 + I9KAFDdaNw60KcfjRxzTAcq8E5/ClBPOOPYUinOfamkEDI70CsPIGeKcc4474pgbt0z3pSQMgc0CsDYz + jPPekYYPI+lKRuxgcinkDOTQK9iJvvZoHJ9hTmUHBB+tNUEZzTGnoVc/N7Uqnt70jLySB07ULyM+lYnQ + xON+aUnA+tDDJDenWgigAU9O1H8X060gNKMAmgBM8D0JpRycUADH0pQOWoExOntig9KUgZ9qGGRx27UB + 2GqOMnpTzgkGm5PTpSn+VACClPWkxjFKO/6UAwZehobByPxoJo70AGADQRgj0pP4qG7UAPGMfSmikJpc + 5A+tACE/NQOlKy/nSNxj6UAJmnjPX0pmOlPX7hNCBh9KQgDB9qD1NHVQaYDlPBI5NN6GhfunNGfU0CFY + 8UHpihh8mcd6E+Yj0o6h0DGBnv3pSCAO9IfvelOzxQAzvx3p5+7SHgj2owSAB3OKAYh6UoPrQw5A/Cgc + A96A6CScKO9CAcA/WkfkAdeaf/FR1DoMIJbPpT+M4pp746Cg/eHuKAHAY59e1L1HFNY+v1pQc0xCD7x9 + qXPGaR87s+tA5oACBkY704kH+VNPUDtmnYOAfrQA1TSk8Z9qYB8pPv0pc9vakNof/Dn1FCkE5FGflUe1 + NQUxdx+fmozkY9aawbr3oXnGaLisOJ7UE5IPrSD5s/zpU5x7U7gDZxQO/wCdLjNGPmweQe9MVwJ4oGOn + pR/Dj8qCTjnr3oAb3PengYpBzz3pBmgBQePwpBzSHApQeBQMG6YHekPWlIz9BTW7DFJghxxijAwMUdAK + U8imITqRS/xUgB3Y9aOjd6AFyQcUHrmkP3vwpVwc0BYDk9KCOx+lCnHfmjuKAFYDAHpQvegk5yaTHOR0 + oDoLk01TmkU/MaUfez2zQApyKTuKeecelMP3vzoBDiMcUmcUpyRxTGzk0Ah3YUUHO2gdaABeh9TSZzS9 + M0gzg+vWgBT1pAMqT3pepwKF+7QAAHAA7dad/CD6U0fKOtO/h4oExgJx9adzgUkYIBzQn3aBsXPzZpSD + wPak6k+1KT0NAgGBx17044PI781H3H5U9QMkHnjigTEYE8jt1pSCGwO9ABJOOnQUN/eNAASSRUm7nnn/ + ABqJ85HPUUnP1xQFrkoIPAobOMd6jUnv9cVJkd+/SmJqxVYDIIHemDvnkDtSk4Jx60E5JHrWRuI2NuRS + AnOKUEdKAec9+lIYpAIyPwpoPJpRz24HWhcbj9aA7hmlB+bHWm9CRR/FQFiQ7dp29aaMg5PFA4PHpR3z + TENb7/1pxByf50w/eFSA0DfQQ/lQexobGRSAnBoEKAR2pD1ozwKHxn60AA9aXgke9IOBTlxQDGuMH60D + 7tKTuGO+aRsAemaAHdR70j4BHpQOQaH7Z7dKA6h1XNOQAxmm/wANOj4Q00J7fMYegPpT1XK56e1M7e9S + EjbxwKSGxPWmDkjPenH7ufWgHgYoBA/3celImcc96c/Kn+dNj460+odBxGTnoO9Gfl/Ghify6Umfl/wo + EI3YinK3FM7gU/gCgGBb5s0Hr9etIRz7Zo9R74oAcgx3703+I+1Gfzozhj7UB3FTknP5Uj9QO9PA54zz + zTJByD29KOgLcHzuFGaSTqPpTlyB0BzzmgOgO3T9KF6cfnSSHnHY04HgDpR1DoI3JHpTgetMIOcetP8A + p1poTEbkGmjqKXGQR+NN53CkNEjA5THeg5HfmjOcH0OaRj36ZpiFBzSDIP16UiccnGO1Lkf4UAKOh+tJ + kY9CacOR70wgkDHJIoAeh4yaaW5oUYFB4II6GgNLjx+o5petM3Z/rSkjmncmwvtSYOc4pFPApdxBx7Zo + uOwbd3fmhgQPp1pUJxmjBwaYgNMYcinUY5B9KQ1oD4A4pcdwKQ4JHpSg9RTECHBz1ocjOfWm85xnGKUj + 6/SgLagcAA0Lx/hS9qQY59aAFwM570HrRjjFJnp/KgAJ6elOU0m3Ix360KSKAewAfMcUAcEijOTS5P8A + hQA3PSlz830oYD5SKMdKADPOKRh83HpQfv0HjmgBydz1pvelBoJoDqAo6img5FG75cmgLEifz700D5iB + 096VTge9Nzlj2oBdQ7EfjShuARSA80cg47LQA5TyRngDJpB93+VCnrSAkDntQA5PU0HI+lNzgUpOQfag + LahjP50uTQORRxuyfSgQKSGFKx6ehpCMcA+4oHI57UB5isfu+xxSjgg01c5/lSd8UBboOI5z74xTiM85 + pq5PWgdcdCKBFV+c/WkB96ccbiD0zSOAGJ9RWRv5CN97NKCc0Dr1zSKDuxQA5T2pBwT60oGD0x6Ujevr + QHUUDnk//rpDnfSg4460Pj9KA6gtAGSaRetOXIBz3oB6DCMEU49PekPWlJGOaA7C9SMcUidDQG4o+7+N + MXkGOMUDqPak9fpS5x3oGOABJzwKav3iKVTQeCfTrQIDw2aHHA9/50cE5xn0oYfLzzQHYRT3pTg96bni + nKN3OfpQNikZGBS/KB/OkLDAHb1zR0BGM/yoJE5APv0p2crikP3RQM4pgIckECg5G39aXHNIMkjHbNIY + 4+tNAPTGTSnkEnr6UvQZpiEc/nRtxgevWlA3HJ49KM5I7kdaAGnrml2nrQwBGB1FKCpoC43IzSsD1po+ + 9TucUhsByM0dT9aVTRt+bPXP86Yu4ZwQP0pGwSPzpcAn1xSH7woAVgCM9PegdRg80jDse1Kg4z6dqOod + BHbjJ/CgHoDjmlkyPxpq/TtR1DoPbkfTpSL6ZoB5pxIx9KBbCHIPNNYEYPpTgdwI9aHX07/zpggU8ZPe + gjilyBj9KRjzj1o6AA47flTCTmpPlHIFAHy89+tAXAYwKOnA654owcfSm7+lAWuOJOAcUEDHPc0ZIxn9 + aQnpQAhHJxS5ycUnUE0KOM5596AAfypWBLD9abyPc0pJ/OkMchIXntQ/t3pu6gngD05pitrccOv1pTjp + TUHJNDHn8qLitqOPtRgfepuRzTlPammADG4+9BOP6U0cE+lObtx2oDqLg4+tIcDB/DFL1Ge1N68UwQ5e + /tTcEHn8KdjnjvSGgQ4YJHNMzhzmgH5aOuD6UDXUdt+TryKQ54peCtIegNAkK3Rfal7CmjkU6InmgOg1 + ueaB96jjpR0JoGAznAoOTwDRzuJpTgGgBpBXA9adgLx170nJIpTgD+tANgW9aao5J7Gh14GDmnZ7elAd + NBqc049T70iA/QZpWPH88UCe4meaGIwaByKB156elAwHQDpQB8p5pWHHHagHOaBCKRignBFGBn2PNKoB + 5IyKAFzjHvQOMAdqQjkCgHnFAheep+opH67uxpWOAPyoPIAPQUAKoOfYUd8+o/lRzuI/KkVv6igCue57 + 0udydM4pDnJxSVkbAv3c0DAP1oUYx6UY+YD8aA7i7uCKARjBprDk+1Ko70AHfAHTmh+gpw4Iz6U0j8s0 + AtwXA5I54qRgNoxwaYwCsD7UueD7imJ62YDH5U0/y60oGMGmk/jSGhQMDNK2do9qQfcP1pSePagOoEfJ + mk6/L3NKDxSqMcnvTEKAQT70jZBOOgoySP5UA+vQ0ACnJJpcnHWmqPmIo4weKAEC5GTTuMgdqQjCD6UL + ycCgYrAY9cUqYAx60wng09SOmOe1AmtBSB09O1N69OM9BSjqQRSLyKYhdx3e9IhIz70gHWlXOB70hinO + cHikzgevrS7ck89qb0z696AQ4E5z+VGfmzik54x+FJnkZoCw8HB9M0nGTg805FUgk8U3G09eTTF3EKYP + H40pyelHcfypD296Bjgp6Hig5AHt1oBPf8KGOSBxzQIQYOcd6QYOPalPBpACOe3Y0DFft60oPzUpX5Qe + 9M/ixQJaoe4zjv70zpkdyadnp6U1hk5oBdh3tj8aMYOM5z1oI44NIPv85oAd7igk4/nSZx/jQDkGgVhQ + DjNI2dwPalyfX86BzwfyoATOQOeOc05sqlNwF2gcA0snI/GmHVAD2/Oox9/FSKaa33h+VJjXUcTxn07U + 3t6jtS9eOmKU4I56DrQGw3vQrdf5UnegE9B0oGO75I60jjAzSnOf6UHlRTF2G5zSngD3pSmACORimn7t + IB+NqA0jZ2k4pccKOtLIOC350xdRv8Oe1Kn3SaTHyfWlXIoB7EhxwQB700kA4H5Um7I+tNZjwe1FxJEn + VaYoIPtnmlRhn+lK2ST2zTDbQFY0p5yORTc8getLtOTgfnQAHAX+dCY20EY/Gkj6Gn1DoGfl45oHTBoI + BHPHNA96AFB5pVNIegoHHPSgGIDyaU9R0NIRzlfxFGeaAHMRn60gBIzQ3KAjsaUdMe1Augg60p9fSkXo + aT+H3oGOGNuaOvFID8vNCnmgVtxWPNJng+9I/WjnbQO2goXCjFLg4/lSH7vJoU0CHA5BNNA/SlHIJxQP + SgAPUH1pR6U3qfpzRnnI44oCwckn2oHXFKOuKO9AA43D6Uo56UhPb3oXgmgOg7PIB+lIOB7A0ncexzSq + c9elAisR83403POKKKyNx/X8DRlhj880UUCEYbgcDmgcYoooDoIx4+lOwNvv60UUAwY/KPY0hPy+lFFA + DgcjJppUEE9xzRRTBC4IXHfP86TG4YoooDUdtwOaRetFFAu4ucjFBxgHtRRQA1eGNKO3tRRQNjifl6Uy + LO/pxzRRQ90JbMdtA4980p4BoopiBTlvXHrRGpwc/QUUUA+thB0I70gACjJoooGOU4zzQSMkdjyaKKBd + QXHU0BPmBHQUUUaBrqKTg47Z70oAOfU0UUxDO9I3AFFFSykPUE0rgHB44oop9CeojABqUHj6UUUweyFf + v7VH/Hmiikxx2Hds470mQxw3aiigBSV4x0/WgfKaKKYCHvmheg96KKQdA/g5pw4OMUUUAIcjb9KGOU5o + oph2AD5OPrSMvQjk0UUg6i9ByaXjb65oopiEVQMg9T6UzHPf6UUUmUr3YvXmnHGOeMUUUCY5ui4qNjhq + KKbCJIh/KhumBz60UUdCeo126Ainbcrx1oooH0VhCPl96YaKKQ0Oj/8A106TnpRRT6CfxCIvQn/IqTI7 + 9aKKaFLcjY8j+VAwf60UUdR9Bw54pCCMiiimIOc5o7ZoooAXn6U3ndj9KKKARJjOBSMMMQP0oooEJjAp + o6cdKKKBocPu/U0inBOKKKA7iv60IPlxjmiigOgEfJnFC8j3oooDp8xV5GDxmmZx+VFFALqPTsPzpq8H + H4UUUB3F6MR6d6XqQaKKBDSMNx3NPPFFFAPoMY4x705TRRQPof/Z + + + + 17, 17 + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs new file mode 100644 index 000000000..9e28cf6d0 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.cs @@ -0,0 +1,81 @@ +namespace WSClientWin2_sample +{ + partial class Login + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnButton1 = new System.Windows.Forms.Button(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // btnButton1 + // + this.btnButton1.Location = new System.Drawing.Point(118, 12); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.Size = new System.Drawing.Size(75, 44); + this.btnButton1.TabIndex = 2; + this.btnButton1.Text = "ログイン"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 12); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(100, 19); + this.textBox1.TabIndex = 0; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(12, 37); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(100, 19); + this.textBox2.TabIndex = 1; + this.textBox2.UseSystemPasswordChar = true; + // + // Login + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(202, 70); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.btnButton1); + this.Name = "Login"; + this.Text = "login"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs new file mode 100644 index 000000000..94d9d1575 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.cs @@ -0,0 +1,55 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：login +//* クラス日本語名 ：ログイン画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace WSClientWin2_sample +{ + /// login + public partial class Login : MyBaseControllerWin + { + /// コンストラクタ + public Login() + { + InitializeComponent(); + + Program.FlagEnd = true; //フラグ初期化 + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + } + + /// ログイン + /// イベントハンドラの共通引数 + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + MyBaseControllerWin.UserInfo.UserName = this.textBox1.Text; + MyBaseControllerWin.UserInfo.IPAddress = Environment.MachineName; + + Program.FlagEnd = false; // フラグ完了 + this.Close(); + } + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Login.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs new file mode 100644 index 000000000..40289262e --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Program.cs @@ -0,0 +1,130 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：アプリケーションのメイン エントリ ポイント +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Util; +using Touryo.Infrastructure.Public.Util; + +namespace WSClientWin2_sample +{ + /// アプリケーションのメイン エントリ ポイント + static class Program + { + /// 終了するかどうかを表すフラグ + public static bool FlagEnd = true; + + /// + /// アプリケーションのメイン エントリ ポイントです。 + /// + [STAThread] + static void Main() + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // 既定の処理 + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + // UnhandledExceptionイベント・ハンドラを登録する + Thread.GetDomain().UnhandledException += new + UnhandledExceptionEventHandler(Application_UnhandledException); + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // スプラッシュ画面の表示 + Splash.ShowSplash(new Login()); + + // ＜スピンロック＞ + // SleepすればCPUオーバヘッドはほとんど無いが + // Sleep時間を長く、ループ回数を短くする + // ことでよりCPUオーバヘッドを軽減できる。 + + for (int i = 0; i < 30; i++ ) + { + if (Splash.SpinLock) + { + break; // 直ちに抜ける + } + + Thread.Sleep(100); + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 次の画面（ログイン画面）の表示 + Application.Run(Splash.NextForm); + if(Program.FlagEnd) + { + return; // ログインしないで終わった場合 + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 初期化画面の表示 + Application.Run(new ByReturn()); + if (Program.FlagEnd) + { + return; // 初期化しないで終わった場合 + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 業務画面の表示（業務の開始） + Application.Run(new Form0()); + } + + // .NET TIPS > 適切に処理されなかった例外をキャッチするには？ + // http://www.atmarkit.co.jp/fdotnet/dotnettips/320appexception/appexception.html + + /// + /// 未処理例外をキャッチするイベント・ハンドラ + /// + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + RcMyCmnFunction.ShowErrorMessageWin(e.Exception, "Application_ThreadExceptionによる例外通知です。"); + } + + /// + /// 未処理例外をキャッチするイベント・ハンドラ + /// + /// + /// メイン・スレッド以外の例外はUnhandledExceptionでハンドル + /// + public static void Application_UnhandledException(object sender, UnhandledExceptionEventArgs e) + { + Exception ex = e.ExceptionObject as Exception; + if (ex != null) + { + RcMyCmnFunction.ShowErrorMessageWin(ex, "Application_UnhandledExceptionによる例外通知です。"); + } + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs new file mode 100644 index 000000000..56ca97661 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.cs @@ -0,0 +1,60 @@ +namespace WSClientWin2_sample +{ + partial class Splash + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("MS UI Gothic", 64F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); + this.label1.Location = new System.Drawing.Point(15, 93); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(262, 86); + this.label1.TabIndex = 0; + this.label1.Text = "splash"; + // + // Splash + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 273); + this.Controls.Add(this.label1); + this.Name = "Splash"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs new file mode 100644 index 000000000..a71905989 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.cs @@ -0,0 +1,188 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Splash +//* クラス日本語名 ：スプラッシュ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Public.Log; + +namespace WSClientWin2_sample +{ + /// + /// スプラッシュ画面 + /// + /// + /// DOBON.NET > プログラミング道 > .NET Tips + /// > フォーム > スプラッシュウィンドウを表示する + /// http://dobon.net/vb/dotnet/form/splashwindow.html + /// + /// ここでは、フレームワークは使用しない。 + /// + public partial class Splash : Form + { + /// コンストラクタ + public Splash() + { + InitializeComponent(); + + // プロパティの初期化 + this.TopMost = true; + this.ShowInTaskbar = false; + this.FormBorderStyle = FormBorderStyle.None; + this.StartPosition = FormStartPosition.CenterScreen; + + // イベントの設定 + this.Click += new System.EventHandler(Splash.Splash_Click); + this.label1.Click += new System.EventHandler(Splash.Splash_Click); + + // ログの初期化 + LogIF.InfoLog("ACCESS", "Splash"); + } + + /// + /// スプラッシュ画面のクリックイベント + /// + private static void Splash_Click(object sender, EventArgs e) + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // スピンロックを終了させ次画面を表示する。 + Splash._spinLock = true; + } + + #region 静的変数 + + /// 実行済みフラグ + private static bool _hasExecuted = false; + + /// スプラッシュ画面表示スレッド + private static Thread _thread = null; + + /// スピンロック用フラグ + /// volatile:スレッドセーフ + private static volatile bool _spinLock = false; + + /// スピンロック用フラグ（Getter） + public static bool SpinLock + { + get { return Splash._spinLock; } + } + + /// スプラッシュ画面（シングルトン） + /// volatile:スレッドセーフ + private static volatile Splash _splashForm = new Splash(); + + /// 次の画面（シングルトン） + /// volatile:スレッドセーフ + private static volatile Form _nextForm = null; + + /// 次の画面（Getter） + public static Form NextForm + { + get { return Splash._nextForm; } + } + + #endregion + + #region スプラッシュ画面を表示する + + /// スプラッシュ画面を表示する + /// 次の画面 + public static void ShowSplash(Form nextForm) + { + // 主スレッド（スプラッシュ画面を生成していないスレッド） + + // 二回以上は起動できない。 + if (Splash._hasExecuted) + { + return; + } + else + { + Splash._hasExecuted = true; + } + + #region スプラッシュ画面を表示 + + // 次の画面を設定する。 + Splash._nextForm = nextForm; + 　 + // スレッドの作成 + Splash._thread = new Thread( + new ThreadStart(ShowSplashByThread)); + + // スレッドの開始 + Splash._thread.Start(); + + #endregion + } + + /// Thread関数でスプラッシュ画面を表示する。 + private static void ShowSplashByThread() + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // スプラッシュ画面を + + // ・作成 + Splash._splashForm = new Splash(); + + // ・閉じるイベントハンドラを仕掛 + Splash._nextForm.Activated += new EventHandler(Splash.Login_Activated); + + // ・表示 + Application.Run(Splash._splashForm); + } + + #endregion + + #region スプラッシュ画面を閉じる + + /// + /// ログイン画面がアクティブになった時、スプラッシュ画面を閉じる + /// + private static void Login_Activated(object sender, EventArgs e) + { + // 主スレッド（スプラッシュ画面を生成していないスレッド） + + // なので、スプラッシュ画面を閉じるメソッドをInvoke + if (Splash._splashForm != null && !Splash._splashForm.IsDisposed) + { + Splash._splashForm.Invoke(new MethodInvoker(Splash.CloseSplash)); + } + + // nullクリア + Splash._splashForm = null; + Splash._nextForm = null; + Splash._thread = null; + } + + /// スプラッシュ画面を閉じる。 + private static void CloseSplash() + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // なので、スプラッシュ画面をそのまま閉じる + Splash._splashForm.Close(); + } + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs new file mode 100644 index 000000000..5f60f7fc0 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.cs @@ -0,0 +1,247 @@ +namespace WSClientWin2_sample +{ + partial class UserControl3 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region コンポーネント デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserControl3)); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.rbnUCRadioButton2 = new System.Windows.Forms.RadioButton(); + this.pbxUCPictureBox2 = new System.Windows.Forms.PictureBox(); + this.lbxUCListBox2 = new System.Windows.Forms.ListBox(); + this.cbbUCComboBox2 = new System.Windows.Forms.ComboBox(); + this.cbxUCCheckBox2 = new System.Windows.Forms.CheckBox(); + this.btnUCButton2 = new System.Windows.Forms.Button(); + this.rbnUCRadioButton1 = new System.Windows.Forms.RadioButton(); + this.pbxUCPictureBox1 = new System.Windows.Forms.PictureBox(); + this.lbxUCListBox1 = new System.Windows.Forms.ListBox(); + this.cbbUCComboBox1 = new System.Windows.Forms.ComboBox(); + this.cbxUCCheckBox1 = new System.Windows.Forms.CheckBox(); + this.btnUCButton1 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pbxUCPictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbxUCPictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(115, 17); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 28; + this.label2.Text = "メソッドなし"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(17, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(56, 12); + this.label1.TabIndex = 27; + this.label1.Text = "メソッドあり"; + // + // rbnUCRadioButton2 + // + this.rbnUCRadioButton2.AutoSize = true; + this.rbnUCRadioButton2.Location = new System.Drawing.Point(117, 135); + this.rbnUCRadioButton2.Name = "rbnUCRadioButton2"; + this.rbnUCRadioButton2.Size = new System.Drawing.Size(88, 16); + this.rbnUCRadioButton2.TabIndex = 26; + this.rbnUCRadioButton2.TabStop = true; + this.rbnUCRadioButton2.Text = "radioButton2"; + this.rbnUCRadioButton2.UseVisualStyleBackColor = true; + // + // pbxUCPictureBox2 + // + this.pbxUCPictureBox2.ErrorImage = null; + this.pbxUCPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pbxUCPictureBox2.Image"))); + this.pbxUCPictureBox2.Location = new System.Drawing.Point(117, 84); + this.pbxUCPictureBox2.Name = "pbxUCPictureBox2"; + this.pbxUCPictureBox2.Size = new System.Drawing.Size(75, 45); + this.pbxUCPictureBox2.TabIndex = 25; + this.pbxUCPictureBox2.TabStop = false; + // + // lbxUCListBox2 + // + this.lbxUCListBox2.FormattingEnabled = true; + this.lbxUCListBox2.ItemHeight = 12; + this.lbxUCListBox2.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.lbxUCListBox2.Location = new System.Drawing.Point(117, 205); + this.lbxUCListBox2.Name = "lbxUCListBox2"; + this.lbxUCListBox2.Size = new System.Drawing.Size(80, 40); + this.lbxUCListBox2.TabIndex = 24; + // + // cbbUCComboBox2 + // + this.cbbUCComboBox2.FormattingEnabled = true; + this.cbbUCComboBox2.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.cbbUCComboBox2.Location = new System.Drawing.Point(117, 179); + this.cbbUCComboBox2.Name = "cbbUCComboBox2"; + this.cbbUCComboBox2.Size = new System.Drawing.Size(80, 20); + this.cbbUCComboBox2.TabIndex = 23; + // + // cbxUCCheckBox2 + // + this.cbxUCCheckBox2.AutoSize = true; + this.cbxUCCheckBox2.Location = new System.Drawing.Point(117, 157); + this.cbxUCCheckBox2.Name = "cbxUCCheckBox2"; + this.cbxUCCheckBox2.Size = new System.Drawing.Size(80, 16); + this.cbxUCCheckBox2.TabIndex = 22; + this.cbxUCCheckBox2.Text = "checkBox2"; + this.cbxUCCheckBox2.UseVisualStyleBackColor = true; + // + // btnUCButton2 + // + this.btnUCButton2.Location = new System.Drawing.Point(117, 48); + this.btnUCButton2.Name = "btnUCButton2"; + this.btnUCButton2.Size = new System.Drawing.Size(75, 23); + this.btnUCButton2.TabIndex = 21; + this.btnUCButton2.Text = "button2"; + this.btnUCButton2.UseVisualStyleBackColor = true; + // + // rbnUCRadioButton1 + // + this.rbnUCRadioButton1.AutoSize = true; + this.rbnUCRadioButton1.Location = new System.Drawing.Point(19, 135); + this.rbnUCRadioButton1.Name = "rbnUCRadioButton1"; + this.rbnUCRadioButton1.Size = new System.Drawing.Size(88, 16); + this.rbnUCRadioButton1.TabIndex = 20; + this.rbnUCRadioButton1.TabStop = true; + this.rbnUCRadioButton1.Text = "radioButton1"; + this.rbnUCRadioButton1.UseVisualStyleBackColor = true; + // + // pbxUCPictureBox1 + // + this.pbxUCPictureBox1.ErrorImage = null; + this.pbxUCPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pbxUCPictureBox1.Image"))); + this.pbxUCPictureBox1.Location = new System.Drawing.Point(19, 84); + this.pbxUCPictureBox1.Name = "pbxUCPictureBox1"; + this.pbxUCPictureBox1.Size = new System.Drawing.Size(75, 45); + this.pbxUCPictureBox1.TabIndex = 19; + this.pbxUCPictureBox1.TabStop = false; + // + // lbxUCListBox1 + // + this.lbxUCListBox1.FormattingEnabled = true; + this.lbxUCListBox1.ItemHeight = 12; + this.lbxUCListBox1.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.lbxUCListBox1.Location = new System.Drawing.Point(19, 205); + this.lbxUCListBox1.Name = "lbxUCListBox1"; + this.lbxUCListBox1.Size = new System.Drawing.Size(80, 40); + this.lbxUCListBox1.TabIndex = 18; + // + // cbbUCComboBox1 + // + this.cbbUCComboBox1.FormattingEnabled = true; + this.cbbUCComboBox1.Items.AddRange(new object[] { + "あああ", + "いいい", + "ううう", + "えええ"}); + this.cbbUCComboBox1.Location = new System.Drawing.Point(19, 179); + this.cbbUCComboBox1.Name = "cbbUCComboBox1"; + this.cbbUCComboBox1.Size = new System.Drawing.Size(80, 20); + this.cbbUCComboBox1.TabIndex = 17; + // + // cbxUCCheckBox1 + // + this.cbxUCCheckBox1.AutoSize = true; + this.cbxUCCheckBox1.Location = new System.Drawing.Point(19, 157); + this.cbxUCCheckBox1.Name = "cbxUCCheckBox1"; + this.cbxUCCheckBox1.Size = new System.Drawing.Size(80, 16); + this.cbxUCCheckBox1.TabIndex = 16; + this.cbxUCCheckBox1.Text = "checkBox1"; + this.cbxUCCheckBox1.UseVisualStyleBackColor = true; + // + // btnUCButton1 + // + this.btnUCButton1.Location = new System.Drawing.Point(19, 48); + this.btnUCButton1.Name = "btnUCButton1"; + this.btnUCButton1.Size = new System.Drawing.Size(75, 23); + this.btnUCButton1.TabIndex = 15; + this.btnUCButton1.Text = "button1"; + this.btnUCButton1.UseVisualStyleBackColor = true; + // + // UserControl3 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.rbnUCRadioButton2); + this.Controls.Add(this.pbxUCPictureBox2); + this.Controls.Add(this.lbxUCListBox2); + this.Controls.Add(this.cbbUCComboBox2); + this.Controls.Add(this.cbxUCCheckBox2); + this.Controls.Add(this.btnUCButton2); + this.Controls.Add(this.rbnUCRadioButton1); + this.Controls.Add(this.pbxUCPictureBox1); + this.Controls.Add(this.lbxUCListBox1); + this.Controls.Add(this.cbbUCComboBox1); + this.Controls.Add(this.cbxUCCheckBox1); + this.Controls.Add(this.btnUCButton1); + this.Name = "UserControl3"; + this.Size = new System.Drawing.Size(212, 264); + ((System.ComponentModel.ISupportInitialize)(this.pbxUCPictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbxUCPictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.RadioButton rbnUCRadioButton2; + private System.Windows.Forms.PictureBox pbxUCPictureBox2; + private System.Windows.Forms.ListBox lbxUCListBox2; + private System.Windows.Forms.ComboBox cbbUCComboBox2; + private System.Windows.Forms.CheckBox cbxUCCheckBox2; + private System.Windows.Forms.Button btnUCButton2; + private System.Windows.Forms.RadioButton rbnUCRadioButton1; + private System.Windows.Forms.PictureBox pbxUCPictureBox1; + private System.Windows.Forms.ListBox lbxUCListBox1; + private System.Windows.Forms.ComboBox cbbUCComboBox1; + private System.Windows.Forms.CheckBox cbxUCCheckBox1; + private System.Windows.Forms.Button btnUCButton1; + + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs new file mode 100644 index 000000000..56502b097 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.cs @@ -0,0 +1,78 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：UserControl3 +//* クラス日本語名 ：UserControl3 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* +//********************************************************************************** + +using System.Diagnostics; +using System.Windows.Forms; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace WSClientWin2_sample +{ + /// UserControl3 + public partial class UserControl3 : UserControl + { + /// constructor + public UserControl3() + { + InitializeComponent(); + } + + /// UOC_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_btnUCButton1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_btnUCButton1_Click"); + } + + /// UOC_pbxUCPictureBox1_Click + /// RcFxEventArgs + protected void UOC_pbxUCPictureBox1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_pbxUCPictureBox1_Click"); + } + + /// UOC_rbnUCRadioButton1_CheckedChanged + /// RcFxEventArgs + protected void UOC_rbnUCRadioButton1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_rbnUCRadioButton1_CheckedChanged"); + } + + /// UOC_cbxUCCheckBox1_CheckedChanged + /// RcFxEventArgs + protected void UOC_cbxUCCheckBox1_CheckedChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_cbxUCCheckBox1_CheckedChanged"); + } + + /// UOC_cbbUCComboBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_cbbUCComboBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_cbbUCComboBox1_SelectedIndexChanged"); + } + + /// UOC_lbxUCListBox1_SelectedIndexChanged + /// RcFxEventArgs + protected void UOC_lbxUCListBox1_SelectedIndexChanged(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine("UOC_lbxUCListBox1_SelectedIndexChanged"); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs new file mode 100644 index 000000000..e309aac50 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.cs @@ -0,0 +1,58 @@ +namespace WSClientWin2_sample +{ + partial class UserControlChild + { + /// + /// 必要なデザイナー変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースを破棄する場合は true を指定し、その他の場合は false を指定します。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region コンポーネント デザイナーで生成されたコード + + /// + /// デザイナー サポートに必要なメソッドです。このメソッドの内容を + /// コード エディターで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnUCButton1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnUCButton1 + // + this.btnUCButton1.Location = new System.Drawing.Point(3, 3); + this.btnUCButton1.Name = "btnUCButton1"; + this.btnUCButton1.Size = new System.Drawing.Size(144, 23); + this.btnUCButton1.TabIndex = 0; + this.btnUCButton1.Text = "button1"; + this.btnUCButton1.UseVisualStyleBackColor = true; + // + // UserControlChild + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.btnUCButton1); + this.Name = "UserControlChild"; + this.Size = new System.Drawing.Size(150, 30); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button btnUCButton1; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs new file mode 100644 index 000000000..ee427d112 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.cs @@ -0,0 +1,44 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：UserControlChild +//* クラス日本語名 ：UserControlChild +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Diagnostics; +using System.Windows.Forms; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace WSClientWin2_sample +{ + /// UserControlChild + public partial class UserControlChild : UserControl + { + /// constructor + public UserControlChild() + { + InitializeComponent(); + } + + /// UOC_btnUCButton1_Click + /// RcFxEventArgs + protected void UOC_btnUCButton1_Click(RcFxEventArgs rcFxEventArgs) + { + Debug.WriteLine( + (((Control)rcFxEventArgs.Sender).Parent.Parent.Parent).Name + + " : UOC_btnUCButton1_Click"); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs new file mode 100644 index 000000000..9075cfc75 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.cs @@ -0,0 +1,68 @@ +namespace WSClientWin2_sample +{ + partial class UserControlParent + { + /// + /// 必要なデザイナー変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースを破棄する場合は true を指定し、その他の場合は false を指定します。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region コンポーネント デザイナーで生成されたコード + + /// + /// デザイナー サポートに必要なメソッドです。このメソッドの内容を + /// コード エディターで変更しないでください。 + /// + private void InitializeComponent() + { + this.panel1 = new System.Windows.Forms.Panel(); + this.userControlChild = new WSClientWin2_sample.UserControlChild(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Controls.Add(this.userControlChild); + this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(155, 35); + this.panel1.TabIndex = 0; + // + // userControlChild + // + this.userControlChild.Location = new System.Drawing.Point(3, 3); + this.userControlChild.Name = "userControlChild"; + this.userControlChild.Size = new System.Drawing.Size(150, 30); + this.userControlChild.TabIndex = 0; + // + // UserControlParent + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.panel1); + this.Name = "UserControlParent"; + this.Size = new System.Drawing.Size(160, 40); + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private UserControlChild userControlChild; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs new file mode 100644 index 000000000..c307e9666 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.cs @@ -0,0 +1,33 @@ +//********************************************************************************** +//* Windows Forms用 Ｐ層 フレームワーク・テスト アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：UserControlParent +//* クラス日本語名 ：UserControlParent +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System.Windows.Forms; + +namespace WSClientWin2_sample +{ + /// UserControlParent + public partial class UserControlParent : UserControl + { + /// constructor + public UserControlParent() + { + InitializeComponent(); + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj new file mode 100644 index 000000000..0087c5e1a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj @@ -0,0 +1,57 @@ + + + + WinExe + net5.0-windows + true + + + WSClientWin2_sample + WSClientWin2_sample + + + + + + + + + Always + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + Always + + + + + + diff --git a/root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln similarity index 100% rename from root_VS2015/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/appsettings.json new file mode 100644 index 000000000..37f78d997 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/appsettings.json @@ -0,0 +1,32 @@ +{ + // appSettings section + "appSettings": { + + // フレームワークの使用するパラメータ - start + // コントロールのプレフィックス + "FxPrefixOfButton": "btn", + "FxPrefixOfPictureBox": "pbx", + "FxPrefixOfComboBox": "cbb", + "FxPrefixOfListBox": "lbx", + "FxPrefixOfRadioButton": "rbn", + + "FxMaxThreadCount": "3", + + // 共通部品の使用するパラメータ - start + + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // 埋め込まれたリソースの場合 + // "FxLog4NetConfFile": "WSClientWin_sample2.SampleLogConf2CS.xml", + + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + + // コントロールのプレフィックス（追加分） + "FxPrefixOfCheckBox": "cbx" + + // アプリケーションの使用するパラメータ - end + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs new file mode 100644 index 000000000..03cb05b93 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.cs @@ -0,0 +1,78 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：AsyncFunc +//* クラス日本語名 ：サンプル アプリ 非同期処理クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using WSIFType_sample; + +using Touryo.Infrastructure.Business.RichClient.Asynchronous; +using Touryo.Infrastructure.Framework.Transmission; + +namespace WSClientWin_sample +{ + public class AsyncFunc : MyBaseAsyncFunc + { + /// コンストラクタ + /// WPFやWinFormの要素 + public AsyncFunc(object _this) : base(_this) { } + + /// サービスの論理名 + public string LogicalName = ""; + + /// 非同期 + /// 引数 + /// 結果 + /// + /// ここは副スレッドから実行されるので注意。 + /// 非同期処理クラスに非同期処理を定義すると、 + /// メンバ変数を引数として利用できる。 + /// + public object btn6_Exec(object param) + { + // 戻り値（キャスト） + TestParameterValue testParameterValue = (TestParameterValue)param; + + // 戻り値 + TestReturnValue testReturnValue; + + // 呼出し制御部品（スレッドセーフでないため副スレッド内で作る） + CallController callCtrl = new CallController(Program.AccessToken); + + // Invoke + testReturnValue = (TestReturnValue)callCtrl.Invoke( + this.LogicalName, testParameterValue); + + //// 進捗表示のテスト + //this.ChangeProgress = delegate(object o) + //{ + // MessageBox.Show(o.ToString()); + //}; + + //this.ExecChangeProgress("進捗表示"); + + //// 非同期メッセージボックス表示のテスト + //DialogResult dr = this.ShowAsyncMessageBoxWin( + // "メッセージ", "タイトル", MessageBoxButtons.YesNo, MessageBoxIcon.Information); + ////// 非同期メッセージボックス表示のテスト（エラー） + ////System.Windows.MessageBoxResult mr = this.ShowAsyncMessageBoxWPF("メッセージ", "タイトル", + //// System.Windows.MessageBoxButton.YesNo, System.Windows.MessageBoxImage.Information); + + // 結果表示 + return testReturnValue; + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Blue hills.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1a678f29832b6dbab8dc626477d6cbc42665482a GIT binary patch literal 28521 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 W7$KYHyuU;*5HrBLAJ6^!>i+>xlLI>d literal 0 HcmV?d00001 diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs new file mode 100644 index 000000000..8b594d1bf --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.cs @@ -0,0 +1,443 @@ +namespace WSClientWin_sample +{ + partial class Form1 + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.btnButton11 = new System.Windows.Forms.Button(); + this.label14 = new System.Windows.Forms.Label(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.ddlTransmission = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.labelMessage = new System.Windows.Forms.Label(); + this.btnButton10 = new System.Windows.Forms.Button(); + this.btnButton9 = new System.Windows.Forms.Button(); + this.btnButton8 = new System.Windows.Forms.Button(); + this.btnButton7 = new System.Windows.Forms.Button(); + this.btnButton6 = new System.Windows.Forms.Button(); + this.btnButton5 = new System.Windows.Forms.Button(); + this.btnButton4 = new System.Windows.Forms.Button(); + this.btnButton3 = new System.Windows.Forms.Button(); + this.btnButton2 = new System.Windows.Forms.Button(); + this.btnButton1 = new System.Windows.Forms.Button(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.label10 = new System.Windows.Forms.Label(); + this.ddlOrderSequence = new System.Windows.Forms.ComboBox(); + this.label9 = new System.Windows.Forms.Label(); + this.ddlOrderColumn = new System.Windows.Forms.ComboBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.ddlExRollback = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.ddlIso = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.ddlMode2 = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.ddlMode1 = new System.Windows.Forms.ComboBox(); + this.ddlDap = new System.Windows.Forms.ComboBox(); + this.label16 = new System.Windows.Forms.Label(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.btnButton12 = new System.Windows.Forms.Button(); + this.label15 = new System.Windows.Forms.Label(); + this.textBox6 = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // textBox4 + // + resources.ApplyResources(this.textBox4, "textBox4"); + this.textBox4.Name = "textBox4"; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // + // btnButton11 + // + resources.ApplyResources(this.btnButton11, "btnButton11"); + this.btnButton11.Name = "btnButton11"; + this.btnButton11.UseVisualStyleBackColor = true; + // + // label14 + // + resources.ApplyResources(this.label14, "label14"); + this.label14.Name = "label14"; + // + // textBox5 + // + resources.ApplyResources(this.textBox5, "textBox5"); + this.textBox5.Name = "textBox5"; + // + // ddlTransmission + // + this.ddlTransmission.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlTransmission.FormattingEnabled = true; + resources.ApplyResources(this.ddlTransmission, "ddlTransmission"); + this.ddlTransmission.Name = "ddlTransmission"; + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // labelMessage + // + resources.ApplyResources(this.labelMessage, "labelMessage"); + this.labelMessage.Name = "labelMessage"; + // + // btnButton10 + // + resources.ApplyResources(this.btnButton10, "btnButton10"); + this.btnButton10.Name = "btnButton10"; + this.btnButton10.UseVisualStyleBackColor = true; + // + // btnButton9 + // + resources.ApplyResources(this.btnButton9, "btnButton9"); + this.btnButton9.Name = "btnButton9"; + this.btnButton9.UseVisualStyleBackColor = true; + // + // btnButton8 + // + resources.ApplyResources(this.btnButton8, "btnButton8"); + this.btnButton8.Name = "btnButton8"; + this.btnButton8.UseVisualStyleBackColor = true; + // + // btnButton7 + // + resources.ApplyResources(this.btnButton7, "btnButton7"); + this.btnButton7.Name = "btnButton7"; + this.btnButton7.UseVisualStyleBackColor = true; + // + // btnButton6 + // + resources.ApplyResources(this.btnButton6, "btnButton6"); + this.btnButton6.Name = "btnButton6"; + this.btnButton6.UseVisualStyleBackColor = true; + // + // btnButton5 + // + resources.ApplyResources(this.btnButton5, "btnButton5"); + this.btnButton5.Name = "btnButton5"; + this.btnButton5.UseVisualStyleBackColor = true; + // + // btnButton4 + // + resources.ApplyResources(this.btnButton4, "btnButton4"); + this.btnButton4.Name = "btnButton4"; + this.btnButton4.UseVisualStyleBackColor = true; + // + // btnButton3 + // + resources.ApplyResources(this.btnButton3, "btnButton3"); + this.btnButton3.Name = "btnButton3"; + this.btnButton3.UseVisualStyleBackColor = true; + // + // btnButton2 + // + resources.ApplyResources(this.btnButton2, "btnButton2"); + this.btnButton2.Name = "btnButton2"; + this.btnButton2.UseVisualStyleBackColor = true; + // + // btnButton1 + // + resources.ApplyResources(this.btnButton1, "btnButton1"); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + resources.ApplyResources(this.dataGridView1, "dataGridView1"); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 21; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // ddlOrderSequence + // + this.ddlOrderSequence.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlOrderSequence.FormattingEnabled = true; + resources.ApplyResources(this.ddlOrderSequence, "ddlOrderSequence"); + this.ddlOrderSequence.Name = "ddlOrderSequence"; + // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.Name = "label9"; + // + // ddlOrderColumn + // + this.ddlOrderColumn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlOrderColumn.FormattingEnabled = true; + resources.ApplyResources(this.ddlOrderColumn, "ddlOrderColumn"); + this.ddlOrderColumn.Name = "ddlOrderColumn"; + // + // textBox3 + // + resources.ApplyResources(this.textBox3, "textBox3"); + this.textBox3.Name = "textBox3"; + // + // textBox2 + // + resources.ApplyResources(this.textBox2, "textBox2"); + this.textBox2.Name = "textBox2"; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.Name = "label8"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // textBox1 + // + resources.ApplyResources(this.textBox1, "textBox1"); + this.textBox1.Name = "textBox1"; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // ddlExRollback + // + this.ddlExRollback.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlExRollback.FormattingEnabled = true; + resources.ApplyResources(this.ddlExRollback, "ddlExRollback"); + this.ddlExRollback.Name = "ddlExRollback"; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // ddlIso + // + this.ddlIso.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlIso.FormattingEnabled = true; + resources.ApplyResources(this.ddlIso, "ddlIso"); + this.ddlIso.Name = "ddlIso"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // ddlMode2 + // + this.ddlMode2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlMode2.FormattingEnabled = true; + resources.ApplyResources(this.ddlMode2, "ddlMode2"); + this.ddlMode2.Name = "ddlMode2"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // label12 + // + resources.ApplyResources(this.label12, "label12"); + this.label12.Name = "label12"; + // + // ddlMode1 + // + this.ddlMode1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlMode1.FormattingEnabled = true; + resources.ApplyResources(this.ddlMode1, "ddlMode1"); + this.ddlMode1.Name = "ddlMode1"; + // + // ddlDap + // + this.ddlDap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlDap.FormattingEnabled = true; + resources.ApplyResources(this.ddlDap, "ddlDap"); + this.ddlDap.Name = "ddlDap"; + // + // label16 + // + resources.ApplyResources(this.label16, "label16"); + this.label16.Name = "label16"; + // + // textBox7 + // + resources.ApplyResources(this.textBox7, "textBox7"); + this.textBox7.Name = "textBox7"; + // + // btnButton12 + // + resources.ApplyResources(this.btnButton12, "btnButton12"); + this.btnButton12.Name = "btnButton12"; + this.btnButton12.UseVisualStyleBackColor = true; + // + // label15 + // + resources.ApplyResources(this.label15, "label15"); + this.label15.Name = "label15"; + // + // textBox6 + // + resources.ApplyResources(this.textBox6, "textBox6"); + this.textBox6.Name = "textBox6"; + // + // Form1 + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label16); + this.Controls.Add(this.textBox7); + this.Controls.Add(this.btnButton12); + this.Controls.Add(this.label15); + this.Controls.Add(this.textBox6); + this.Controls.Add(this.label11); + this.Controls.Add(this.labelMessage); + this.Controls.Add(this.btnButton10); + this.Controls.Add(this.btnButton9); + this.Controls.Add(this.btnButton8); + this.Controls.Add(this.btnButton7); + this.Controls.Add(this.btnButton6); + this.Controls.Add(this.btnButton5); + this.Controls.Add(this.btnButton4); + this.Controls.Add(this.btnButton3); + this.Controls.Add(this.btnButton2); + this.Controls.Add(this.btnButton1); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.label10); + this.Controls.Add(this.ddlOrderSequence); + this.Controls.Add(this.label9); + this.Controls.Add(this.ddlOrderColumn); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.label8); + this.Controls.Add(this.label7); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.label5); + this.Controls.Add(this.ddlExRollback); + this.Controls.Add(this.label4); + this.Controls.Add(this.ddlIso); + this.Controls.Add(this.label3); + this.Controls.Add(this.ddlMode2); + this.Controls.Add(this.label2); + this.Controls.Add(this.label12); + this.Controls.Add(this.ddlMode1); + this.Controls.Add(this.ddlDap); + this.Controls.Add(this.label6); + this.Controls.Add(this.ddlTransmission); + this.Controls.Add(this.label14); + this.Controls.Add(this.textBox5); + this.Controls.Add(this.btnButton11); + this.Controls.Add(this.label13); + this.Controls.Add(this.textBox4); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "Form1"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Button btnButton11; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.ComboBox ddlTransmission; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label labelMessage; + private System.Windows.Forms.Button btnButton10; + private System.Windows.Forms.Button btnButton9; + private System.Windows.Forms.Button btnButton8; + private System.Windows.Forms.Button btnButton7; + private System.Windows.Forms.Button btnButton6; + private System.Windows.Forms.Button btnButton5; + private System.Windows.Forms.Button btnButton4; + private System.Windows.Forms.Button btnButton3; + private System.Windows.Forms.Button btnButton2; + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.ComboBox ddlOrderSequence; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.ComboBox ddlOrderColumn; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox ddlExRollback; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox ddlIso; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox ddlMode2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.ComboBox ddlMode1; + private System.Windows.Forms.ComboBox ddlDap; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.Button btnButton12; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.TextBox textBox6; + } +} + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs new file mode 100644 index 000000000..a31ff5d13 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.cs @@ -0,0 +1,734 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Form1 +//* クラス日本語名 ：サンプル アプリ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using WSIFType_sample; + +using System; +using System.Data; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Business.RichClient.Asynchronous; +using Touryo.Infrastructure.Business.RichClient.Util; + +using Touryo.Infrastructure.Framework.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Asynchronous; +using Touryo.Infrastructure.Framework.Transmission; +using Touryo.Infrastructure.Framework.Util; + +namespace WSClientWin_sample +{ + /// サンプル アプリ画面 + public partial class Form1 : MyBaseControllerWin + { + /// 呼出し制御部品 + CallController CallCtrl; + + #region 初期処理 + + public Form1() + { + InitializeComponent(); + } + + /// + /// フォームロードのUOCメソッド + /// + protected override void UOC_FormInit() + { + // フォーム初期化（初回ロード）時に実行する処理を実装する + + // TODO: + + // ddlDap + this.ddlDap.Items.Add(new ComboBoxItem("SQL Server / SQL Client", "SQL")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / OLEDB.NET", "OLE")); + this.ddlDap.Items.Add(new ComboBoxItem("Multi-DB / ODCB.NET", "ODB")); + this.ddlDap.Items.Add(new ComboBoxItem("Oracle / ODP.NET", "ODP")); + this.ddlDap.Items.Add(new ComboBoxItem("DB2 / DB2.NET", "DB2")); + this.ddlDap.Items.Add(new ComboBoxItem("HiRDB / HiRDB-DP", "HIR")); + this.ddlDap.Items.Add(new ComboBoxItem("MySQL Cnn/NET", "MCN")); + this.ddlDap.Items.Add(new ComboBoxItem("PostgreSQL / Npgsql", "NPS")); + this.ddlDap.SelectedIndex = 0; + + // ddlMode1 + this.ddlMode1.Items.Add(new ComboBoxItem("個別Ｄａｏ", "individual")); + this.ddlMode1.Items.Add(new ComboBoxItem("共通Ｄａｏ", "common")); + this.ddlMode1.Items.Add(new ComboBoxItem("自動生成Ｄａｏ（更新のみ）", "generate")); + this.ddlMode1.SelectedIndex = 0; + + // ddlMode2 + this.ddlMode2.Items.Add(new ComboBoxItem("静的クエリ", "static")); + this.ddlMode2.Items.Add(new ComboBoxItem("動的クエリ", "dynamic")); + this.ddlMode2.SelectedIndex = 0; + + // ddlIso + this.ddlIso.Items.Add(new ComboBoxItem("ノットコネクト", "NC")); + this.ddlIso.Items.Add(new ComboBoxItem("ノートランザクション", "NT")); + this.ddlIso.Items.Add(new ComboBoxItem("ダーティリード", "RU")); + this.ddlIso.Items.Add(new ComboBoxItem("リードコミット", "RC")); + this.ddlIso.Items.Add(new ComboBoxItem("リピータブルリード", "RR")); + this.ddlIso.Items.Add(new ComboBoxItem("シリアライザブル", "SZ")); + this.ddlIso.Items.Add(new ComboBoxItem("スナップショット", "SS")); + this.ddlIso.Items.Add(new ComboBoxItem("デフォルト", "DF")); + this.ddlIso.SelectedIndex = 1; + + // WSでは使用しない（設定できないので）。 + this.ddlIso.Enabled = false; + + // ddlExRollback + this.ddlExRollback.Items.Add(new ComboBoxItem("正常時", "-")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外", "Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外", "System")); + this.ddlExRollback.Items.Add(new ComboBoxItem("その他、一般的な例外", "Other")); + this.ddlExRollback.Items.Add(new ComboBoxItem("業務例外への振替", "Other-Business")); + this.ddlExRollback.Items.Add(new ComboBoxItem("システム例外への振替", "Other-System")); + this.ddlExRollback.SelectedIndex = 0; + + // ddlTransmission + //this.ddlTransmission.Items.Add(new ComboBoxItem("ASP.NET Webサービス呼出", "testWebService")); + //this.ddlTransmission.Items.Add(new ComboBoxItem("WCF Webサービス呼出", "testWebService2")); + //this.ddlTransmission.Items.Add(new ComboBoxItem("WCF TCPサービス呼出", "testWebService3")); + this.ddlTransmission.Items.Add(new ComboBoxItem("ASP.NET WebAPI呼出", "testWebService4")); + this.ddlTransmission.Items.Add(new ComboBoxItem("インプロセス呼出", "testInProcess")); + this.ddlTransmission.SelectedIndex = 0; + + // ddlOrderColumn + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c1", "c1")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c2", "c2")); + this.ddlOrderColumn.Items.Add(new ComboBoxItem("c3", "c3")); + this.ddlOrderColumn.SelectedIndex = 0; + + // ddlOrderSequence + this.ddlOrderSequence.Items.Add(new ComboBoxItem("ASC", "A")); + this.ddlOrderSequence.Items.Add(new ComboBoxItem("DESC", "D")); + this.ddlOrderSequence.SelectedIndex = 0; + + // 呼出し制御部品 + if (string.IsNullOrEmpty(Program.AccessToken)) + { + this.CallCtrl = new CallController(MyBaseControllerWin.UserInfo); + } + else + { + this.CallCtrl = new CallController(Program.AccessToken); + } + } + + #region コンボボックス用 + + /// コンボボックス用インナークラス + private class ComboBoxItem + { + /// 表示名 + private string m_name = ""; + + /// 値 + private string m_value = ""; + + /// コンストラクタ + public ComboBoxItem(string name, string value) + { + m_name = name; + m_value = value; + } + + /// 表示名 + public string Name + { + get + { + return m_name; + } + } + + /// 値 + public string Value + { + get + { + return m_value; + } + } + + /// + /// オーバーライドしたメソッド + /// これがコンボボックスに表示される + /// + public override string ToString() + { + return m_name; + } + } + + #endregion + + #endregion + + #region ＣＲＵＤ処理メソッド + + #region 参照系 + + /// 件数取得 + /// イベントハンドラの共通引数 + /// + /// 非同期フレームワークを使用してB層の呼び出し処理を非同期化 + /// （非同期実行、結果表示の双方に匿名デリゲードを使用するパターン） + /// + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + // ↓カバレージ上げ + + //// Web認証情報 + //this.CallCtrl.NetworkCredentialToWAS + // = new NetworkCredential("test", "test", "test"); + + //// プロキシ（認証）情報 + //this.CallCtrl.ProxyUrl = "http://xxx.xxx.xxx.xxx:8080"; + //this.CallCtrl.NetworkCredentialToProxy + // = new NetworkCredential("ptest", "ptest", "ptest"); + + // 非同期処理クラスを生成 + // 匿名デリゲードの場合は、ベース２で良い。 + MyBaseAsyncFunc af = new MyBaseAsyncFunc(this); + + // 引数を纏める + af.Parameter = (object)new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectCount", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 画面上のデータは退避する + //（オブジェクトであれば、クローンする。） + string logicalName = ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value; + + // 非同期実行するメソッドを指定（匿名デリゲード） + // ここは副スレッドから実行されるので注意 + // （画面上のメンバに触らないこと！）。 + af.AsyncFunc = delegate(object param) + { + // 引数クラス（キャスト） + TestParameterValue testParameterValue = (TestParameterValue)param; + + // 戻り値 + TestReturnValue testReturnValue; + + // 呼出し制御部品（スレッドセーフでないため副スレッド内で作る） + CallController callCtrl = null; + if (string.IsNullOrEmpty(Program.AccessToken)) + { + callCtrl = new CallController(MyBaseControllerWin.UserInfo); + } + else + { + callCtrl = new CallController(Program.AccessToken); + } + + // Invoke + testReturnValue = (TestReturnValue)callCtrl.Invoke( + logicalName, testParameterValue); + + //// 進捗表示のテスト + //af.ChangeProgress = delegate(object o) + //{ + // MessageBox.Show(o.ToString()); + //}; + + //af.ExecChangeProgress("進捗表示"); + + //// 非同期メッセージボックス表示のテスト + //DialogResult dr = af.ShowAsyncMessageBoxWin( + // "メッセージ", "タイトル", MessageBoxButtons.YesNo, MessageBoxIcon.Information); + //// 非同期メッセージボックス表示のテスト（エラー） + //System.Windows.MessageBoxResult mr = af.ShowAsyncMessageBoxWPF("メッセージ", "タイトル", + // System.Windows.MessageBoxButton.YesNo, System.Windows.MessageBoxImage.Information); + + // 結果表示 + return testReturnValue; + }; + + // 結果表示のメソッドを指定（匿名デリゲード） + // このメソッドは必ず主スレッドで実行される。 + // （画面上のメンバを更新できる！）。 + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + RcMyCmnFunction.ShowErrorMessageWin((Exception)retVal, "非同期処理で例外発生！"); + } + else + { + // 正常時 + + // 戻り値（キャスト） + TestReturnValue testReturnValue = (TestReturnValue)retVal; + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.labelMessage.Text = testReturnValue.Obj.ToString() + "件のデータがあります"; + } + } + }; + + // 非同期実行する。 + if (!af.Start()) + { + MessageBox.Show("別の非同期処理が実行中です。"); + } + } + + /// 一覧取得（dt） + /// イベントハンドラの共通引数 + protected void UOC_btnButton2_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DT", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = testReturnValue.Obj; + } + } + + /// 一覧取得（ds） + /// イベントハンドラの共通引数 + protected void UOC_btnButton3_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DS", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = ((DataSet)testReturnValue.Obj).Tables[0]; + } + } + + /// 一覧取得（dr） + /// イベントハンドラの共通引数 + protected void UOC_btnButton4_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DR", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = testReturnValue.Obj; + } + } + + /// 一覧取得（動的sql） + /// イベントハンドラの共通引数 + protected void UOC_btnButton5_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "SelectAll_DSQL", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 動的SQLの要素を設定 + testParameterValue.OrderColumn = ((ComboBoxItem)this.ddlOrderColumn.SelectedItem).Value; + testParameterValue.OrderSequence = ((ComboBoxItem)this.ddlOrderSequence.SelectedItem).Value; + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.dataGridView1.DataSource = testReturnValue.Obj; + } + } + + /// 参照処理 + /// イベントハンドラの共通引数 + /// + /// 非同期フレームワークを使用してB層の呼び出し処理を非同期化 + /// （結果表示にだけ匿名デリゲードを使用するパターン） + /// + protected void UOC_btnButton6_Click(RcFxEventArgs rcFxEventArgs) + { + // 非同期処理クラスを生成 + AsyncFunc af = new AsyncFunc(this); + + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Select", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + + // 引数を非同期処理クラスに設定 + af.Parameter = testParameterValue; + + // 画面上のデータは退避する（オブジェクトであれば、クローンする。） + af.LogicalName = ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value; + + // 非同期実行するメソッドを指定 + // ここは副スレッドから実行されるので注意。 + af.AsyncFunc = new BaseAsyncFunc.AsyncFuncDelegate(af.btn6_Exec); + + // 結果表示のメソッドを指定（匿名デリゲード） + // このメソッドは必ず主スレッドで実行される。 + af.SetResult = delegate(object retVal) + { + if (retVal is Exception) + { + // 例外発生時 + RcMyCmnFunction.ShowErrorMessageWin((Exception)retVal, "非同期処理で例外発生！"); + } + else + { + // 正常時 + + // 戻り値（キャスト） + TestReturnValue testReturnValue = (TestReturnValue)retVal; + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.textBox1.Text = testReturnValue.ShipperID.ToString(); + this.textBox2.Text = testReturnValue.CompanyName; + this.textBox3.Text = testReturnValue.Phone; + } + } + }; + + // 非同期実行する。 + if (!af.Start()) + { + MessageBox.Show("別の非同期処理が実行中です。"); + } + } + + #endregion + + #region 更新系 + + /// 追加処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton7_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Insert", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.labelMessage.Text = testReturnValue.Obj.ToString() + "件追加"; + } + } + + /// 更新処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton8_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Update", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(this.textBox1.Text); + testParameterValue.CompanyName = this.textBox2.Text; + testParameterValue.Phone = this.textBox3.Text; + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.labelMessage.Text = testReturnValue.Obj.ToString() + "件更新"; + } + } + + /// 削除処理 + /// イベントハンドラの共通引数 + protected void UOC_btnButton9_Click(RcFxEventArgs rcFxEventArgs) + { + // 引数クラスを生成 + // 下位（Ｂ・Ｄ層）は、テスト クラスを流用する + TestParameterValue testParameterValue + = new TestParameterValue( + this.Name, rcFxEventArgs.ControlName, "Delete", + ((ComboBoxItem)this.ddlDap.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode1.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlMode2.SelectedItem).Value + "%" + + ((ComboBoxItem)this.ddlExRollback.SelectedItem).Value, + MyBaseControllerWin.UserInfo); + + // 情報の設定 + testParameterValue.ShipperID = int.Parse(textBox1.Text); + + // 戻り値 + TestReturnValue testReturnValue; + + // Invoke + testReturnValue = (TestReturnValue)this.CallCtrl.Invoke( + ((ComboBoxItem)this.ddlTransmission.SelectedItem).Value, testParameterValue); + + // 結果表示するメッセージ エリア + this.labelMessage.Text = ""; + + if (testReturnValue.ErrorFlag == true) + { + // 結果（業務続行可能なエラー） + this.labelMessage.Text = "ErrorMessageID:" + testReturnValue.ErrorMessageID + "\r\n"; + this.labelMessage.Text += "ErrorMessage:" + testReturnValue.ErrorMessage + "\r\n"; + this.labelMessage.Text += "ErrorInfo:" + testReturnValue.ErrorInfo + "\r\n"; + } + else + { + // 結果（正常系） + this.labelMessage.Text = testReturnValue.Obj.ToString() + "件削除"; + } + } + + #endregion + + #endregion + + #region その他 + + /// クリア + /// イベントハンドラの共通引数 + protected void UOC_btnButton10_Click(RcFxEventArgs rcFxEventArgs) + { + this.dataGridView1.DataSource = null; + } + + /// メッセージ取得（埋め込まれたリソース対応） + /// イベントハンドラの共通引数 + protected void UOC_btnButton11_Click(RcFxEventArgs rcFxEventArgs) + { + this.textBox5.Text = GetMessage.GetMessageDescription(this.textBox4.Text); + } + + /// 共有情報取得（埋め込まれたリソース対応） + /// イベントハンドラの共通引数 + protected void UOC_btnButton12_Click(RcFxEventArgs rcFxEventArgs) + { + this.textBox7.Text = GetSharedProperty.GetSharedPropertyValue(this.textBox6.Text); + } + + //private void button12_Click(object sender, EventArgs e) + //{ + // // EmbeddedResourceLoader.Existsのテスト + // // ・あり：false + // MessageBox.Show(EmbeddedResourceLoader.Exists("WSClientWin_sample.TMProtocolDefinition.xml", false).ToString()); + // // ・なし：false + // MessageBox.Show(EmbeddedResourceLoader.Exists("WSClientWin_sample.TMProtocolDefinition.xmla", false).ToString()); + // // ・あり：true + // MessageBox.Show(EmbeddedResourceLoader.Exists("WSClientWin_sample.TMProtocolDefinition.xml", true).ToString()); + // // ・なし：true + // MessageBox.Show(EmbeddedResourceLoader.Exists("WSClientWin_sample.TMProtocolDefinition.xmla", true).ToString()); + + // // EmbeddedResourceLoader.LoadAsStringのテスト + // MessageBox.Show( + // EmbeddedResourceLoader.LoadAsString( + // "WSClientWin_sample.TMProtocolDefinition.xml", + // Encoding.GetEncoding(CustomEncode.shift_jis))); + + // // EmbeddedResourceLoader.LoadXMLAsStringのテスト + // MessageBox.Show( + // EmbeddedResourceLoader.LoadXMLAsString( + // "WSClientWin_sample.TMProtocolDefinition.xml")); + //} + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx new file mode 100644 index 000000000..6187b4fea --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx @@ -0,0 +1,1311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 83, 510 + + + 100, 19 + + + + 22 + + + textBox4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 44 + + + True + + + + NoControl + + + 10, 513 + + + 67, 12 + + + 38 + + + メッセージID： + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 43 + + + NoControl + + + 189, 508 + + + 42, 23 + + + 23 + + + → + + + btnButton11 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 42 + + + True + + + NoControl + + + 237, 513 + + + 56, 12 + + + 41 + + + メッセージ： + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 40 + + + 299, 510 + + + 439, 19 + + + 24 + + + textBox5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 41 + + + 13, 216 + + + 250, 20 + + + 6 + + + ddlTransmission + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 39 + + + True + + + NoControl + + + 11, 201 + + + 53, 12 + + + 43 + + + 通信制御 + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 38 + + + True + + + NoControl + + + 11, 415 + + + 59, 12 + + + 76 + + + 処理結果： + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + + + NoControl + + + 109, 415 + + + 23, 12 + + + 75 + + + *** + + + labelMessage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + NoControl + + + 275, 375 + + + 464, 23 + + + 74 + + + クリア + + + btnButton10 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + NoControl + + + 451, 472 + + + 140, 23 + + + 73 + + + 削除 + + + btnButton9 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + NoControl + + + 305, 472 + + + 140, 23 + + + 72 + + + 更新 + + + btnButton8 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + NoControl + + + 159, 472 + + + 140, 23 + + + 71 + + + 追加 + + + btnButton7 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + NoControl + + + 13, 472 + + + 140, 23 + + + 70 + + + 一件参照（非同期化） + + + btnButton6 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + NoControl + + + 597, 443 + + + 140, 23 + + + 69 + + + 一覧取得（動的SQL） + + + btnButton5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + NoControl + + + 451, 443 + + + 140, 23 + + + 68 + + + 一覧取得（dr） + + + btnButton4 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + NoControl + + + 305, 443 + + + 140, 23 + + + 67 + + + 一覧取得（ds） + + + btnButton3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + NoControl + + + 159, 443 + + + 140, 23 + + + 66 + + + 一覧取得（dt） + + + btnButton2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + NoControl + + + 13, 443 + + + 140, 23 + + + 65 + + + 件数取得（非同期化） + + + btnButton1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + 275, 11 + + + 464, 358 + + + 64 + + + dataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + + NoControl + + + 11, 364 + + + 59, 12 + + + 63 + + + 昇順・降順 + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + 13, 379 + + + 250, 20 + + + 62 + + + ddlOrderSequence + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + True + + + NoControl + + + 11, 322 + + + 84, 12 + + + 61 + + + 並び替え対象列 + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + 13, 337 + + + 250, 20 + + + 60 + + + ddlOrderColumn + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + 111, 293 + + + 152, 19 + + + 59 + + + textBox3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 22 + + + 111, 272 + + + 152, 19 + + + 58 + + + textBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + True + + + NoControl + + + 11, 296 + + + 42, 12 + + + 57 + + + Phone： + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + True + + + NoControl + + + 11, 275 + + + 87, 12 + + + 56 + + + CompanyName： + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + True + + + NoControl + + + 11, 255 + + + 60, 12 + + + 55 + + + ShipperID： + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + 111, 252 + + + 152, 19 + + + 54 + + + textBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + True + + + NoControl + + + 11, 163 + + + 258, 12 + + + 53 + + + コミット、ロールバックを設定（例外発生時、ロールバック + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 28 + + + 13, 178 + + + 250, 20 + + + 52 + + + ddlExRollback + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 29 + + + True + + + NoControl + + + 11, 125 + + + 91, 12 + + + 51 + + + 分離レベルを選択 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 30 + + + 13, 140 + + + 250, 20 + + + 50 + + + ddlIso + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 31 + + + True + + + NoControl + + + 11, 87 + + + 252, 12 + + + 49 + + + 静的、動的のクエリ モードを選択（共通Dao選択時） + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 32 + + + 13, 102 + + + 250, 20 + + + 48 + + + ddlMode2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 33 + + + True + + + NoControl + + + 11, 49 + + + 151, 12 + + + 47 + + + 個別、共通のＤａｏ種別を選択 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 34 + + + True + + + NoControl + + + 13, 11 + + + 237, 12 + + + 46 + + + データアクセス制御クラス（データプロバイダ）を選択 + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 35 + + + 13, 64 + + + 250, 20 + + + 45 + + + ddlMode1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 36 + + + 13, 26 + + + 250, 20 + + + 44 + + + ddlDap + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 37 + + + True + + + NoControl + + + 237, 538 + + + 23, 12 + + + 81 + + + 値： + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 299, 535 + + + 439, 19 + + + 79 + + + textBox7 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 189, 533 + + + 42, 23 + + + 78 + + + → + + + btnButton12 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + NoControl + + + 10, 538 + + + 31, 12 + + + 80 + + + キー： + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 83, 535 + + + 100, 19 + + + 77 + + + textBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 6, 12 + + + 750, 565 + + + Form1 + + + Form1 + + + Touryo.Infrastructure.Business.RichClient.Presentation.MyBaseControllerWin, Business.RichClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs new file mode 100644 index 000000000..a75ff9c99 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.cs @@ -0,0 +1,93 @@ +namespace WSClientWin_sample +{ + partial class Login + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.btnButton1 = new System.Windows.Forms.Button(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.btnButton2 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnButton1 + // + this.btnButton1.Location = new System.Drawing.Point(118, 12); + this.btnButton1.Name = "btnButton1"; + this.btnButton1.Size = new System.Drawing.Size(75, 44); + this.btnButton1.TabIndex = 2; + this.btnButton1.Text = "ログイン"; + this.btnButton1.UseVisualStyleBackColor = true; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 12); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(100, 19); + this.textBox1.TabIndex = 0; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(12, 37); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(100, 19); + this.textBox2.TabIndex = 1; + this.textBox2.UseSystemPasswordChar = true; + // + // btnButton2 + // + this.btnButton2.Location = new System.Drawing.Point(199, 12); + this.btnButton2.Name = "btnButton2"; + this.btnButton2.Size = new System.Drawing.Size(75, 44); + this.btnButton2.TabIndex = 3; + this.btnButton2.Text = "外部ログイン"; + this.btnButton2.UseVisualStyleBackColor = true; + // + // Login + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(285, 78); + this.Controls.Add(this.btnButton2); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.btnButton1); + this.Name = "Login"; + this.Text = "login"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnButton1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Button btnButton2; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs new file mode 100644 index 000000000..81d428c4d --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.cs @@ -0,0 +1,121 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Login +//* クラス日本語名 ：ログイン画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +using System.Net.Http; + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +using Touryo.Infrastructure.Framework.Authentication; +using Touryo.Infrastructure.Business.RichClient.Presentation; +using Touryo.Infrastructure.Framework.RichClient.Presentation; + +namespace WSClientWin_sample +{ + /// Login + public partial class Login : MyBaseControllerWin + { + /// コンストラクタ + public Login() + { + InitializeComponent(); + + Program.FlagEnd = true; //フラグ初期化 + } + + /// フォームロードのUOCメソッド + protected override void UOC_FormInit() + { + } + + /// ログイン + /// イベントハンドラの共通引数 + protected void UOC_btnButton1_Click(RcFxEventArgs rcFxEventArgs) + { + MyBaseControllerWin.UserInfo.UserName = this.textBox1.Text; + MyBaseControllerWin.UserInfo.IPAddress = Environment.MachineName; + + Program.FlagEnd = false; // フラグ完了 + this.Close(); + } + + /// 外部ログイン + /// イベントハンドラの共通引数 + protected void UOC_btnButton2_Click(RcFxEventArgs rcFxEventArgs) + { + string access_token = this.ExLogin(this.textBox1.Text, this.textBox2.Text).Result; + if (!string.IsNullOrEmpty(access_token)) + { + MyBaseControllerWin.UserInfo.UserName = this.textBox1.Text; + MyBaseControllerWin.UserInfo.IPAddress = Environment.MachineName; + + Program.FlagEnd = false; // フラグ完了 + Program.AccessToken = access_token; // AccessToken + this.Close(); + } + } + + /// 外部ログイン + /// string + /// string + /// access_token + private async Task ExLogin(string userId, string password) + { + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + string response = await OAuth2AndOIDCClient.ResourceOwnerPasswordCredentialsGrantAsync( + new Uri("https://localhost:44300/MultiPurposeAuthSite/token"), + OAuth2AndOIDCParams.ClientID, OAuth2AndOIDCParams.ClientSecret, + userId, password, "profile email phone address roles").ConfigureAwait(false); + + // access_tokenを取得し、検証 + Dictionary dic = JsonConvert.DeserializeObject>(response); + + // access_tokenの検証コード + if (dic.ContainsKey("access_token")) + { + string access_token = dic["access_token"]; + + string sub = ""; + List roles = null; + List scopes = null; + JObject jobj = null; + + if (AccessToken.Verify(access_token, out sub, out roles, out scopes, out jobj)) + { + // ログインに成功 + return access_token; + } + else + { + // ログインに失敗 + return ""; + } + } + else + { + // ログインに失敗 + return ""; + } + } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs new file mode 100644 index 000000000..2cd856a93 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Program.cs @@ -0,0 +1,122 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：アプリケーションのメイン エントリ ポイント +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Business.RichClient.Util; +using Touryo.Infrastructure.Public.Util; + +namespace WSClientWin_sample +{ + /// アプリケーションのメイン エントリ ポイント + static class Program + { + /// AccessToken + public static string AccessToken = ""; + + /// 終了するかどうかを表すフラグ + public static bool FlagEnd = true; + + /// + /// アプリケーションのメイン エントリ ポイントです。 + /// + [STAThread] + static void Main() + { + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); + + // 既定の処理 + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + // UnhandledExceptionイベント・ハンドラを登録する + Thread.GetDomain().UnhandledException += new + UnhandledExceptionEventHandler(Application_UnhandledException); + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // スプラッシュ画面の表示 + Splash.ShowSplash(new Login()); + + // ＜スピンロック＞ + // SleepすればCPUオーバヘッドはほとんど無いが + // Sleep時間を長く、ループ回数を短くする + // ことでよりCPUオーバヘッドを軽減できる。 + + for (int i = 0; i < 30; i++ ) + { + if (Splash.SpinLock) + { + break; // 直ちに抜ける + } + + Thread.Sleep(100); + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 次の画面（ログイン画面）の表示 + Application.Run(Splash.NextForm); + if(Program.FlagEnd) + { + return; // ログインしないで終わった場合 + } + + // ThreadExceptionイベント・ハンドラを登録する + Application.ThreadException += new + ThreadExceptionEventHandler(Application_ThreadException); + + // 業務画面の表示（業務の開始） + Application.Run(new Form1()); + } + + // .NET TIPS > 適切に処理されなかった例外をキャッチするには？ + // http://www.atmarkit.co.jp/fdotnet/dotnettips/320appexception/appexception.html + + /// + /// 未処理例外をキャッチするイベント・ハンドラ + /// + public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) + { + RcMyCmnFunction.ShowErrorMessageWin(e.Exception, "Application_ThreadExceptionによる例外通知です。"); + } + + /// + /// 未処理例外をキャッチするイベント・ハンドラ + /// + /// + /// メイン・スレッド以外の例外はUnhandledExceptionでハンドル + /// + public static void Application_UnhandledException(object sender, UnhandledExceptionEventArgs e) + { + Exception ex = e.ExceptionObject as Exception; + if (ex != null) + { + RcMyCmnFunction.ShowErrorMessageWin(ex, "Application_UnhandledExceptionによる例外通知です。"); + } + } + } +} diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs new file mode 100644 index 000000000..f64c31c6c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.cs @@ -0,0 +1,60 @@ +namespace WSClientWin_sample +{ + partial class Splash + { + /// + /// 必要なデザイナ変数です。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 使用中のリソースをすべてクリーンアップします。 + /// + /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows フォーム デザイナで生成されたコード + + /// + /// デザイナ サポートに必要なメソッドです。このメソッドの内容を + /// コード エディタで変更しないでください。 + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("MS UI Gothic", 64F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); + this.label1.Location = new System.Drawing.Point(15, 93); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(262, 86); + this.label1.TabIndex = 0; + this.label1.Text = "splash"; + // + // Splash + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 273); + this.Controls.Add(this.label1); + this.Name = "Splash"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs new file mode 100644 index 000000000..4ce71e0e1 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.cs @@ -0,0 +1,188 @@ +//********************************************************************************** +//* ３層型 サンプル アプリ画面 +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Splash +//* クラス日本語名 ：スプラッシュ画面 +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Threading; +using System.Windows.Forms; + +using Touryo.Infrastructure.Public.Log; + +namespace WSClientWin_sample +{ + /// + /// スプラッシュ画面 + /// + /// + /// DOBON.NET > プログラミング道 > .NET Tips + /// > フォーム > スプラッシュウィンドウを表示する + /// http://dobon.net/vb/dotnet/form/splashwindow.html + /// + /// ここでは、フレームワークは使用しない。 + /// + public partial class Splash : Form + { + /// コンストラクタ + public Splash() + { + InitializeComponent(); + + // プロパティの初期化 + this.TopMost = true; + this.ShowInTaskbar = false; + this.FormBorderStyle = FormBorderStyle.None; + this.StartPosition = FormStartPosition.CenterScreen; + + // イベントの設定 + this.Click += new System.EventHandler(Splash.Splash_Click); + this.label1.Click += new System.EventHandler(Splash.Splash_Click); + + // ログの初期化 + LogIF.InfoLog("ACCESS", "Splash"); + } + + /// + /// スプラッシュ画面のクリックイベント + /// + private static void Splash_Click(object sender, EventArgs e) + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // スピンロックを終了させ次画面を表示する。 + Splash._spinLock = true; + } + + #region 静的変数 + + /// 実行済みフラグ + private static bool _hasExecuted = false; + + /// スプラッシュ画面表示スレッド + private static Thread _thread = null; + + /// スピンロック用フラグ + /// volatile:スレッドセーフ + private static volatile bool _spinLock = false; + + /// スピンロック用フラグ（Getter） + public static bool SpinLock + { + get { return Splash._spinLock; } + } + + /// スプラッシュ画面（シングルトン） + /// volatile:スレッドセーフ + private static volatile Splash _splashForm = new Splash(); + + /// 次の画面（シングルトン） + /// volatile:スレッドセーフ + private static volatile Form _nextForm = null; + + /// 次の画面（Getter） + public static Form NextForm + { + get { return Splash._nextForm; } + } + + #endregion + + #region スプラッシュ画面を表示する + + /// スプラッシュ画面を表示する + /// 次の画面 + public static void ShowSplash(Form nextForm) + { + // 主スレッド（スプラッシュ画面を生成していないスレッド） + + // 二回以上は起動できない。 + if (Splash._hasExecuted) + { + return; + } + else + { + Splash._hasExecuted = true; + } + + #region スプラッシュ画面を表示 + + // 次の画面を設定する。 + Splash._nextForm = nextForm; + 　 + // スレッドの作成 + Splash._thread = new Thread( + new ThreadStart(ShowSplashByThread)); + + // スレッドの開始 + Splash._thread.Start(); + + #endregion + } + + /// Thread関数でスプラッシュ画面を表示する。 + private static void ShowSplashByThread() + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // スプラッシュ画面を + + // ・作成 + Splash._splashForm = new Splash(); + + // ・閉じるイベントハンドラを仕掛 + Splash._nextForm.Activated += new EventHandler(Splash.Login_Activated); + + // ・表示 + Application.Run(Splash._splashForm); + } + + #endregion + + #region スプラッシュ画面を閉じる + + /// + /// ログイン画面がアクティブになった時、スプラッシュ画面を閉じる + /// + private static void Login_Activated(object sender, EventArgs e) + { + // 主スレッド（スプラッシュ画面を生成していないスレッド） + + // なので、スプラッシュ画面を閉じるメソッドをInvoke + if (Splash._splashForm != null && !Splash._splashForm.IsDisposed) + { + Splash._splashForm.Invoke(new MethodInvoker(Splash.CloseSplash)); + } + + // nullクリア + Splash._splashForm = null; + Splash._nextForm = null; + Splash._thread = null; + } + + /// スプラッシュ画面を閉じる。 + private static void CloseSplash() + { + // 副スレッド（スプラッシュ画面を生成したスレッド） + + // なので、スプラッシュ画面をそのまま閉じる + Splash._splashForm.Close(); + } + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml rename to root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj new file mode 100644 index 000000000..cfb7c58ad --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj @@ -0,0 +1,90 @@ + + + + WinExe + net5.0-windows + true + + + WSClientWin_sample + WSClientWin_sample + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + ..\..\Build\net5.0\WSIFType_sample.dll + + + ..\..\Build\net5.0\WSServer_sample.dll + + + + + + Always + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln new file mode 100644 index 000000000..71fa00c42 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -0,0 +1,62 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29326.143 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebServiceCore", "..\..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|.NET = Debug|.NET + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 + Release|.NET = Release|.NET + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|.NET.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|x86.ActiveCfg = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Debug|x86.Build.0 = Debug|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|.NET.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Any CPU.Build.0 = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|x86.ActiveCfg = Release|Any CPU + {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|x86.Build.0 = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|.NET.ActiveCfg = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|.NET.Build.0 = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|x86.ActiveCfg = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Debug|x86.Build.0 = Debug|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|.NET.ActiveCfg = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|.NET.Build.0 = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|Any CPU.Build.0 = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|x86.ActiveCfg = Release|Any CPU + {C24BC2FA-D423-4F0F-B2B0-E647B621683D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E5A208AB-8769-4E30-AFCE-AD6A551A1AC0} + EndGlobalSection + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json new file mode 100644 index 000000000..7e3d73853 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json @@ -0,0 +1,87 @@ +{ + // appSettings section + "appSettings": { + + // フレームワークの使用するパラメータ - start + // コントロールのプレフィックス + "FxPrefixOfButton": "btn", + "FxPrefixOfPictureBox": "pbx", + "FxPrefixOfComboBox": "cbb", + "FxPrefixOfListBox": "lbx", + "FxPrefixOfRadioButton": "rbn", + + // Webサービスの名前解決定義へのパス + + // リソース ファイルの場合 + // In case of using IIS + //"FxXMLTMProtocolDefinition": "TMProtocolDefinition.xml", + // In case of using IIS Express + "FxXMLTMProtocolDefinition": "TMProtocolDefinition2.xml", + "FxXMLTMInProcessDefinition": "TMInProcessDefinition.xml", + + // 埋め込まれたリソースの場合 + // In case of using IIS + //"FxXMLTMProtocolDefinition": "WSClientWin_sample.TMProtocolDefinition.xml", + // In case of using IIS Express + //"FxXMLTMProtocolDefinition": "WSClientWin_sample.TMProtocolDefinition2.xml", + //"FxXMLTMInProcessDefinition": "WSClientWin_sample.TMInProcessDefinition.xml", + + // その他、定義ファイルへのパス + + // リソース ファイルの場合 + "FxXMLMSGDefinition": "MSGDefinition.xml", + "FxXMLSPDefinition": "SPDefinition.xml", + + // 埋め込まれたリソースの場合 + //"FxXMLMSGDefinition": "WSClientWin_sample.MSGDefinition.xml", + //"FxXMLSPDefinition": "WSClientWin_sample.SPDefinition.xml", + // フレームワークの使用するパラメータ - end + + // 共通部品の使用するパラメータ - start + // Log4Netのコンフィグファイルへのパス + // リソース ファイルの場合 + // "FxLog4NetConfFile": "SampleLogConf2CS.xml", + // 埋め込まれたリソースの場合 + "FxLog4NetConfFile": "WSClientWin_sample.SampleLogConf2CS.xml", + // Ｄ層のパフォーマンスログ出力機能のon・off + "FxSqlTraceLog": "on", + // Ｄ層のSQL文キャッシュ機能のon・off + // 開発フェーズのことを考慮して、デフォルトoffに設定 + "FxSqlCacheSwitch": "off", + // Ｄ層のSQLロード時のエンコーディングを指定（shift_jis、utf-8.etc） + "FxSqlEncoding": "utf-8", + // Ｄ層のコマンド タイムアウト値を指定（秒） + "FxSqlCommandTimeout": "30", + // 共通部品の使用するパラメータ - end + + // アプリケーションの使用するパラメータ - start + + // OAuth2, OIDC認証 + "SpRp_Isser": "https://ssoauth.opentouryo.com", + "OAuth2AndOidcClientID": "b6b393fe861b430eb4ee061006826b03", + "OAuth2AndOidcSecret": "p2RgAFKF-JaF0A9F1tyDXp4wMq-uQZYyvTBM8wr_v8g", + "SpRp_RsaCerFilePath": "C:/root/files/resource/X509/SHA256RSA_Server.cer", + "JwkSetUri": "https://localhost:44300/MultiPurposeAuthSite/jwkcerts/", + + // SQLファイルファイル（フォルダ）へのパス + "SqlTextFilePath": "C:/root/files/resource/Sql", + // コントロールのプレフィックス（追加分） + "FxPrefixOfCheckBox": "cbx" + // アプリケーションの使用するパラメータ - end + }, + + // 2層C/S用（Windows） + // connectionStrings section + "connectionStrings": { + // SQL Server / SQL Client用 + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + // Multi-DB / ODCB.NET用 + "ConnectionString_ODBC": "Dsn=odbc_test1", + // Oracle / ODP.NET用 + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + // MySQL / MySQL Connector/NET用 + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + // PostgreSQL / Npgsql用 + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestParameterValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestParameterValue.cs new file mode 100644 index 000000000..8a8e36ef0 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestParameterValue.cs @@ -0,0 +1,62 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestParameterValue +//* クラス日本語名 ：テスト用の引数クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using Touryo.Infrastructure.Business.Common; +using Touryo.Infrastructure.Business.Util; + +namespace WSIFType_sample +{ + /// + /// TestParameterValue の概要の説明です + /// + /// シリアライズ可能にする（WS対応） + [Serializable()] + public class TestParameterValue : MyParameterValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + + /// OrderColumn + public string OrderColumn; + + /// OrderSequence + public string OrderSequence; + + #region コンストラクタ + + /// コンストラクタ + public TestParameterValue(string screenId, string controlId, string methodName, string actionType, MyUserInfo user) + : base(screenId, controlId, methodName, actionType, user) + { + // Baseのコンストラクタに引数を渡すために必要。 + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestReturnValue.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestReturnValue.cs new file mode 100644 index 000000000..1b3cb8a7c --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/TestReturnValue.cs @@ -0,0 +1,44 @@ +//********************************************************************************** +//* フレームワーク・テストクラス +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：TestReturnValue +//* クラス日本語名 ：テスト用の戻り値クラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using Touryo.Infrastructure.Business.Common; + +namespace WSIFType_sample +{ + /// + /// TestReturnValue の概要の説明です + /// + /// シリアライズ可能にする（WS対応） + [Serializable()] + public class TestReturnValue : MyReturnValue + { + /// 汎用エリア + public object Obj; + + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj new file mode 100644 index 000000000..3c921ecd7 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj @@ -0,0 +1,23 @@ + + + + net5.0 + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Business/LayerB.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Business/LayerB.cs new file mode 100644 index 000000000..83878008a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Business/LayerB.cs @@ -0,0 +1,847 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｂ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerB +//* クラス日本語名 ：Ｂ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using WSIFType_sample; +using WSServer_sample.Dao; + +using System; +using System.Data; + +using Touryo.Infrastructure.Business.Business; +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Framework.Exceptions; + +namespace WSServer_sample.Business +{ + /// + /// LayerB の概要の説明です + /// + public class LayerB : MyFcBaseLogic + { + #region テンプレ + + /// 業務処理を実装 + /// 引数クラス + private void UOC_メソッド名(TestParameterValue testParameter) + { //メソッド引数にBaseParameterValueの派生の型を定義可能。 + + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + // 個別Dao + LayerD myDao = new LayerD(this.GetDam()); + //myDao.xxxx(testParameter, ref testReturn); + + // 共通Dao + CmnDao cmnDao = new CmnDao(this.GetDam()); + cmnDao.ExecSelectScalar(); + + // ↑業務処理----------------------------------------------------- + } + + #endregion + + #region UOCメソッド + + #region SelectCount + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectCount(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperCount.xml"; + break; + } + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecSelectScalar(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D5_SelCnt(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectCount(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DT + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DT(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DT(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DS + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DS(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataSet ds = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 ds + ds = new DataSet(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DS(ds); + + // 戻り値を設定 + testReturn.Obj = ds; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 ds + ds = new DataSet(); + ds.Tables.Add(new DataTable()); + + // 自動生成Daoを実行 + genDao.D2_Select(ds.Tables[0]); + + // 戻り値を設定 + testReturn.Obj = ds; + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DS(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DR + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DR(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLText = "SELECT * FROM Shippers"; + break; + } + + // 戻り値 dt + dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // 共通Daoを実行 + IDataReader idr = cmnDao.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // 戻り値を設定 + testReturn.Obj = dt; + + break; + + case "generate": // 自動生成Daoを使用する。 + + // DRのI/Fなし + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.D2_Select(dt); + + // 戻り値を設定 + testReturn.Obj = (DataTable)dt; + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DR(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region SelectAll_DSQL + + /// 業務処理を実装 + /// 引数クラス + private void UOC_SelectAll_DSQL(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelectOrder.xml"; + break; + } + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + cmnDao.SetUserParameter("COLUMN", " " + orderColumn + " "); + cmnDao.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // 自動生成Daoを実行 + testReturn.Obj = dt; + + break; + + //case "generate": // 自動生成Daoを使用する。 + // // 当該SQLなし + // break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.SelectAll_DSQL(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Select + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Select(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + DataTable dt = null; + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperSelect.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + dt = new DataTable(); + + // 共通Daoを実行 + cmnDao.ExecSelectFill_DT(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 戻り値 dt + dt = new DataTable(); + + // 自動生成Daoを実行 + genDao.S2_Select(dt); + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Select(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Insert + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Insert(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + cmnDao.SQLFileName = "ShipperInsert.sql"; + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.CompanyName = testParameter.CompanyName; + genDao.Phone = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.D1_Insert(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Insert(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Update + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Update(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperUpdate.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + cmnDao.SetParameter("P2", testParameter.CompanyName); + cmnDao.SetParameter("P3", testParameter.Phone); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + genDao.Set_CompanyName_forUPD = testParameter.CompanyName; + genDao.Set_Phone_forUPD = testParameter.Phone; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S3_Update(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Update(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #region Delete + + /// 業務処理を実装 + /// 引数クラス + private void UOC_Delete(TestParameterValue testParameter) + { + // 戻り値クラスを生成して、事前に戻り値に設定しておく。 + TestReturnValue testReturn = new TestReturnValue(); + this.ReturnValue = testReturn; + + // ↓業務処理----------------------------------------------------- + + switch ((testParameter.ActionType.Split('%'))[1]) + { + case "common": // 共通Daoを使用する。 + + // 共通Daoを生成 + CmnDao cmnDao = new CmnDao(this.GetDam()); + + switch ((testParameter.ActionType.Split('%'))[2]) + { + case "static": + // 静的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.sql"; + break; + + case "dynamic": + // 動的SQLを指定 + cmnDao.SQLFileName = "ShipperDelete.xml"; + break; + } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + cmnDao.SetParameter("P1", testParameter.ShipperID); + + // 共通Daoを実行 + // 戻り値を設定 + testReturn.Obj = cmnDao.ExecInsUpDel_NonQuery(); + + break; + + case "generate": // 自動生成Daoを使用する。 + + // 自動生成Daoを生成 + DaoShippers genDao = new DaoShippers(this.GetDam()); + + // パラメタに対して、動的に値を設定する。 + genDao.PK_ShipperID = testParameter.ShipperID; + + // 自動生成Daoを実行 + // 戻り値を設定 + testReturn.Obj = genDao.S4_Delete(); + + break; + + default: // 個別Daoを使用する。 + LayerD myDao = new LayerD(this.GetDam()); + myDao.Delete(testParameter, testReturn); + break; + } + + // ↑業務処理----------------------------------------------------- + + // ロールバックのテスト + this.TestRollback(testParameter); + } + + #endregion + + #endregion + + #region ロールバックのテスト + + /// ロールバックのテスト + /// 引数クラス + private void TestRollback(TestParameterValue testParameter) + { + switch ((testParameter.ActionType.Split('%'))[3]) + { + + case "Business": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // 業務例外のスロー + throw new BusinessApplicationException( + "ロールバックのテスト", + "ロールバックのテスト", + "エラー情報"); + //break; // 到達できないためコメントアウト + + case "System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // システム例外のスロー + throw new BusinessSystemException( + "ロールバックのテスト", + "ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外のスロー + throw new Exception("ロールバックのテスト"); + //break; // 到達できないためコメントアウト + + case "Other-Business": + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（業務例外へ振り替え）のスロー + throw new Exception("Other-Business"); + //break; // 到達できないためコメントアウト + + case "Other-System": + + // 戻り値が見えるか確認する。 + ((TestReturnValue)this.ReturnValue).Obj = "戻り値が戻るか？"; + + // その他、一般的な例外（システム例外へ振り替え）のスロー + throw new Exception("Other-System"); + //break; // 到達できないためコメントアウト + } + } + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/Shipper.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/Shipper.cs new file mode 100644 index 000000000..7c2923c20 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/Shipper.cs @@ -0,0 +1,36 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（引数・戻り値） +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Shipper +//* クラス日本語名 ：Shipper Beanクラス +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +namespace WSServer_sample.Common +{ + /// + /// Shipper の概要の説明です + /// + public class Shipper + { + /// ShipperID + public int ShipperID; + + /// CompanyName + public string CompanyName; + + /// Phone + public string Phone; + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/WebApiParams.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/WebApiParams.cs new file mode 100644 index 000000000..b1c65bfa9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Common/WebApiParams.cs @@ -0,0 +1,62 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（引数・戻り値） +//********************************************************************************** + +// テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：WebApiParams +//* クラス日本語名 ：WebApiParams（POCO ⇔ JSON用） +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +namespace WSServer_sample.Common +{ + /// + /// WebApiParams（POCO ⇔ JSON用） + /// + public class WebApiParams + { + /// + /// データアクセス プロバイダ + /// + public string ddlDap { get; set; } + + /// + /// クエリモード + /// + public string ddlMode1 { get; set; } + + /// + /// クエリモード + /// + public string ddlMode2 { get; set; } + + /// + /// コミット、ロールバックの設定 + /// + public string ddlExRollback { get; set; } + + /// + /// 並び替え対象列 + /// + public string OrderColumn { get; set; } + + /// + /// 降順・昇順 + /// + public string OrderSequence { get; set; } + + /// + /// 荷主 + /// + public Shipper Shipper { get; set; } + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/DaoShippers.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/DaoShippers.cs new file mode 100644 index 000000000..a3d8fbe53 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/DaoShippers.cs @@ -0,0 +1,409 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：DaoShippers +//* クラス日本語名 ：自動生成Ｄａｏクラス +//* +//* 作成日時 ：2014/2/9 +//* 作成者 ：棟梁 D層自動生成ツール（墨壺）, 日立 太郎 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//* 2012/06/14 西野 大介 ResourceLoaderに加え、EmbeddedResourceLoaderに対応 +//* 2013/09/09 西野 大介 ExecGenerateSQLメソッドを追加した（バッチ更新用）。 +//********************************************************************************** + +using System.Data; +using System.Collections; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace WSServer_sample.Dao // 衝突するため追加 +{ + /// 自動生成Ｄａｏクラス + public class DaoShippers : MyBaseDao + { + #region インスタンス変数 + + /// ユーザ パラメタ（文字列置換）用ハッシュ テーブル + protected Hashtable HtUserParameter = new Hashtable(); + /// パラメタ ライズド クエリのパラメタ用ハッシュ テーブル + protected Hashtable HtParameter = new Hashtable(); + + #endregion + + #region コンストラクタ + + /// コンストラクタ + public DaoShippers(BaseDam dam) : base(dam) { } + + #endregion + + #region 共通関数（パラメタの制御） + + /// ユーザ パラメタ（文字列置換）をハッシュ テーブルに設定する。 + /// ユーザ パラメタ名 + /// ユーザ パラメタ値 + public void SetUserParameteToHt(string userParamName, string userParamValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtUserParameter[userParamName] = userParamValue; + } + + /// パラメタ ライズド クエリのパラメタをハッシュ テーブルに設定する。 + /// パラメタ名 + /// パラメタ値 + public void SetParameteToHt(string paramName, object paramValue) + { + // ユーザ パラメタをハッシュ テーブルに設定 + this.HtParameter[paramName] = paramValue; + } + + /// + /// ・ユーザ パラメタ（文字列置換） + /// ・パラメタ ライズド クエリのパラメタ + /// を格納するハッシュ テーブルをクリアする。 + /// + public void ClearParametersFromHt() + { + // ユーザ パラメタ（文字列置換）用ハッシュ テーブルを初期化 + this.HtUserParameter = new Hashtable(); + // パラメタ ライズド クエリのパラメタ用ハッシュ テーブルを初期化 + this.HtParameter = new Hashtable(); + } + + /// パラメタの設定（内部用） + protected void SetParametersFromHt() + { + // ユーザ パラメタ（文字列置換）を設定する。 + foreach (string userParamName in this.HtUserParameter.Keys) + { + this.SetUserParameter(userParamName, this.HtUserParameter[userParamName].ToString()); + } + + // パラメタ ライズド クエリのパラメタを設定する。 + foreach (string paramName in this.HtParameter.Keys) + { + this.SetParameter(paramName, this.HtParameter[paramName]); + } + } + + #endregion + + #region プロパティ プロシージャ（setter、getter） + + + /// ShipperID列（主キー列）に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object PK_ShipperID + { + set + { + this.HtParameter["ShipperID"] = value; + } + get + { + return this.HtParameter["ShipperID"]; + } + } + + + + /// CompanyName列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object CompanyName + { + set + { + this.HtParameter["CompanyName"] = value; + } + get + { + return this.HtParameter["CompanyName"]; + } + } + + /// Phone列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタを除く + public object Phone + { + set + { + this.HtParameter["Phone"] = value; + } + get + { + return this.HtParameter["Phone"]; + } + } + + + /// Set_ShipperID_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_ShipperID_forUPD + { + set + { + this.HtParameter["Set_ShipperID_forUPD"] = value; + } + get + { + return this.HtParameter["Set_ShipperID_forUPD"]; + } + } + + + /// Set_CompanyName_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_CompanyName_forUPD + { + set + { + this.HtParameter["Set_CompanyName_forUPD"] = value; + } + get + { + return this.HtParameter["Set_CompanyName_forUPD"]; + } + } + + + /// Set_Phone_forUPD列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 更新処理時のSET句で使用するパラメタ専用 + public object Set_Phone_forUPD + { + set + { + this.HtParameter["Set_Phone_forUPD"] = value; + } + get + { + return this.HtParameter["Set_Phone_forUPD"]; + } + } + + + + /// ShipperID_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object ShipperID_Like + { + set + { + this.HtParameter["ShipperID_Like"] = value; + } + get + { + return this.HtParameter["ShipperID_Like"]; + } + } + + + /// CompanyName_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object CompanyName_Like + { + set + { + this.HtParameter["CompanyName_Like"] = value; + } + get + { + return this.HtParameter["CompanyName_Like"]; + } + } + + + /// Phone_Like列に対するパラメタ ライズド クエリのパラメタを設定する。 + /// 動的参照処理時のLIKE検索で使用するパラメタ専用 + public object Phone_Like + { + set + { + this.HtParameter["Phone_Like"] = value; + } + get + { + return this.HtParameter["Phone_Like"]; + } + } + + + #endregion + + #region クエリ メソッド + + #region Insert + + /// １レコード挿入する。 + /// 挿入された行の数 + public int S1_Insert() + { + // ファイルからSQL（Insert）を設定する。 + this.SetSqlByFile2("DaoShippers_S1_Insert.sql"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Insert）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// １レコード挿入する。 + /// 挿入された行の数 + /// パラメタで指定した列のみ挿入値が有効になる。 + public int D1_Insert() + { + // ファイルからSQL（DynIns）を設定する。 + this.SetSqlByFile2("DaoShippers_D1_Insert.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynIns）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Select + + /// 主キーを指定し、１レコード参照する。 + /// 結果を格納するDataTable + public void S2_Select(DataTable dt) + { + // ファイルからSQL（Select）を設定する。 + this.SetSqlByFile2("DaoShippers_S2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Select）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + /// 検索条件を指定し、結果セットを参照する。 + /// 結果を格納するDataTable + public void D2_Select(DataTable dt) + { + // ファイルからSQL（DynSel）を設定する。 + this.SetSqlByFile2("DaoShippers_D2_Select.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynSel）を実行し、戻り値を戻す。 + this.ExecSelectFill_DT(dt); + } + + #endregion + + #region Update + + /// 主キーを指定し、１レコード更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int S3_Update() + { + // ファイルからSQL（Update）を設定する。 + this.SetSqlByFile2("DaoShippers_S3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Update）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを更新する。 + /// 更新された行の数 + /// パラメタで指定した列のみ更新値が有効になる。 + public int D3_Update() + { + // ファイルからSQL（DynUpd）を設定する。 + this.SetSqlByFile2("DaoShippers_D3_Update.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynUpd）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region Delete + + /// 主キーを指定し、１レコード削除する。 + /// 削除された行の数 + public int S4_Delete() + { + // ファイルからSQL（Delete）を設定する。 + this.SetSqlByFile2("DaoShippers_S4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（Delete）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + /// 任意の検索条件でデータを削除する。 + /// 削除された行の数 + public int D4_Delete() + { + // ファイルからSQL（DynDel）を設定する。 + this.SetSqlByFile2("DaoShippers_D4_Delete.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（DynDel）を実行し、戻り値を戻す。 + return this.ExecInsUpDel_NonQuery(); + } + + #endregion + + #region 拡張メソッド + + /// テーブルのレコード件数を取得する + /// テーブルのレコード件数 + public object D5_SelCnt() + { + // ファイルからSQL（DynSelCnt）を設定する。 + this.SetSqlByFile2("DaoShippers_D5_SelCnt.xml"); + + // パラメタの設定 + this.SetParametersFromHt(); + + // SQL（SELECT COUNT）を実行し、戻り値を戻す。 + return this.ExecSelectScalar(); + } + + /// 静的SQLを生成する。 + /// ファイル名 + /// SQLユーティリティ + /// 生成した静的SQL + public string ExecGenerateSQL(string fileName, SQLUtility sqlUtil) + { + // ファイルからSQLを設定する。 + this.SetSqlByFile2(fileName); + + // パラメタの設定 + this.SetParametersFromHt(); + + return base.ExecGenerateSQL(sqlUtil); + } + + #endregion + + #endregion + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/LayerD.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/LayerD.cs new file mode 100644 index 000000000..248970945 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/Dao/LayerD.cs @@ -0,0 +1,517 @@ +//********************************************************************************** +//* フレームワーク・テストクラス（Ｄ層） +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：LayerD +//* クラス日本語名 ：Ｄ層のテスト +//* +//* 作成日時 ：－ +//* 作成者 ：生技 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using WSIFType_sample; + +using System.Data; + +using Touryo.Infrastructure.Business.Dao; +using Touryo.Infrastructure.Public.Db; + +namespace WSServer_sample.Dao +{ + /// + /// LayerD の概要の説明です + /// + public class LayerD : MyBaseDao + { + /// + /// コンストラクタ + /// + public LayerD(BaseDam dam) : base(dam) { } + + #region テンプレ + + /// テンプレ + /// 引数クラス + /// 戻り値クラス + public void テンプレ(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + // ● 下記のいづれかの方法でSQLを設定する。 + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ファイル名"); + + // -- 直接指定する場合。 + this.SetSqlByCommand("SQL文"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 追加、更新、削除の場合（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // -- 先頭の１セル分の情報を返すSELECTクエリを実行する場合 + obj = this.ExecSelectScalar(); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データテーブル） + obj = new DataTable(); + this.ExecSelectFill_DT((DataTable)obj); + + // -- テーブル（or レコード）の情報を返す + // SELECTクエリを実行する場合（引数 = データセット） + obj = new DataSet(); + this.ExecSelectFill_DS((DataSet)obj); + + // -- データリーダを返す + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 参照系 + + #region 件数取得（SelectCount） + + /// 件数情報を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectCount(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperCount.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperCount.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + object obj; + + // -- 件数情報を返すSELECTクエリを実行する + obj = this.ExecSelectScalar(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 一覧取得（SelectAll） + + /// 一覧を返すSELECTクエリを実行する（DT） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DT(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する（DS） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DS(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 ds + DataSet ds = new DataSet(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DS(ds); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = ds; + } + + /// 一覧を返すSELECTクエリを実行する（DR） + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DR(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string commandText = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + commandText = "SELECT * FROM Shippers"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + commandText = + "SELECT * FROM Shippers"; + // 通常、動的SQLをSetSqlByCommandで直接指定するような使い方はしない。 + } + + // -- 直接指定する場合。 + this.SetSqlByCommand(commandText); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // ３列生成 + dt.Columns.Add("c1", typeof(string)); + dt.Columns.Add("c2", typeof(string)); + dt.Columns.Add("c3", typeof(string)); + + // -- 一覧を返すSELECTクエリを実行する + IDataReader idr = (IDataReader)this.ExecSelect_DR(); + + while (idr.Read()) + { + // DRから読む + object[] objArray = new object[3]; + idr.GetValues(objArray); + + // DTに設定する。 + DataRow dr = dt.NewRow(); + dr.ItemArray = objArray; + dt.Rows.Add(dr); + } + + // 終了したらクローズ + idr.Close(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + /// 一覧を返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void SelectAll_DSQL(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelectOrder.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelectOrder.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // ユーザ定義パラメタに対して、動的に値を設定する。 + string orderColumn = ""; + string orderSequence = ""; + + if (testParameter.OrderColumn == "c1") + { + orderColumn = "ShipperID"; + } + else if (testParameter.OrderColumn == "c2") + { + orderColumn = "CompanyName"; + } + else if (testParameter.OrderColumn == "c3") + { + orderColumn = "Phone"; + } + else { } + + if (testParameter.OrderSequence == "A") + { + orderSequence = "ASC"; + } + else if (testParameter.OrderSequence == "D") + { + orderSequence = "DESC"; + } + else { } + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", "test"); + + // ユーザ入力は指定しない。 + // ※ 動的SQLのVALタグは、前後の空白をつめることが有るので、 + // 必要であれば、前後の空白を明示的に指定する必要がある。 + this.SetUserParameter("COLUMN", " " + orderColumn + " "); + this.SetUserParameter("SEQUENCE", " " + orderSequence + " "); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- 一覧を返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = dt; + } + + #endregion + + #region 参照 + + /// １レコードを返すSELECTクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Select(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperSelect.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperSelect.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + // 戻り値 dt + DataTable dt = new DataTable(); + + // -- １レコードを返すSELECTクエリを実行する + this.ExecSelectFill_DT(dt); + + // ↑DBアクセス----------------------------------------------------- + + //// 戻り値を設定 // 不要 + //testReturn.Obj = dt; + + // キャストの対策コードを挿入 + + // ・SQLの場合、ShipperIDのintがInt32型にマップされる。 + // ・ODPの場合、ShipperIDのNUMBERがInt64型にマップされる。 + // ・DB2の場合、ShipperIDのDECIMALがｘｘｘ型にマップされる。 + if (dt.Rows[0].ItemArray.GetValue(0).GetType().ToString() == "System.Int32") + { + // Int32なのでキャスト + testReturn.ShipperID = (int)dt.Rows[0].ItemArray.GetValue(0); + } + else + { + // それ以外の場合、一度、文字列に変換してInt32.Parseする。 + testReturn.ShipperID = int.Parse(dt.Rows[0].ItemArray.GetValue(0).ToString()); + } + + testReturn.CompanyName = (string)dt.Rows[0].ItemArray.GetValue(1); + testReturn.Phone = (string)dt.Rows[0].ItemArray.GetValue(2); + } + + #endregion + + #endregion + + #region 更新系 + + #region 追加 + + /// Insertクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Insert(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2("ShipperInsert.sql"); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 追加（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 更新 + + /// Updateクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Update(TestParameterValue testParameter, TestReturnValue testReturn) + { + + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperUpdate.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperUpdate.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + this.SetParameter("P2", testParameter.CompanyName); + this.SetParameter("P3", testParameter.Phone); + + object obj; + + // -- 更新（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #region 削除 + + /// Deleteクエリを実行する + /// 引数クラス + /// 戻り値クラス + public void Delete(TestParameterValue testParameter, TestReturnValue testReturn) + { + // ↓DBアクセス----------------------------------------------------- + + string filename = ""; + + if ((testParameter.ActionType.Split('%'))[2] == "static") + { + // 静的SQL + filename = "ShipperDelete.sql"; + } + else if ((testParameter.ActionType.Split('%'))[2] == "dynamic") + { + // 動的SQL + filename = "ShipperDelete.xml"; + } + + // -- ファイルから読み込む場合。 + this.SetSqlByFile2(filename); + + // パラメタ ライズド クエリのパラメタに対して、動的に値を設定する。 + this.SetParameter("P1", testParameter.ShipperID); + + object obj; + + // -- 追削除（件数を確認できる） + obj = this.ExecInsUpDel_NonQuery(); + + // ↑DBアクセス----------------------------------------------------- + + // 戻り値を設定 + testReturn.Obj = obj; + } + + #endregion + + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj new file mode 100644 index 000000000..fb5520bfa --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj @@ -0,0 +1,33 @@ + + + + net5.0 + + + + + + + + + + + + + + + + + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln new file mode 100644 index 000000000..2cd564b8b --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2015 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSServer_sample", "WSServer_sample.csproj", "{E11525D4-EB70-4F4E-B758-42861377705E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSIFType_sample", "..\WSIFType_sample\WSIFType_sample.csproj", "{EF9EABB8-ED4E-46FD-B2C4-4C0AB937970F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E11525D4-EB70-4F4E-B758-42861377705E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E11525D4-EB70-4F4E-B758-42861377705E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E11525D4-EB70-4F4E-B758-42861377705E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E11525D4-EB70-4F4E-B758-42861377705E}.Release|Any CPU.Build.0 = Release|Any CPU + {EF9EABB8-ED4E-46FD-B2C4-4C0AB937970F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF9EABB8-ED4E-46FD-B2C4-4C0AB937970F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF9EABB8-ED4E-46FD-B2C4-4C0AB937970F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF9EABB8-ED4E-46FD-B2C4-4C0AB937970F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CCB5CE3D-3D2E-40AC-A65E-D7B89D29AE23} + EndGlobalSection +EndGlobal diff --git a/root_VS2015/programs/CS/_Please run with a double-click to build bat file here.txt b/root_VS2022/programs/CS/_Please run with a double-click to build bat file here.txt similarity index 100% rename from root_VS2015/programs/CS/_Please run with a double-click to build bat file here.txt rename to root_VS2022/programs/CS/_Please run with a double-click to build bat file here.txt diff --git a/root_VS2015/programs/CS/z_Common.bat b/root_VS2022/programs/CS/z_Common.bat similarity index 62% rename from root_VS2015/programs/CS/z_Common.bat rename to root_VS2022/programs/CS/z_Common.bat index 3262f1dc8..316b1b414 100644 --- a/root_VS2015/programs/CS/z_Common.bat +++ b/root_VS2022/programs/CS/z_Common.bat @@ -9,13 +9,24 @@ set BUILDFILEPATH2.0="C:\Windows\Microsoft.NET\Framework\v2.0.50727\MSBuild.exe" set BUILDFILEPATH3.5="C:\Windows\Microsoft.NET\Framework\v3.5\MSBuild.exe" set BUILDFILEPATH4.0="C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" -if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" -) else ( +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" ( set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" ) +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" +) + +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" +) -set BUILDFILEPATH=%BUILDFILEPATH4.0% +set BUILDFILEPATH=%BUILDFILEPATH15% @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). diff --git a/root_VS2015/programs/CS/z_Common2.bat b/root_VS2022/programs/CS/z_Common2.bat similarity index 100% rename from root_VS2015/programs/CS/z_Common2.bat rename to root_VS2022/programs/CS/z_Common2.bat diff --git a/root_VS2015/programs/VB/0_ExecAllBat.bat b/root_VS2022/programs/VB/0_ExecAllBat.bat similarity index 59% rename from root_VS2015/programs/VB/0_ExecAllBat.bat rename to root_VS2022/programs/VB/0_ExecAllBat.bat index 7c2dc1ff9..a1f5059cc 100644 --- a/root_VS2015/programs/VB/0_ExecAllBat.bat +++ b/root_VS2022/programs/VB/0_ExecAllBat.bat @@ -4,8 +4,9 @@ echo | call 1_DeleteFile.bat @echo on timeout 5 -echo | call 3_Build_Business_net46.bat -echo | call 3_Build_BusinessRichClient_net46.bat +echo | call 3_Build_Business_net48.bat +echo | call 3_Build_BusinessRichClient_net48.bat +echo | call 4_Build_CopyAssemblies.bat @echo on timeout 5 @@ -14,7 +15,8 @@ echo | call 5_Build_Bat_sample.bat echo | call 5_Build_2CS_sample.bat echo | call 6_Build_WSSrv_sample.bat echo | call 7_Build_Framework_WS.bat -echo | call 8_Build_WSClnt_sample.bat +echo | call 8_Build_WSClntWin_sample.bat +echo | call 9_Build_WSClntWPF_sample.bat echo | call 10_Build_WebApp_sample.bat @echo on diff --git a/root_VS2015/programs/VB/10_Build_WebApp_sample.bat b/root_VS2022/programs/VB/10_Build_WebApp_sample.bat similarity index 100% rename from root_VS2015/programs/VB/10_Build_WebApp_sample.bat rename to root_VS2022/programs/VB/10_Build_WebApp_sample.bat diff --git a/root_VS2015/programs/VB/1_DeleteDir.bat b/root_VS2022/programs/VB/1_DeleteDir.bat similarity index 100% rename from root_VS2015/programs/VB/1_DeleteDir.bat rename to root_VS2022/programs/VB/1_DeleteDir.bat diff --git a/root_VS2015/programs/VB/1_DeleteFile.bat b/root_VS2022/programs/VB/1_DeleteFile.bat similarity index 100% rename from root_VS2015/programs/VB/1_DeleteFile.bat rename to root_VS2022/programs/VB/1_DeleteFile.bat diff --git a/root_VS2015/programs/CS/3_Build_BusinessRichClient_net46.bat b/root_VS2022/programs/VB/3_Build_BusinessRichClient_net48.bat similarity index 89% rename from root_VS2015/programs/CS/3_Build_BusinessRichClient_net46.bat rename to root_VS2022/programs/VB/3_Build_BusinessRichClient_net48.bat index 339080b58..63b1f3bdd 100644 --- a/root_VS2015/programs/CS/3_Build_BusinessRichClient_net46.bat +++ b/root_VS2022/programs/VB/3_Build_BusinessRichClient_net48.bat @@ -16,11 +16,11 @@ set CURRENT_DIR="%~dp0" call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- -rem Build the Infrastructures +rem Output xcopy after you build the batch Infrastructure rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\BusinessRichClient_net46.sln" -%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_net46.sln" +..\nuget.exe restore "Frameworks\Infrastructure\BusinessRichClient_net48.sln" +%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_net48.sln" pause diff --git a/root_VS2015/programs/VB/3_Build_Business_net46.bat b/root_VS2022/programs/VB/3_Build_Business_net48.bat similarity index 91% rename from root_VS2015/programs/VB/3_Build_Business_net46.bat rename to root_VS2022/programs/VB/3_Build_Business_net48.bat index ad5310ee2..39ccf9e81 100644 --- a/root_VS2015/programs/VB/3_Build_Business_net46.bat +++ b/root_VS2022/programs/VB/3_Build_Business_net48.bat @@ -19,8 +19,8 @@ rem -------------------------------------------------- rem Build the Infrastructures rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\Business_net46.sln" -%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Business_net46.sln" +..\nuget.exe restore "Frameworks\Infrastructure\Business_net48.sln" +%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Business_net48.sln" pause diff --git a/root_VS2022/programs/VB/4_Build_CopyAssemblies.bat b/root_VS2022/programs/VB/4_Build_CopyAssemblies.bat new file mode 100644 index 000000000..9f09a5792 --- /dev/null +++ b/root_VS2022/programs/VB/4_Build_CopyAssemblies.bat @@ -0,0 +1,10 @@ +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Copy for build local repository. +@rem -------------------------------------------------- +xcopy /E /Y "Frameworks\Infrastructure\Build_net48" "Frameworks\Infrastructure\Build\" + diff --git a/root_VS2015/programs/VB/5_Build_2CS_sample.bat b/root_VS2022/programs/VB/5_Build_2CS_sample.bat similarity index 100% rename from root_VS2015/programs/VB/5_Build_2CS_sample.bat rename to root_VS2022/programs/VB/5_Build_2CS_sample.bat diff --git a/root_VS2015/programs/VB/5_Build_Bat_sample.bat b/root_VS2022/programs/VB/5_Build_Bat_sample.bat similarity index 100% rename from root_VS2015/programs/VB/5_Build_Bat_sample.bat rename to root_VS2022/programs/VB/5_Build_Bat_sample.bat diff --git a/root_VS2015/programs/VB/6_Build_WSSrv_sample.bat b/root_VS2022/programs/VB/6_Build_WSSrv_sample.bat similarity index 100% rename from root_VS2015/programs/VB/6_Build_WSSrv_sample.bat rename to root_VS2022/programs/VB/6_Build_WSSrv_sample.bat diff --git a/root_VS2015/programs/VB/7_Build_Framework_WS.bat b/root_VS2022/programs/VB/7_Build_Framework_WS.bat similarity index 100% rename from root_VS2015/programs/VB/7_Build_Framework_WS.bat rename to root_VS2022/programs/VB/7_Build_Framework_WS.bat diff --git a/root_VS2015/programs/VB/8_Build_WSClnt_sample.bat b/root_VS2022/programs/VB/8_Build_WSClntWin_sample.bat similarity index 82% rename from root_VS2015/programs/VB/8_Build_WSClnt_sample.bat rename to root_VS2022/programs/VB/8_Build_WSClntWin_sample.bat index 2a0a00558..63ff8d5e0 100644 --- a/root_VS2015/programs/VB/8_Build_WSClnt_sample.bat +++ b/root_VS2022/programs/VB/8_Build_WSClntWin_sample.bat @@ -30,12 +30,5 @@ rem -------------------------------------------------- pause -rem -------------------------------------------------- -rem Batch build of WSClientWPF_sample. -rem -------------------------------------------------- -%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" - -pause - rem ------------------------------------------------------- endlocal diff --git a/root_VS2022/programs/VB/9_Build_WSClntWPF_sample.bat b/root_VS2022/programs/VB/9_Build_WSClntWPF_sample.bat new file mode 100644 index 000000000..72cfa9c70 --- /dev/null +++ b/root_VS2022/programs/VB/9_Build_WSClntWPF_sample.bat @@ -0,0 +1,26 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of WSClientWPF_sample. +rem -------------------------------------------------- +%BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business/MyBaseLogic.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business/MyBaseLogic.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business/MyBaseLogic.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business/MyBaseLogic.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business/MyFcBaseLogic.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business/_3TierEngine.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business/_3TierEngine.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business/_3TierEngine.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business/_3TierEngine.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business_net46.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj similarity index 91% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business_net46.vbproj rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj index d9b85b6af..af02c203a 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Business_net46.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj @@ -12,7 +12,7 @@ OpenTouryo.Business Windows On - v4.6 + v4.8 2.0 @@ -41,20 +41,20 @@ full true true - ..\Build_net46\ - ..\Build_net46\OpenTouryo.Business.xml + ..\Build_net48\ + ..\Build_net48\OpenTouryo.Business.xml false - DEBUG,TRACE,NET46 + DEBUG,TRACE,NET48 pdbonly false true true - ..\Build_net46\ - ..\Build_net46\OpenTouryo.Business.xml + ..\Build_net48\ + ..\Build_net48\OpenTouryo.Business.xml false - TRACE,NET46 + TRACE,NET48 @@ -67,7 +67,7 @@ ..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll - ..\packages\jose-jwt.2.4.0\lib\net40\jose-jwt.dll + ..\packages\jose-jwt.2.4.0\lib\net461\jose-jwt.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll @@ -92,22 +92,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net46\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net48\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net46\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net48\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net46\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net48\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net46\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net48\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net46\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll @@ -118,30 +118,28 @@ - - + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll True - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -174,7 +172,6 @@ True - diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MuParameterValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MuParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MuParameterValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MuParameterValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MuReturnValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MuReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MuReturnValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MuReturnValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MyParameterValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MyParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MyParameterValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MyParameterValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MyReturnValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MyReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/MyReturnValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/MyReturnValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierParameterValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Common/_3TierReturnValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Csp/CstSqlSessionStateProvider.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Csp/SessionDB creation script.txt diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Dao/BaseConsolidateDao.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Dao/CmnDao.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Dao/CmnDao.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Dao/CmnDao.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Dao/CmnDao.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Dao/MyBaseDao.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Dao/MyBaseDao.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Dao/MyBaseDao.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Dao/MyBaseDao.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessApplicationExceptionMessage.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Exceptions/MyBusinessSystemExceptionMessage.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.myapp b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.myapp rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Presentation/CmnTableAdapter.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb similarity index 63% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb index c2874f44c..377400c7b 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' このコードはツールによって生成されました。 +' ランタイム バージョン:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ @@ -15,14 +15,14 @@ Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'このクラスは StronglyTypedResourceBuilder クラスが ResGen + 'または Visual Studio のようなツールを使用して自動生成されました。 + 'メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に + 'ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 ''' - _ Friend Class MyBusinessApplicationExceptionMessageResource @@ -37,7 +37,7 @@ Namespace My.Resources End Sub ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 ''' _ Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager @@ -51,8 +51,8 @@ Namespace My.Resources End Property ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします + ''' 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 ''' _ Friend Shared Property Culture() As Global.System.Globalization.CultureInfo @@ -65,7 +65,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Message_SampleError . + ''' Message_SampleError に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property SAMPLE_ERROR() As String Get diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.ja-JP.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessApplicationExceptionMessageResource.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb similarity index 65% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb index 1d223d2d6..5408f9c93 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' このコードはツールによって生成されました。 +' ランタイム バージョン:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ @@ -15,14 +15,14 @@ Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'このクラスは StronglyTypedResourceBuilder クラスが ResGen + 'または Visual Studio のようなツールを使用して自動生成されました。 + 'メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に + 'ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 ''' - _ Friend Class MyBusinessSystemExceptionMessageResource @@ -37,7 +37,7 @@ Namespace My.Resources End Sub ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 ''' _ Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager @@ -51,8 +51,8 @@ Namespace My.Resources End Property ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします + ''' 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 ''' _ Friend Shared Property Culture() As Global.System.Globalization.CultureInfo @@ -65,7 +65,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The error occurred in common Dao. :{0}. + ''' The error occurred in common Dao. :{0} に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property CMN_DAO_ERROR() As String Get @@ -74,7 +74,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The SQL file name or SQL text is not specified.. + ''' The SQL file name or SQL text is not specified. に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property CMN_DAO_ERROR_SQL() As String Get @@ -83,7 +83,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Message_SampleError. + ''' Message_SampleError に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property SAMPLE_ERROR() As String Get @@ -92,7 +92,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The error occurred in workflow. :{0}. + ''' The error occurred in workflow. :{0} に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property WORKFLOW_ERROR() As String Get @@ -101,7 +101,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to {0} argument is empty.. + ''' {0} argument is empty. に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property WORKFLOW_ERROR_CHECK_EMPTY() As String Get @@ -110,7 +110,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to {0} field is not contained in the {1} argument.. + ''' {0} field is not contained in the {1} argument. に類似しているローカライズされた文字列を検索します。 ''' Friend Shared ReadOnly Property WORKFLOW_ERROR_CHECK_FIELD_ISNT_CONTAINED() As String Get diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.ja-JP.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Resources/MyBusinessSystemExceptionMessageResource.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Asynchronous/MyBaseAsyncFunc.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj similarity index 55% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.vbproj rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj index 10ad69dd8..eda37dafb 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net46.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj @@ -12,7 +12,7 @@ OpenTouryo.Business.RichClient 512 Windows - v4.6 + v4.8 On Binary Off @@ -43,63 +43,42 @@ full true true - ..\..\Build_net46\ - ..\..\Build_net46\OpenTouryo.Business.RichClient.xml + ..\..\Build_net48\ + ..\..\Build_net48\OpenTouryo.Business.RichClient.xml false - DEBUG,TRACE,NET46 + DEBUG,TRACE,NET48 pdbonly false true true - ..\..\Build_net46\ - ..\..\Build_net46\OpenTouryo.Business.RichClient.xml + ..\..\Build_net48\ + ..\..\Build_net48\OpenTouryo.Business.RichClient.xml false - TRACE,NET46 + TRACE,NET48 - - ..\..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\Build_net46\OpenTouryo.Business.dll + ..\..\Build_net48\OpenTouryo.Business.dll - ..\..\Build_net46\OpenTouryo.DamManagedOdp.dll + ..\..\Build_net48\OpenTouryo.DamManagedOdp.dll - ..\..\Build_net46\OpenTouryo.DamMySQL.dll + ..\..\Build_net48\OpenTouryo.DamMySQL.dll - ..\..\Build_net46\OpenTouryo.DamPstGrS.dll + ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - - ..\..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net46\OpenTouryo.Framework.dll + + ..\..\Build_net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net46\OpenTouryo.Framework.RichClient.dll - - - ..\..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\Build_net46\Oracle.ManagedDataAccess.dll - - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll + ..\..\Build_net48\Oracle.ManagedDataAccess.dll 3.0 @@ -107,27 +86,12 @@ 3.0 + + ..\..\Build_net48\OpenTouryo.Public.dll + - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll - diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyBaseLogic2CS.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business/MyFcBaseLogic2CS.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.myapp b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.myapp rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Presentation/MyBaseControllerWin.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Util/RcMyCmnFunction.vb diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config similarity index 68% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index c702b9867..82f258445 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -1,15 +1,15 @@  - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Str/JISX0208_1983Checker.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/GMTMaster.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/GMTMaster.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/GMTMaster.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/GMTMaster.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyAttribute.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyAttribute.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyAttribute.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyAttribute.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyCmnFunction.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyCmnFunction.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyCmnFunction.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyCmnFunction.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyLiteral.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyLiteral.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyLiteral.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyLiteral.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MySubsysInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MySubsysInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MySubsysInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MySubsysInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZone.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZone.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZone.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZone.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyTimeZoneEnum.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyUserInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyUserInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/Util/MyUserInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Util/MyUserInfo.vb diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/app.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/app.config new file mode 100644 index 000000000..7a45c39f4 --- /dev/null +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/app.config @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config similarity index 66% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/Business/packages.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config index c0d6da3bc..6ed40b44f 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -1,29 +1,29 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net46.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln similarity index 84% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net46.sln rename to root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln index 472afcee8..8efa2f596 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net46.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net46.vbproj", "{7649D699-681D-4BE0-9A36-24B0815ABCEF}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net48.vbproj", "{7649D699-681D-4BE0-9A36-24B0815ABCEF}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net46.vbproj", "{76C5D665-A592-4A35-85D9-B75590E026AA}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net48.vbproj", "{76C5D665-A592-4A35-85D9-B75590E026AA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B63DB26B-A21A-4C9E-8015-E8B73FD463FE} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business_net46.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln similarity index 81% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business_net46.sln rename to root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln index 43894a0f4..d057a422b 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business_net46.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business", "Business\Business_net46.vbproj", "{BCB5C7D0-FBE4-43E2-8BED-096700A6A187}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business", "Business\Business_net48.vbproj", "{BCB5C7D0-FBE4-43E2-8BED-096700A6A187}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl", "CustomControl\CustomControl_net46.vbproj", "{64EDF4AB-8739-4027-976B-18BB731DAF76}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl", "CustomControl\CustomControl_net48.vbproj", "{64EDF4AB-8739-4027-976B-18BB731DAF76}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D0358635-A59C-4A4B-8D98-AE9B556C2A7E} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomButton.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBox.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomCheckBoxList.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomDropDownList.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomFileUpload.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageButton.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomImageMap.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLabel.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomLinkButton.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomListBox.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomPanel.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButton.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomRadioButtonList.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Control/WebCustomTextBox.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net46.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj similarity index 92% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net46.vbproj rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj index 4d4b32231..8fa508cc2 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net46.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj @@ -12,7 +12,7 @@ OpenTouryo.CustomControl Windows On - v4.6 + v4.8 2.0 @@ -39,20 +39,20 @@ full true true - ..\Build_net46\ - ..\Build_net46\OpenTouryo.CustomControl.xml + ..\Build_net48\ + ..\Build_net48\OpenTouryo.CustomControl.xml false - DEBUG,TRACE,NET46 + DEBUG,TRACE,NET48 pdbonly false true true - ..\Build_net46\ - ..\Build_net46\OpenTouryo.CustomControl.xml + ..\Build_net48\ + ..\Build_net48\OpenTouryo.CustomControl.xml false - TRACE,NET46 + TRACE,NET48 @@ -65,7 +65,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CheckResult.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CheckResult.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CheckResult.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CheckResult.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnCheckFunction.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/CmnMasterDatasForList.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/ListItem.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/ListItem.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Function/ListItem.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Function/ListItem.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/ICheck.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/ICheck.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/ICheck.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/ICheck.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IGetValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/Interface/IMasterData.vb diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.Designer.vb new file mode 100644 index 000000000..8effad9c4 --- /dev/null +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' このコードはツールによって生成されました。 +' ランタイム バージョン:4.0.30319.42000 +' +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.myapp b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.myapp rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckType.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/PropertyGrid/CheckTypeConverter.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomDropDownList.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCell.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCell.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj similarity index 61% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.vbproj rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj index 1620b4a4b..2fd2d5b62 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net46.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj @@ -12,7 +12,7 @@ OpenTouryo.CustomControl.RichClient 512 Windows - v4.6 + v4.8 On Binary On @@ -43,71 +43,33 @@ full true true - ..\..\Build_net46\ - ..\..\Build_net46\OpenTouryo.CustomControl.RichClient.xml + ..\..\Build_net48\ + ..\..\Build_net48\OpenTouryo.CustomControl.RichClient.xml false - DEBUG,TRACE,NET46 + DEBUG,TRACE,NET48 pdbonly false true true - ..\..\Build_net46\ - ..\..\Build_net46\OpenTouryo.CustomControl.RichClient.xml + ..\..\Build_net48\ + ..\..\Build_net48\OpenTouryo.CustomControl.RichClient.xml false - TRACE,NET46 + TRACE,NET48 - - ..\..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net46\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net46\OpenTouryo.Framework.RichClient.dll - - - ..\..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net46\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll + + False + ..\..\Build_net48\OpenTouryo.Public.dll - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll - diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CheckResult.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnCheckFunction.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/CmnMasterDatasForList.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Function/ListItem.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/ICheck.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IEdit.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IGetValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/Interface/IMasterData.vb diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.Designer.vb new file mode 100644 index 000000000..8effad9c4 --- /dev/null +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' このコードはツールによって生成されました。 +' ランタイム バージョン:4.0.30319.42000 +' +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.myapp b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.myapp rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckType.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/CheckTypeConverter.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditAddFigure.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDP.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditDigitsAfterDPConverter.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditInitialValue.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPadding.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/PropertyGrid/EditPaddingConverter.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config similarity index 68% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index c702b9867..f6612f4ab 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -1,15 +1,15 @@  - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config similarity index 70% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config index be424691f..a2b25f722 100644 --- a/root_VS2015/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln similarity index 83% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln index 9123b07dc..2a9fe405c 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "ASPNETWebService\ASPNETWebService.vbproj", "{CD8E53D2-B177-494B-AE08-1CEEF98E43D7}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CB0326EB-3694-4959-B59B-F09E314BC7EA} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj similarity index 77% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj index 5b210e56e..f0d75652c 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj @@ -1,21 +1,24 @@  - - + Debug AnyCPU - - - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7} + 2.0 + {C02AC124-7839-4686-87C3-5D65FB089ABD} {349c5851-65df-11da-9384-00065b846f21};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} Library ASPNETWebService - v4.6 + v4.8 + On + Binary + Off + On + false true @@ -37,6 +40,7 @@ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + true pdbonly false true @@ -46,26 +50,26 @@ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll + True - - ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + True - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + True - ..\..\..\Build_net46\OpenTouryo.Business.dll + ..\..\..\Build_net48\OpenTouryo.Business.dll - ..\..\..\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Build_net48\OpenTouryo.Framework.dll - ..\..\..\Build_net46\OpenTouryo.Public.dll + ..\..\..\Build_net48\OpenTouryo.Public.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -73,72 +77,81 @@ - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - ..\packages\Microsoft.AspNet.Cors.5.2.6\lib\net45\System.Web.Cors.dll + + ..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll + True - + + + + + + + ..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll + + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + + - - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll + + + + + + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll + - - ..\packages\Microsoft.AspNet.WebApi.Cors.5.2.6\lib\net45\System.Web.Http.Cors.dll + - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.6\lib\net45\System.Web.Http.WebHost.dll + + True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + True - - ..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - ..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll + True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll + True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll + True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - + True - ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll - - - ..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll - - ..\packages\WebGrease.1.6.0\lib\WebGrease.dll + + True + ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + ..\..\..\..\..\Samples\WS_sample\Build\WSIFType_sample.dll @@ -146,11 +159,6 @@ ..\..\..\..\..\Samples\WS_sample\Build\WSServer_sample.dll - - - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - @@ -261,6 +269,9 @@ + + + @@ -283,13 +294,11 @@ このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。 - - + --> \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/FilterConfig.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/App_Start/WebApiConfig.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/IWCFHTTPSvcForFx.vb diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.Designer.vb new file mode 100644 index 000000000..8effad9c4 --- /dev/null +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' このコードはツールによって生成されました。 +' ランタイム バージョン:4.0.30319.42000 +' +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.myapp b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.myapp rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/MyExtensions/MyWebExtension.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/MyExtensions/MyWebExtension.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/MyExtensions/MyWebExtension.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/MyExtensions/MyWebExtension.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb similarity index 93% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb index fcb56b673..e55d49d6a 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 ''' - _ @@ -47,7 +47,7 @@ Namespace My.Resources End Property ''' - ''' 厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、 + ''' すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします ''' 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 ''' _ diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.resx b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.resx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.resx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.resx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb similarity index 95% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb index 2337ac84f..ed74d317f 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -29,7 +29,7 @@ Namespace My Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.settings b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.settings similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.settings rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.settings diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ServiceForFx.asmx.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Startup.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/WCFHTTPSvcForFx.svc.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Debug.config diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.Release.config diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config similarity index 89% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 4dcd089ef..1b62d618f 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -34,7 +34,7 @@ - + - + @@ -190,9 +190,6 @@ - - - - + - + diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config new file mode 100644 index 000000000..1204842bd --- /dev/null +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/packages.config @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config similarity index 92% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 28387b186..78bf358d6 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -25,13 +25,13 @@ - + - + @@ -86,6 +86,10 @@ + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/Module1.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/Module1.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/Module1.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/Module1.vb diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.Designer.vb new file mode 100644 index 000000000..8effad9c4 --- /dev/null +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' このコードはツールによって生成されました。 +' ランタイム バージョン:4.0.30319.42000 +' +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.myapp b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.myapp rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln similarity index 82% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln index 3ae9c5375..fdfba7e4e 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WCFService", "WCFService.vbproj", "{48114116-045D-4BB9-93FD-61306697F589}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {04531810-5A9E-42F2-8D70-4E7CDC7A1B01} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj similarity index 94% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj index 01c082f58..018829cbd 100644 --- a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj @@ -16,7 +16,7 @@ 512 true Console - v4.6 + v4.8 @@ -56,13 +56,13 @@ packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\..\Build_net46\OpenTouryo.Business.dll + ..\..\Build_net48\OpenTouryo.Business.dll - ..\..\Build_net46\OpenTouryo.Framework.dll + ..\..\Build_net48\OpenTouryo.Framework.dll - ..\..\Build_net46\OpenTouryo.Public.dll + ..\..\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.vb b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.vb rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFTCPSvcForFx.vb diff --git a/root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config similarity index 100% rename from root_VS2015/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config rename to root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/packages.config diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index 5bda2b70c..bd34ff64f 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2CSClientWPF_sample", "2CSClientWPF_sample.vbproj", "{3D1A8517-4939-424F-80D5-13E022870858}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B06391EB-2428-4197-AE1B-F57D922184A4} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj similarity index 94% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj index 4129262f7..883a1444e 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj @@ -8,7 +8,7 @@ WinExe _2CSClientWPF_sample 2CSClientWPF_sample - v4.6 + v4.8 Custom On Binary @@ -61,19 +61,19 @@ - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Application.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Business/LayerB.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Common/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/DaoShippers.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Dao/LayerD.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SPDefinition.xml diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/Window1.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config similarity index 90% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config index 4ed8df9af..9d50ec72e 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -53,5 +53,16 @@ + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index e936ba371..cdbff4156 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2CSClientWin_sample", "2CSClientWin_sample.vbproj", "{188A545F-5667-4349-949C-F1372AB592D5}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C894C177-BCF2-43F2-8FB9-48B35D425324} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj similarity index 94% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj index 89274c7e5..522f152b2 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj @@ -11,7 +11,7 @@ _2CSClientWin_sample 2CSClientWin_sample WindowsFormsWithCustomSubMain - v4.6 + v4.8 @@ -57,23 +57,23 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Business/LayerB.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Common/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/DaoShippers.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Dao/LayerD.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Form1.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Login.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/MSGDefinition.xml diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Program.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Program.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Program.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Program.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SPDefinition.xml diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.resx b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.vb b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/Splash.vb diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config similarity index 95% rename from root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config rename to root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config index c2fcd88bd..e9bb82ef2 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -70,14 +70,14 @@ - + - - + + - + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln similarity index 88% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index 892963dbf..e1d73ad65 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.vbproj", "{F7C3BD4A-F362-4BF2-A3E5-0327038DF0D3}" EndProject @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C781C3D2-8CDD-4208-B0C6-C40EC0A84774} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/Readme.txt b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/Readme.txt new file mode 100644 index 000000000..4eb146b45 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/Readme.txt @@ -0,0 +1,5 @@ +非同期イベント処理の利用サンプル + +slnをビルドして、 +「test-win×2＆wpf×2.bat」 +バッチから実行できる。 \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj similarity index 97% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj index a59fe1e0a..2a8ac972e 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj +++ b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj @@ -12,7 +12,7 @@ WindowsFormsApplication 512 WindowsForms - v4.6 + v4.8 On Binary Off @@ -60,10 +60,10 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Application.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/MyExtensions/MyWpfExtension.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/MyExtensions/MyWpfExtension.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/MyExtensions/MyWpfExtension.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/My Project/MyExtensions/MyWpfExtension.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.vb b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj similarity index 97% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj index 21d43ad09..e2a9050ed 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj +++ b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj @@ -8,7 +8,7 @@ WinExe WpfApplication WpfApplication - v4.6 + v4.8 Custom On Binary @@ -60,11 +60,11 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat rename to root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Bean.vb b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Bean.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Bean.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Bean.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln similarity index 82% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 70451a471..aa7e372ee 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustCtrl_sample", "CustCtrl_sample.vbproj", "{43441376-87E2-4668-8722-8A094AE5C179}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5F12D492-0816-4D75-98D9-C5FD6674BBBE} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj similarity index 97% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj index 9342e5754..6e5dd3759 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj @@ -12,7 +12,7 @@ CustCtrl_sample 512 WindowsForms - v4.6 + v4.8 On Binary Off @@ -61,7 +61,7 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.CustomControl.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.CustomControl.RichClient.dll diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.resx b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.vb b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Form1.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Readme.txt b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Readme.txt new file mode 100644 index 000000000..65a4d555e --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/Readme.txt @@ -0,0 +1,217 @@ +Windows Formカスタム・コントロールの利用サンプル +デザインタイム・プロパティからチェック処理を変更可能。 + +以下のクラスの仕様を説明する。 + ・WinCustomTextBox.cs(.vb) + ・WinCustomMaskedTextBox.cs(.vb) + +プロパティ + ●は双方のクラス共通のプロパティ + t)はWinCustomTextBoxのみのプロパティ + m)はWinCustomMaskedTextBoxのみのプロパティ + +＜拡張プロパティ（既存のプロパティのoverrideや追加のプロパティ）＞ + ●Text（override）： + ・型：string（既定値：空文字列） + ・説明：元のTextプロパティ（表示されているTextと同じ値を返す） + + t)Value（追加）： + ・型：object型 + ・説明：単位指定可能なValueプロパティ（使用する際はDisplayUnitsに0以上の値を設定） + ・Textプロパティに変換する際に単位変換を行う（例：実値＝円、表示値＝M円など）。 + ・また、EditDigitsAfterDPよりEditDigitsAfterDP_Editingの方が精度が高い場合、 + Valueを使用すると、EditDigitsAfterDP_Editingの精度でデータを取得できるようになる。 + + m)TextMaskFormat（override）： + ・型：MaskFormat列挙体 + ・説明：読み取り専用に動作を変更してある（IncludeLiterals固定）。 + + ・MaskFormat列挙体： + ・IncludeLiterals： + ・型：int + ・説明：ユーザーによって入力されたテキストのほか、マスクで定義されたリテラル文字を返します。 + + m)Text2（追加）： + ・型：string（既定値：空文字列） + ・説明：編集処理を施す前のユーザ入力のTextプロパティ（WinCustomMaskedTextBoxではマスクを除いた値） + + m)Text3（追加）： + ・型：string（既定値：空文字列） + ・説明：編集処理を施した後のTextプロパティ（WinCustomMaskedTextBoxでは表示時マスク適用時の値） + +＜デザインタイム・プロパティ（追加のプロパティ）＞ + + ＜チェック系＞ + ●CheckValidatingプロパティ： + ・型：bool（既定値：false） + ・説明：Validatingイベントでチェックするかどうか + + ●CheckTypeプロパティ： + ・型：CheckTypeクラス + ・説明：チェック・パターンを定義 + + ・CheckTypeクラス： + ・IsIndispensabile： + ・型：bool（既定値：false） + ・説明：必須入力チェックを有効にする。 + ・IsHankaku： + ・型：bool（既定値：false） + ・説明：半角チェックを有効にする。 + 空文字列はチェック対象外。 + ・IsZenkaku： + ・型：bool（既定値：false） + ・説明：全角チェックを有効にする。 + 空文字列はチェック対象外。 + ・IsNumeric： + ・型：bool（既定値：false） + ・説明：数値チェックを有効にする（Double型にTryParseできるかどうか）。 + 空文字列はチェック対象外。 + ・IsKatakana： + ・型：bool（既定値：false） + ・説明：片仮名チェックを有効にする。 + 空文字列はチェック対象外。 + ・IsHanKatakana： + ・型：bool（既定値：false） + ・説明：半角片仮名チェックを有効にする。 + 空文字列はチェック対象外。 + ・IsHiragana： + ・型：bool（既定値：false） + ・説明：平仮名チェックを有効にする。 + 空文字列はチェック対象外。 + ・IsDate： + ・型：bool（既定値：false） + ・説明：日付チェックを有効にする（DateTime型にTryParseできるかどうか）。 + 空文字列はチェック対象外。 + + ●CheckRegExpプロパティ： + ・型：string（既定値：空文字列） + ・説明：正規表現チェック・パターンを定義 + + ●CheckProhibitedCharプロパティ： + ・型：bool（既定値：false） + ・説明：禁則文字チェックを有効にする（禁則文字はライブラリの固定値）。 + + ＜編集系＞ + ●EditInitialValueプロパティ： + ・型：EditInitialValue列挙型 + ・説明：初期値を定義 + 空文字初期化時や空文字クリア時の初期値を指定する。 + デザイナ中では動作しない。Textプロパティを優先する。 + + ・EditInitialValue列挙型： + ・Blank（既定値）： + ・型：int + ・説明：空文字列 + ・Zero： + ・型：int + ・説明：「0」 + + t)EditAddFigureプロパティ： + ・型：EditAddFigure列挙型 + ・説明：桁区切りを定義 + + ・EditAddFigure列挙型： + ・None（既定値）： + ・型：int + ・説明：編集なし + ・Af3： + ・型：int + ・説明：三桁区切り + ・Af4： + ・型：int + ・説明：四桁区切り + + t)EditPaddingプロパティ： + ・型：EditPaddingクラス + ・説明：文字埋め編集を定義 + + ・EditPaddingクラス： + ・PadDirection： + ・型：PadDirection列挙型 + ・説明：パッド方向を指定 + ・PadChar： + ・型：char? + ・説明：パッド文字を指定（nullは半角スペースを意味する） + + ・PadDirection列挙型： + ・None（既定値）： + ・型：int + ・説明：編集なし + ・Right： + ・型：int + ・説明：右側にパッド + ・Left： + ・型：int + ・説明：左側にパッド + + t)EditDigitsAfterDPプロパティ： + ・型：EditDigitsAfterDPクラス + ・説明：（編集後）小数点以下ｘ桁編集を定義 + + ・EditDigitsAfterDPクラス： + ・HowToCut： + ・型：CutMethod?列挙型 + ・説明：切り方を指定 + ・DigitsAfterDP： + ・型：uint（既定値：0） + ・説明：小数点数以下ｘ桁を指定 + + ・CutMethod列挙型： + ・None（既定値）： + ・型：int + ・説明：編集なし + ・Banker： + ・型：int + ・説明：最近接偶数編集 + ・_4sya5nyu： + ・型：int + ・説明：四捨五入 + ・Floor： + ・型：int + ・説明：切り捨て + ・Ceiling： + ・型：int + ・説明：切り上げ + + t)EditDigitsAfterDP_Editingプロパティ： + ・型：EditDigitsAfterDPクラス + ・説明：（編集中）小数点以下ｘ桁編集を定義 + + ・EditDigitsAfterDPクラス：同上 + ・CutMethod列挙型：同上 + + t)DisplayUnitsプロパティ： + ・型：uint? + ・説明： + ・単位編集を定義（10の^ｎ乗のｎを定義） + ・編集時は、Value値 / 10の^ｎ乗で単位を変更する。 + ・ちなみに、10の^0乗は、1で単位変更無しとなる。 + + m)Mask_Editingプロパティ： + ・型：string（既定値：空文字列） + ・説明：編集中のマスク（このコントロールに許可される入力を管理する文字列を設定します。 + + m)HankakuOnlyプロパティ： + ・型：bool（既定値：false） + ・説明：編集中のマスクが半角制限できないので、別途半角編集を設定する。 + +・・・ + +＜データバインディングの対象プロパティ＞ + - WinCustomTextBox + - Text : 通常のTextプロパティ（画面表示用） + バインド可能だが、単位変換に対応していない。 + - Text2 : ユーザ入力のTextを取得するプロパティ + ココにバインドしてばダメ（編集処理が動作しない）。 + - Text3 : 編集処理込のTextを取得するプロパティ + バインド可能だが、単位変換に対応していない。 + - Value : 単位変換に対応したプロパティ + 単位変換がある場合、Valueを使用しないと動作しない。 + + - WinCustomMaskedTextBox + - Text : 通常のTextプロパティ（画面表示用） + データバインディングで利用可能。 + - Text2 : マスクを除いた値を設定・取得するプロパティ + データバインディングで利用不可能。 + - Text3 : 表示時マスク適用時の値を取得するプロパティ + 取得専用のため入力単方向のデータバインディングのみ利用可能。 diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_BatUpd.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Dynamic.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Business/LayerB_Static.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Common/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml new file mode 100644 index 000000000..01c4fe4a0 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D1_Insert.xml @@ -0,0 +1,27 @@ + + + -- DaoCategories_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [Categories] + ( + + [CategoryID], + [CategoryName], + [Description], + [Picture], + + ) + VALUES + ( + + @CategoryID, + @CategoryName, + @Description, + @Picture, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml new file mode 100644 index 000000000..f016b896d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D2_Select.xml @@ -0,0 +1,23 @@ + + + -- DaoCategories_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [CategoryID], + [CategoryName], + [Description], + [Picture] + FROM + [Categories] + + WHERE + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [CategoryID] LIKE @CategoryID_Like + AND [CategoryName] = @CategoryNameAND [CategoryName] IS NULL + AND [CategoryName] LIKE @CategoryName_Like + AND [Description] = @DescriptionAND [Description] IS NULL + AND [Description] LIKE @Description_Like + AND [Picture] = @PictureAND [Picture] IS NULL + AND [Picture] LIKE @Picture_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml new file mode 100644 index 000000000..5bf09fbc0 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D3_Update.xml @@ -0,0 +1,21 @@ + + + -- DaoCategories_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Categories] + SET + + [CategoryID] = @Set_CategoryID_forUPD, + [CategoryName] = @Set_CategoryName_forUPD, + [Description] = @Set_Description_forUPD, + [Picture] = @Set_Picture_forUPD, + + + WHERE + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [CategoryName] = @CategoryNameAND [CategoryName] IS NULL + AND [Description] = @DescriptionAND [Description] IS NULL + AND [Picture] = @PictureAND [Picture] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml new file mode 100644 index 000000000..f16df1a84 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D4_Delete.xml @@ -0,0 +1,14 @@ + + + -- DaoCategories_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Categories] + + WHERE + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [CategoryName] = @CategoryNameAND [CategoryName] IS NULL + AND [Description] = @DescriptionAND [Description] IS NULL + AND [Picture] = @PictureAND [Picture] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml new file mode 100644 index 000000000..8ca79b45a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_D5_SelCnt.xml @@ -0,0 +1,20 @@ + + + -- DaoCategories_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [Categories] + + WHERE + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [CategoryID] LIKE @CategoryID_Like + AND [CategoryName] = @CategoryNameAND [CategoryName] IS NULL + AND [CategoryName] LIKE @CategoryName_Like + AND [Description] = @DescriptionAND [Description] IS NULL + AND [Description] LIKE @Description_Like + AND [Picture] = @PictureAND [Picture] IS NULL + AND [Picture] LIKE @Picture_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql new file mode 100644 index 000000000..629b90267 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S1_Insert.sql @@ -0,0 +1,17 @@ +-- DaoCategories_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [Categories] + ( + [CategoryID], + [CategoryName], + [Description], + [Picture] + ) +VALUES + ( + @CategoryID, + @CategoryName, + @Description, + @Picture + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml new file mode 100644 index 000000000..0ba98eb35 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- DaoCategories_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [CategoryID], + [CategoryName], + [Description], + [Picture] + FROM + [Categories] + + WHERE + [CategoryID] = @CategoryID + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml new file mode 100644 index 000000000..fb541c09e --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- DaoCategories_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Categories] + SET + + [CategoryID] = @Set_CategoryID_forUPD, + [CategoryName] = @Set_CategoryName_forUPD, + [Description] = @Set_Description_forUPD, + [Picture] = @Set_Picture_forUPD, + + WHERE + [CategoryID] = @CategoryID + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml new file mode 100644 index 000000000..4eebb5453 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoCategories_S4_Delete.xml @@ -0,0 +1,11 @@ + + + -- DaoCategories_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Categories] + + WHERE + [CategoryID] = @CategoryID + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml new file mode 100644 index 000000000..38a9bcad0 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D1_Insert.xml @@ -0,0 +1,39 @@ + + + -- DaoProducts_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [Products] + ( + + [ProductID], + [ProductName], + [SupplierID], + [CategoryID], + [QuantityPerUnit], + [UnitPrice], + [UnitsInStock], + [UnitsOnOrder], + [ReorderLevel], + [Discontinued], + + ) + VALUES + ( + + @ProductID, + @ProductName, + @SupplierID, + @CategoryID, + @QuantityPerUnit, + @UnitPrice, + @UnitsInStock, + @UnitsOnOrder, + @ReorderLevel, + @Discontinued, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml new file mode 100644 index 000000000..0c7fbb6cf --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D2_Select.xml @@ -0,0 +1,41 @@ + + + -- DaoProducts_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [ProductID], + [ProductName], + [SupplierID], + [CategoryID], + [QuantityPerUnit], + [UnitPrice], + [UnitsInStock], + [UnitsOnOrder], + [ReorderLevel], + [Discontinued] + FROM + [Products] + + WHERE + AND [ProductID] = @ProductIDAND [ProductID] IS NULL + AND [ProductID] LIKE @ProductID_Like + AND [ProductName] = @ProductNameAND [ProductName] IS NULL + AND [ProductName] LIKE @ProductName_Like + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [SupplierID] LIKE @SupplierID_Like + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [CategoryID] LIKE @CategoryID_Like + AND [QuantityPerUnit] = @QuantityPerUnitAND [QuantityPerUnit] IS NULL + AND [QuantityPerUnit] LIKE @QuantityPerUnit_Like + AND [UnitPrice] = @UnitPriceAND [UnitPrice] IS NULL + AND [UnitPrice] LIKE @UnitPrice_Like + AND [UnitsInStock] = @UnitsInStockAND [UnitsInStock] IS NULL + AND [UnitsInStock] LIKE @UnitsInStock_Like + AND [UnitsOnOrder] = @UnitsOnOrderAND [UnitsOnOrder] IS NULL + AND [UnitsOnOrder] LIKE @UnitsOnOrder_Like + AND [ReorderLevel] = @ReorderLevelAND [ReorderLevel] IS NULL + AND [ReorderLevel] LIKE @ReorderLevel_Like + AND [Discontinued] = @DiscontinuedAND [Discontinued] IS NULL + AND [Discontinued] LIKE @Discontinued_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml new file mode 100644 index 000000000..d942f4b6e --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D3_Update.xml @@ -0,0 +1,33 @@ + + + -- DaoProducts_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Products] + SET + + [ProductID] = @Set_ProductID_forUPD, + [ProductName] = @Set_ProductName_forUPD, + [SupplierID] = @Set_SupplierID_forUPD, + [CategoryID] = @Set_CategoryID_forUPD, + [QuantityPerUnit] = @Set_QuantityPerUnit_forUPD, + [UnitPrice] = @Set_UnitPrice_forUPD, + [UnitsInStock] = @Set_UnitsInStock_forUPD, + [UnitsOnOrder] = @Set_UnitsOnOrder_forUPD, + [ReorderLevel] = @Set_ReorderLevel_forUPD, + [Discontinued] = @Set_Discontinued_forUPD, + + + WHERE + AND [ProductID] = @ProductIDAND [ProductID] IS NULL + AND [ProductName] = @ProductNameAND [ProductName] IS NULL + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [QuantityPerUnit] = @QuantityPerUnitAND [QuantityPerUnit] IS NULL + AND [UnitPrice] = @UnitPriceAND [UnitPrice] IS NULL + AND [UnitsInStock] = @UnitsInStockAND [UnitsInStock] IS NULL + AND [UnitsOnOrder] = @UnitsOnOrderAND [UnitsOnOrder] IS NULL + AND [ReorderLevel] = @ReorderLevelAND [ReorderLevel] IS NULL + AND [Discontinued] = @DiscontinuedAND [Discontinued] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml new file mode 100644 index 000000000..116ade54c --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D4_Delete.xml @@ -0,0 +1,20 @@ + + + -- DaoProducts_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Products] + + WHERE + AND [ProductID] = @ProductIDAND [ProductID] IS NULL + AND [ProductName] = @ProductNameAND [ProductName] IS NULL + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [QuantityPerUnit] = @QuantityPerUnitAND [QuantityPerUnit] IS NULL + AND [UnitPrice] = @UnitPriceAND [UnitPrice] IS NULL + AND [UnitsInStock] = @UnitsInStockAND [UnitsInStock] IS NULL + AND [UnitsOnOrder] = @UnitsOnOrderAND [UnitsOnOrder] IS NULL + AND [ReorderLevel] = @ReorderLevelAND [ReorderLevel] IS NULL + AND [Discontinued] = @DiscontinuedAND [Discontinued] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml new file mode 100644 index 000000000..d25f849fb --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_D5_SelCnt.xml @@ -0,0 +1,32 @@ + + + -- DaoProducts_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [Products] + + WHERE + AND [ProductID] = @ProductIDAND [ProductID] IS NULL + AND [ProductID] LIKE @ProductID_Like + AND [ProductName] = @ProductNameAND [ProductName] IS NULL + AND [ProductName] LIKE @ProductName_Like + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [SupplierID] LIKE @SupplierID_Like + AND [CategoryID] = @CategoryIDAND [CategoryID] IS NULL + AND [CategoryID] LIKE @CategoryID_Like + AND [QuantityPerUnit] = @QuantityPerUnitAND [QuantityPerUnit] IS NULL + AND [QuantityPerUnit] LIKE @QuantityPerUnit_Like + AND [UnitPrice] = @UnitPriceAND [UnitPrice] IS NULL + AND [UnitPrice] LIKE @UnitPrice_Like + AND [UnitsInStock] = @UnitsInStockAND [UnitsInStock] IS NULL + AND [UnitsInStock] LIKE @UnitsInStock_Like + AND [UnitsOnOrder] = @UnitsOnOrderAND [UnitsOnOrder] IS NULL + AND [UnitsOnOrder] LIKE @UnitsOnOrder_Like + AND [ReorderLevel] = @ReorderLevelAND [ReorderLevel] IS NULL + AND [ReorderLevel] LIKE @ReorderLevel_Like + AND [Discontinued] = @DiscontinuedAND [Discontinued] IS NULL + AND [Discontinued] LIKE @Discontinued_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql new file mode 100644 index 000000000..4b4eb3dad --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S1_Insert.sql @@ -0,0 +1,27 @@ +-- DaoProducts_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [Products] + ( + [ProductName], + [SupplierID], + [CategoryID], + [QuantityPerUnit], + [UnitPrice], + [UnitsInStock], + [UnitsOnOrder], + [ReorderLevel], + [Discontinued] + ) +VALUES + ( + @ProductName, + @SupplierID, + @CategoryID, + @QuantityPerUnit, + @UnitPrice, + @UnitsInStock, + @UnitsOnOrder, + @ReorderLevel, + @Discontinued + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml new file mode 100644 index 000000000..9ea3f49ce --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S2_Select.xml @@ -0,0 +1,22 @@ + + + -- DaoProducts_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [ProductID], + [ProductName], + [SupplierID], + [CategoryID], + [QuantityPerUnit], + [UnitPrice], + [UnitsInStock], + [UnitsOnOrder], + [ReorderLevel], + [Discontinued] + FROM + [Products] + + WHERE + [ProductID] = @ProductID + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml new file mode 100644 index 000000000..1892bb6c8 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S3_Update.xml @@ -0,0 +1,22 @@ + + + -- DaoProducts_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Products] + SET + + [ProductID] = @Set_ProductID_forUPD, + [ProductName] = @Set_ProductName_forUPD, + [SupplierID] = @Set_SupplierID_forUPD, + [CategoryID] = @Set_CategoryID_forUPD, + [QuantityPerUnit] = @Set_QuantityPerUnit_forUPD, + [UnitPrice] = @Set_UnitPrice_forUPD, + [UnitsInStock] = @Set_UnitsInStock_forUPD, + [UnitsOnOrder] = @Set_UnitsOnOrder_forUPD, + [ReorderLevel] = @Set_ReorderLevel_forUPD, + [Discontinued] = @Set_Discontinued_forUPD, + + WHERE + [ProductID] = @ProductID + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml new file mode 100644 index 000000000..d48b8ae0b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoProducts_S4_Delete.xml @@ -0,0 +1,11 @@ + + + -- DaoProducts_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Products] + + WHERE + [ProductID] = @ProductID + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml new file mode 100644 index 000000000..ad1b79ecc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D1_Insert.xml @@ -0,0 +1,43 @@ + + + -- DaoSuppliers_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [Suppliers] + ( + + [SupplierID], + [CompanyName], + [ContactName], + [ContactTitle], + [Address], + [City], + [Region], + [PostalCode], + [Country], + [Phone], + [Fax], + [HomePage], + + ) + VALUES + ( + + @SupplierID, + @CompanyName, + @ContactName, + @ContactTitle, + @Address, + @City, + @Region, + @PostalCode, + @Country, + @Phone, + @Fax, + @HomePage, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml new file mode 100644 index 000000000..0858fa65f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D2_Select.xml @@ -0,0 +1,47 @@ + + + -- DaoSuppliers_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [SupplierID], + [CompanyName], + [ContactName], + [ContactTitle], + [Address], + [City], + [Region], + [PostalCode], + [Country], + [Phone], + [Fax], + [HomePage] + FROM + [Suppliers] + + WHERE + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [SupplierID] LIKE @SupplierID_Like + AND [CompanyName] = @CompanyNameAND [CompanyName] IS NULL + AND [CompanyName] LIKE @CompanyName_Like + AND [ContactName] = @ContactNameAND [ContactName] IS NULL + AND [ContactName] LIKE @ContactName_Like + AND [ContactTitle] = @ContactTitleAND [ContactTitle] IS NULL + AND [ContactTitle] LIKE @ContactTitle_Like + AND [Address] = @AddressAND [Address] IS NULL + AND [Address] LIKE @Address_Like + AND [City] = @CityAND [City] IS NULL + AND [City] LIKE @City_Like + AND [Region] = @RegionAND [Region] IS NULL + AND [Region] LIKE @Region_Like + AND [PostalCode] = @PostalCodeAND [PostalCode] IS NULL + AND [PostalCode] LIKE @PostalCode_Like + AND [Country] = @CountryAND [Country] IS NULL + AND [Country] LIKE @Country_Like + AND [Phone] = @PhoneAND [Phone] IS NULL + AND [Phone] LIKE @Phone_Like + AND [Fax] = @FaxAND [Fax] IS NULL + AND [Fax] LIKE @Fax_Like + AND [HomePage] = @HomePageAND [HomePage] IS NULL + AND [HomePage] LIKE @HomePage_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml new file mode 100644 index 000000000..dd08a95d0 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D3_Update.xml @@ -0,0 +1,37 @@ + + + -- DaoSuppliers_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Suppliers] + SET + + [SupplierID] = @Set_SupplierID_forUPD, + [CompanyName] = @Set_CompanyName_forUPD, + [ContactName] = @Set_ContactName_forUPD, + [ContactTitle] = @Set_ContactTitle_forUPD, + [Address] = @Set_Address_forUPD, + [City] = @Set_City_forUPD, + [Region] = @Set_Region_forUPD, + [PostalCode] = @Set_PostalCode_forUPD, + [Country] = @Set_Country_forUPD, + [Phone] = @Set_Phone_forUPD, + [Fax] = @Set_Fax_forUPD, + [HomePage] = @Set_HomePage_forUPD, + + + WHERE + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [CompanyName] = @CompanyNameAND [CompanyName] IS NULL + AND [ContactName] = @ContactNameAND [ContactName] IS NULL + AND [ContactTitle] = @ContactTitleAND [ContactTitle] IS NULL + AND [Address] = @AddressAND [Address] IS NULL + AND [City] = @CityAND [City] IS NULL + AND [Region] = @RegionAND [Region] IS NULL + AND [PostalCode] = @PostalCodeAND [PostalCode] IS NULL + AND [Country] = @CountryAND [Country] IS NULL + AND [Phone] = @PhoneAND [Phone] IS NULL + AND [Fax] = @FaxAND [Fax] IS NULL + AND [HomePage] = @HomePageAND [HomePage] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml new file mode 100644 index 000000000..22df9e99e --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D4_Delete.xml @@ -0,0 +1,22 @@ + + + -- DaoSuppliers_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Suppliers] + + WHERE + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [CompanyName] = @CompanyNameAND [CompanyName] IS NULL + AND [ContactName] = @ContactNameAND [ContactName] IS NULL + AND [ContactTitle] = @ContactTitleAND [ContactTitle] IS NULL + AND [Address] = @AddressAND [Address] IS NULL + AND [City] = @CityAND [City] IS NULL + AND [Region] = @RegionAND [Region] IS NULL + AND [PostalCode] = @PostalCodeAND [PostalCode] IS NULL + AND [Country] = @CountryAND [Country] IS NULL + AND [Phone] = @PhoneAND [Phone] IS NULL + AND [Fax] = @FaxAND [Fax] IS NULL + AND [HomePage] = @HomePageAND [HomePage] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml new file mode 100644 index 000000000..ff767cc32 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_D5_SelCnt.xml @@ -0,0 +1,36 @@ + + + -- DaoSuppliers_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [Suppliers] + + WHERE + AND [SupplierID] = @SupplierIDAND [SupplierID] IS NULL + AND [SupplierID] LIKE @SupplierID_Like + AND [CompanyName] = @CompanyNameAND [CompanyName] IS NULL + AND [CompanyName] LIKE @CompanyName_Like + AND [ContactName] = @ContactNameAND [ContactName] IS NULL + AND [ContactName] LIKE @ContactName_Like + AND [ContactTitle] = @ContactTitleAND [ContactTitle] IS NULL + AND [ContactTitle] LIKE @ContactTitle_Like + AND [Address] = @AddressAND [Address] IS NULL + AND [Address] LIKE @Address_Like + AND [City] = @CityAND [City] IS NULL + AND [City] LIKE @City_Like + AND [Region] = @RegionAND [Region] IS NULL + AND [Region] LIKE @Region_Like + AND [PostalCode] = @PostalCodeAND [PostalCode] IS NULL + AND [PostalCode] LIKE @PostalCode_Like + AND [Country] = @CountryAND [Country] IS NULL + AND [Country] LIKE @Country_Like + AND [Phone] = @PhoneAND [Phone] IS NULL + AND [Phone] LIKE @Phone_Like + AND [Fax] = @FaxAND [Fax] IS NULL + AND [Fax] LIKE @Fax_Like + AND [HomePage] = @HomePageAND [HomePage] IS NULL + AND [HomePage] LIKE @HomePage_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql new file mode 100644 index 000000000..d66b85544 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S1_Insert.sql @@ -0,0 +1,31 @@ +-- DaoSuppliers_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [Suppliers] + ( + [CompanyName], + [ContactName], + [ContactTitle], + [Address], + [City], + [Region], + [PostalCode], + [Country], + [Phone], + [Fax], + [HomePage] + ) +VALUES + ( + @CompanyName, + @ContactName, + @ContactTitle, + @Address, + @City, + @Region, + @PostalCode, + @Country, + @Phone, + @Fax, + @HomePage + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml new file mode 100644 index 000000000..c66adabcc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S2_Select.xml @@ -0,0 +1,24 @@ + + + -- DaoSuppliers_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [SupplierID], + [CompanyName], + [ContactName], + [ContactTitle], + [Address], + [City], + [Region], + [PostalCode], + [Country], + [Phone], + [Fax], + [HomePage] + FROM + [Suppliers] + + WHERE + [SupplierID] = @SupplierID + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml new file mode 100644 index 000000000..8564ee366 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S3_Update.xml @@ -0,0 +1,24 @@ + + + -- DaoSuppliers_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Suppliers] + SET + + [SupplierID] = @Set_SupplierID_forUPD, + [CompanyName] = @Set_CompanyName_forUPD, + [ContactName] = @Set_ContactName_forUPD, + [ContactTitle] = @Set_ContactTitle_forUPD, + [Address] = @Set_Address_forUPD, + [City] = @Set_City_forUPD, + [Region] = @Set_Region_forUPD, + [PostalCode] = @Set_PostalCode_forUPD, + [Country] = @Set_Country_forUPD, + [Phone] = @Set_Phone_forUPD, + [Fax] = @Set_Fax_forUPD, + [HomePage] = @Set_HomePage_forUPD, + + WHERE + [SupplierID] = @SupplierID + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml new file mode 100644 index 000000000..e99148887 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Dao/DaoSuppliers_S4_Delete.xml @@ -0,0 +1,11 @@ + + + -- DaoSuppliers_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Suppliers] + + WHERE + [SupplierID] = @SupplierID + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Diagram.bmp new file mode 100644 index 0000000000000000000000000000000000000000..840ebb973fc944641198d50e95d66a0390fd995e GIT binary patch literal 377414 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 GenDaoAndBatUpd_sample WindowsForms - v4.6 + v4.8 2.0 @@ -56,23 +56,23 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt new file mode 100644 index 000000000..a5606b99f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/Readme.txt @@ -0,0 +1 @@ +自動生成Daoの利用サンプル \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config similarity index 85% rename from root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config rename to root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index a8622b97c..e923d5238 100644 --- a/root_VS2015/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -4,7 +4,7 @@ - + @@ -17,9 +17,7 @@ - - @@ -30,15 +28,12 @@ - - - - + @@ -46,10 +41,10 @@ - - + + - + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml new file mode 100644 index 000000000..6b0ba38ec --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D1_Insert.xml @@ -0,0 +1,25 @@ + + + -- Daots_test_table1_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [ts_test_table1] + ( + + [id], + [val], + [ts], + + ) + VALUES + ( + + @id, + @val, + RAND(), + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml new file mode 100644 index 000000000..56ba3da57 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D2_Select.xml @@ -0,0 +1,20 @@ + + + -- Daots_test_table1_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [val], + [ts] + FROM + [ts_test_table1] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml new file mode 100644 index 000000000..956f494cf --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D3_Update.xml @@ -0,0 +1,19 @@ + + + -- Daots_test_table1_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_table1] + SET + + [id] = @Set_id_forUPD, + [val] = @Set_val_forUPD, + [ts] = RAND(), + + + WHERE + AND [id] = @idAND [id] IS NULL + AND [val] = @valAND [val] IS NULL + AND [ts] = @tsAND [ts] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml new file mode 100644 index 000000000..45d245f80 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D4_Delete.xml @@ -0,0 +1,13 @@ + + + -- Daots_test_table1_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_table1] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [val] = @valAND [val] IS NULL + AND [ts] = @tsAND [ts] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml new file mode 100644 index 000000000..f41b68bd9 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_D5_SelCnt.xml @@ -0,0 +1,18 @@ + + + -- Daots_test_table1_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [ts_test_table1] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql new file mode 100644 index 000000000..2c7f621db --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S1_Insert.sql @@ -0,0 +1,13 @@ +-- Daots_test_table1_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [ts_test_table1] + ( + [val], + [ts] + ) +VALUES + ( + @val, + RAND() + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml new file mode 100644 index 000000000..e40c9368a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_table1_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [val], + [ts] + FROM + [ts_test_table1] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml new file mode 100644 index 000000000..ff6df1527 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_table1_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_table1] + SET + + [id] = @Set_id_forUPD, + [val] = @Set_val_forUPD, + [ts] = RAND(), + + WHERE + [id] = @id + AND [ts] = @ts + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml new file mode 100644 index 000000000..6d507adeb --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table1_S4_Delete.xml @@ -0,0 +1,12 @@ + + + -- Daots_test_table1_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_table1] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml new file mode 100644 index 000000000..5ccf03a9a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D1_Insert.xml @@ -0,0 +1,25 @@ + + + -- Daots_test_table2_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [ts_test_table2] + ( + + [id], + [ts], + [val], + + ) + VALUES + ( + + @id, + RAND(), + @val, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml new file mode 100644 index 000000000..8edaedb83 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D2_Select.xml @@ -0,0 +1,20 @@ + + + -- Daots_test_table2_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_table2] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml new file mode 100644 index 000000000..b953ae55f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D3_Update.xml @@ -0,0 +1,19 @@ + + + -- Daots_test_table2_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_table2] + SET + + [id] = @Set_id_forUPD, + [ts] = RAND(), + [val] = @Set_val_forUPD, + + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml new file mode 100644 index 000000000..58693fa28 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D4_Delete.xml @@ -0,0 +1,13 @@ + + + -- Daots_test_table2_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_table2] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml new file mode 100644 index 000000000..0c3482c90 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_D5_SelCnt.xml @@ -0,0 +1,18 @@ + + + -- Daots_test_table2_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [ts_test_table2] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql new file mode 100644 index 000000000..182037b11 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S1_Insert.sql @@ -0,0 +1,13 @@ +-- Daots_test_table2_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [ts_test_table2] + ( + [ts], + [val] + ) +VALUES + ( + RAND(), + @val + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml new file mode 100644 index 000000000..4ebf70b86 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_table2_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_table2] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml new file mode 100644 index 000000000..b5a6dd55d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_table2_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_table2] + SET + + [id] = @Set_id_forUPD, + [ts] = RAND(), + [val] = @Set_val_forUPD, + + WHERE + [id] = @id + AND [ts] = @ts + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml new file mode 100644 index 000000000..01c4641c8 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table2_S4_Delete.xml @@ -0,0 +1,12 @@ + + + -- Daots_test_table2_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_table2] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml new file mode 100644 index 000000000..0e7f4f501 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D1_Insert.xml @@ -0,0 +1,25 @@ + + + -- Daots_test_table3_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [ts_test_table3] + ( + + [id], + [ts], + [val], + + ) + VALUES + ( + + @id, + RAND(), + @val, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml new file mode 100644 index 000000000..5c1a820a9 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D2_Select.xml @@ -0,0 +1,20 @@ + + + -- Daots_test_table3_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_table3] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml new file mode 100644 index 000000000..f35d71248 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D3_Update.xml @@ -0,0 +1,19 @@ + + + -- Daots_test_table3_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_table3] + SET + + [id] = @Set_id_forUPD, + [ts] = RAND(), + [val] = @Set_val_forUPD, + + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml new file mode 100644 index 000000000..f5aacee14 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D4_Delete.xml @@ -0,0 +1,13 @@ + + + -- Daots_test_table3_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_table3] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml new file mode 100644 index 000000000..dd60ea250 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_D5_SelCnt.xml @@ -0,0 +1,18 @@ + + + -- Daots_test_table3_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [ts_test_table3] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql new file mode 100644 index 000000000..44031d0b4 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S1_Insert.sql @@ -0,0 +1,13 @@ +-- Daots_test_table3_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [ts_test_table3] + ( + [ts], + [val] + ) +VALUES + ( + RAND(), + @val + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml new file mode 100644 index 000000000..b4944a314 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_table3_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_table3] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml new file mode 100644 index 000000000..8958a170f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_table3_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_table3] + SET + + [id] = @Set_id_forUPD, + [ts] = RAND(), + [val] = @Set_val_forUPD, + + WHERE + [id] = @id + AND [ts] = @ts + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml new file mode 100644 index 000000000..84030cef6 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_table3_S4_Delete.xml @@ -0,0 +1,12 @@ + + + -- Daots_test_table3_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_table3] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml new file mode 100644 index 000000000..cb90a9e27 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D1_Insert.xml @@ -0,0 +1,25 @@ + + + -- Daots_test_tableA_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [ts_test_tableA] + ( + + [id], + [val], + [ts], + + ) + VALUES + ( + + @id, + @val, + @ts, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml new file mode 100644 index 000000000..dc742072f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D2_Select.xml @@ -0,0 +1,20 @@ + + + -- Daots_test_tableA_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [val], + [ts] + FROM + [ts_test_tableA] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml new file mode 100644 index 000000000..4773458e9 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D3_Update.xml @@ -0,0 +1,19 @@ + + + -- Daots_test_tableA_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_tableA] + SET + + [id] = @Set_id_forUPD, + [val] = @Set_val_forUPD, + [ts] = @Set_ts_forUPD, + + + WHERE + AND [id] = @idAND [id] IS NULL + AND [val] = @valAND [val] IS NULL + AND [ts] = @tsAND [ts] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml new file mode 100644 index 000000000..89eb72fcd --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D4_Delete.xml @@ -0,0 +1,13 @@ + + + -- Daots_test_tableA_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_tableA] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [val] = @valAND [val] IS NULL + AND [ts] = @tsAND [ts] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml new file mode 100644 index 000000000..74b6dc42f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_D5_SelCnt.xml @@ -0,0 +1,18 @@ + + + -- Daots_test_tableA_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [ts_test_tableA] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql new file mode 100644 index 000000000..0e64a34f7 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S1_Insert.sql @@ -0,0 +1,12 @@ +-- Daots_test_tableA_S1_Insert +-- 2014/2/9 日立 太郎 +-- id, tsを消してます。 +INSERT INTO + [ts_test_tableA] + ( + [val] + ) +VALUES + ( + @val + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml new file mode 100644 index 000000000..861acef05 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_tableA_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [val], + [ts] + FROM + [ts_test_tableA] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml new file mode 100644 index 000000000..35f16f535 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_tableA_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_tableA] + SET + + [id] = @Set_id_forUPD, + [val] = @Set_val_forUPD, + [ts] = @Set_ts_forUPD, + + WHERE + [id] = @id + AND [ts] = @ts + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml new file mode 100644 index 000000000..c25cda971 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableA_S4_Delete.xml @@ -0,0 +1,12 @@ + + + -- Daots_test_tableA_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_tableA] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml new file mode 100644 index 000000000..13be4c1af --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D1_Insert.xml @@ -0,0 +1,25 @@ + + + -- Daots_test_tableB_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [ts_test_tableB] + ( + + [id], + [ts], + [val], + + ) + VALUES + ( + + @id, + @ts, + @val, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml new file mode 100644 index 000000000..07093d80f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D2_Select.xml @@ -0,0 +1,20 @@ + + + -- Daots_test_tableB_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_tableB] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml new file mode 100644 index 000000000..bffd6261e --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D3_Update.xml @@ -0,0 +1,19 @@ + + + -- Daots_test_tableB_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_tableB] + SET + + [id] = @Set_id_forUPD, + [ts] = @Set_ts_forUPD, + [val] = @Set_val_forUPD, + + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml new file mode 100644 index 000000000..2a3376c08 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D4_Delete.xml @@ -0,0 +1,13 @@ + + + -- Daots_test_tableB_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_tableB] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml new file mode 100644 index 000000000..1d9130216 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_D5_SelCnt.xml @@ -0,0 +1,18 @@ + + + -- Daots_test_tableB_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [ts_test_tableB] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql new file mode 100644 index 000000000..cf6b84b4a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S1_Insert.sql @@ -0,0 +1,12 @@ +-- Daots_test_tableB_S1_Insert +-- 2014/2/9 日立 太郎 +-- id, tsを消してます。 +INSERT INTO + [ts_test_tableB] + ( + [val] + ) +VALUES + ( + @val + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml new file mode 100644 index 000000000..fa0fd2dd2 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_tableB_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_tableB] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml new file mode 100644 index 000000000..af54151c3 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_tableB_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_tableB] + SET + + [id] = @Set_id_forUPD, + [ts] = @Set_ts_forUPD, + [val] = @Set_val_forUPD, + + WHERE + [id] = @id + AND [ts] = @ts + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml new file mode 100644 index 000000000..891e8632c --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableB_S4_Delete.xml @@ -0,0 +1,12 @@ + + + -- Daots_test_tableB_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_tableB] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml new file mode 100644 index 000000000..0bab94bac --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D1_Insert.xml @@ -0,0 +1,25 @@ + + + -- Daots_test_tableC_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [ts_test_tableC] + ( + + [id], + [ts], + [val], + + ) + VALUES + ( + + @id, + @ts, + @val, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml new file mode 100644 index 000000000..7fb190d2d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D2_Select.xml @@ -0,0 +1,20 @@ + + + -- Daots_test_tableC_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_tableC] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml new file mode 100644 index 000000000..bb52a4fbb --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D3_Update.xml @@ -0,0 +1,19 @@ + + + -- Daots_test_tableC_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_tableC] + SET + + [id] = @Set_id_forUPD, + [ts] = @Set_ts_forUPD, + [val] = @Set_val_forUPD, + + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml new file mode 100644 index 000000000..eb61ce656 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D4_Delete.xml @@ -0,0 +1,13 @@ + + + -- Daots_test_tableC_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_tableC] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [ts] = @tsAND [ts] IS NULL + AND [val] = @valAND [val] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml new file mode 100644 index 000000000..cf42694d9 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_D5_SelCnt.xml @@ -0,0 +1,18 @@ + + + -- Daots_test_tableC_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [ts_test_tableC] + + WHERE + AND [id] = @idAND [id] IS NULL + AND [id] LIKE @id_Like + AND [ts] = @tsAND [ts] IS NULL + AND [ts] LIKE @ts_Like + AND [val] = @valAND [val] IS NULL + AND [val] LIKE @val_Like + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql new file mode 100644 index 000000000..4a0659997 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S1_Insert.sql @@ -0,0 +1,12 @@ +-- Daots_test_tableC_S1_Insert +-- 2014/2/9 日立 太郎 +-- id, tsを消してます。 +INSERT INTO + [ts_test_tableC] + ( + [val] + ) +VALUES + ( + @val + ) diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml new file mode 100644 index 000000000..f85c240f5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S2_Select.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_tableC_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [id], + [ts], + [val] + FROM + [ts_test_tableC] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml new file mode 100644 index 000000000..96984d10c --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S3_Update.xml @@ -0,0 +1,16 @@ + + + -- Daots_test_tableC_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [ts_test_tableC] + SET + + [id] = @Set_id_forUPD, + [ts] = @Set_ts_forUPD, + [val] = @Set_val_forUPD, + + WHERE + [id] = @id + AND [ts] = @ts + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml new file mode 100644 index 000000000..51706668c --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Dao/Daots_test_tableC_S4_Delete.xml @@ -0,0 +1,12 @@ + + + -- Daots_test_tableC_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [ts_test_tableC] + + WHERE + [id] = @id + AND [ts] = @ts + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.resx b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Form1.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Readme.txt b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Readme.txt new file mode 100644 index 000000000..c170df815 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/Readme.txt @@ -0,0 +1,2 @@ +タイムスタンプ対応をした +自動生成Daoの利用サンプル \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln similarity index 82% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 8dee300b6..2e3fa8feb 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TimeStamp_sample", "TimeStamp_sample.vbproj", "{6FEA6EAD-BE15-46A0-A978-D2BA436C7EA6}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {420146DB-270B-48AB-B499-FDFBE7FD1A0D} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj similarity index 98% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj index 9d31e488a..b0e4f7889 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj @@ -11,7 +11,7 @@ _TimeStamp_sample TimeStamp_sample WindowsForms - v4.6 + v4.8 2.0 @@ -56,15 +56,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config similarity index 81% rename from root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config rename to root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config index e143d016f..1ea664dcb 100644 --- a/root_VS2015/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config @@ -30,4 +30,14 @@ + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Business/LayerB.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql new file mode 100644 index 000000000..68cd3f8f5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/CREATE ORDERS2.sql @@ -0,0 +1,34 @@ +USE [Northwind] +GO + +/****** Object: Table [dbo].[Orders2] Script Date: 09/18/2012 20:02:26 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +CREATE TABLE [dbo].[Orders2]( + [OrderID] [int] NOT NULL, + [CustomerID] [nchar](5) NULL, + [EmployeeID] [int] NULL, + [OrderDate] [datetime] NULL, + [RequiredDate] [datetime] NULL, + [ShippedDate] [datetime] NULL, + [ShipVia] [int] NULL, + [Freight] [money] NULL, + [ShipName] [nvarchar](40) NULL, + [ShipAddress] [nvarchar](60) NULL, + [ShipCity] [nvarchar](15) NULL, + [ShipRegion] [nvarchar](15) NULL, + [ShipPostalCode] [nvarchar](10) NULL, + [ShipCountry] [nvarchar](15) NULL, + CONSTRAINT [PK_Orders2] PRIMARY KEY CLUSTERED +( + [OrderID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/ExecuteBatchProcessParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/SelectPkListReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Common/VoidReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml new file mode 100644 index 000000000..37c7dff3d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D1_Insert.xml @@ -0,0 +1,47 @@ + + + -- DaoOrders2_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [Orders2] + ( + + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry], + + ) + VALUES + ( + + @OrderID, + @CustomerID, + @EmployeeID, + @OrderDate, + @RequiredDate, + @ShippedDate, + @ShipVia, + @Freight, + @ShipName, + @ShipAddress, + @ShipCity, + @ShipRegion, + @ShipPostalCode, + @ShipCountry, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml new file mode 100644 index 000000000..bfc69d3dc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D2_Select.xml @@ -0,0 +1,53 @@ + + + -- DaoOrders2_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [OrderID] LIKE @OrderID_Like + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [CustomerID] LIKE @CustomerID_Like + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [EmployeeID] LIKE @EmployeeID_Like + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [OrderDate] LIKE @OrderDate_Like + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [RequiredDate] LIKE @RequiredDate_Like + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShippedDate] LIKE @ShippedDate_Like + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [ShipVia] LIKE @ShipVia_Like + AND [Freight] = @FreightAND [Freight] IS NULL + AND [Freight] LIKE @Freight_Like + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipName] LIKE @ShipName_Like + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipAddress] LIKE @ShipAddress_Like + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipCity] LIKE @ShipCity_Like + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipRegion] LIKE @ShipRegion_Like + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipPostalCode] LIKE @ShipPostalCode_Like + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + AND [ShipCountry] LIKE @ShipCountry_Like + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml new file mode 100644 index 000000000..1d63b95a7 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D3_Update.xml @@ -0,0 +1,41 @@ + + + -- DaoOrders2_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Orders2] + SET + + [OrderID] = @Set_OrderID_forUPD, + [CustomerID] = @Set_CustomerID_forUPD, + [EmployeeID] = @Set_EmployeeID_forUPD, + [OrderDate] = @Set_OrderDate_forUPD, + [RequiredDate] = @Set_RequiredDate_forUPD, + [ShippedDate] = @Set_ShippedDate_forUPD, + [ShipVia] = @Set_ShipVia_forUPD, + [Freight] = @Set_Freight_forUPD, + [ShipName] = @Set_ShipName_forUPD, + [ShipAddress] = @Set_ShipAddress_forUPD, + [ShipCity] = @Set_ShipCity_forUPD, + [ShipRegion] = @Set_ShipRegion_forUPD, + [ShipPostalCode] = @Set_ShipPostalCode_forUPD, + [ShipCountry] = @Set_ShipCountry_forUPD, + + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [Freight] = @FreightAND [Freight] IS NULL + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml new file mode 100644 index 000000000..1b213a3a8 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D4_Delete.xml @@ -0,0 +1,24 @@ + + + -- DaoOrders2_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [Freight] = @FreightAND [Freight] IS NULL + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml new file mode 100644 index 000000000..9aa13071f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_D5_SelCnt.xml @@ -0,0 +1,40 @@ + + + -- DaoOrders2_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [OrderID] LIKE @OrderID_Like + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [CustomerID] LIKE @CustomerID_Like + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [EmployeeID] LIKE @EmployeeID_Like + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [OrderDate] LIKE @OrderDate_Like + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [RequiredDate] LIKE @RequiredDate_Like + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShippedDate] LIKE @ShippedDate_Like + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [ShipVia] LIKE @ShipVia_Like + AND [Freight] = @FreightAND [Freight] IS NULL + AND [Freight] LIKE @Freight_Like + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipName] LIKE @ShipName_Like + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipAddress] LIKE @ShipAddress_Like + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipCity] LIKE @ShipCity_Like + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipRegion] LIKE @ShipRegion_Like + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipPostalCode] LIKE @ShipPostalCode_Like + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + AND [ShipCountry] LIKE @ShipCountry_Like + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql new file mode 100644 index 000000000..333a66f53 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S1_Insert.sql @@ -0,0 +1,37 @@ +-- DaoOrders2_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [Orders2] + ( + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + ) +VALUES + ( + @OrderID, + @CustomerID, + @EmployeeID, + @OrderDate, + @RequiredDate, + @ShippedDate, + @ShipVia, + @Freight, + @ShipName, + @ShipAddress, + @ShipCity, + @ShipRegion, + @ShipPostalCode, + @ShipCountry + ) diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml new file mode 100644 index 000000000..3c2f96e56 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S2_Select.xml @@ -0,0 +1,26 @@ + + + -- DaoOrders2_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders2] + + WHERE + [OrderID] = @OrderID + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml new file mode 100644 index 000000000..7ca37a7ea --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S3_Update.xml @@ -0,0 +1,26 @@ + + + -- DaoOrders2_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Orders2] + SET + + [OrderID] = @Set_OrderID_forUPD, + [CustomerID] = @Set_CustomerID_forUPD, + [EmployeeID] = @Set_EmployeeID_forUPD, + [OrderDate] = @Set_OrderDate_forUPD, + [RequiredDate] = @Set_RequiredDate_forUPD, + [ShippedDate] = @Set_ShippedDate_forUPD, + [ShipVia] = @Set_ShipVia_forUPD, + [Freight] = @Set_Freight_forUPD, + [ShipName] = @Set_ShipName_forUPD, + [ShipAddress] = @Set_ShipAddress_forUPD, + [ShipCity] = @Set_ShipCity_forUPD, + [ShipRegion] = @Set_ShipRegion_forUPD, + [ShipPostalCode] = @Set_ShipPostalCode_forUPD, + [ShipCountry] = @Set_ShipCountry_forUPD, + + WHERE + [OrderID] = @OrderID + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml new file mode 100644 index 000000000..590771730 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/DaoOrders2_S4_Delete.xml @@ -0,0 +1,11 @@ + + + -- DaoOrders2_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Orders2] + + WHERE + [OrderID] = @OrderID + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml new file mode 100644 index 000000000..7d26ab1ad --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectAllOrderID.xml @@ -0,0 +1,9 @@ + + + SELECT + OrderID + FROM + Orders + ORDER BY + OrderID + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml new file mode 100644 index 000000000..60f7cd99a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Dao/SelectInOrderID.xml @@ -0,0 +1,25 @@ + + + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders] + WITH (UPDLOCK) + + WHERE + AND [OrderID] IN(@OrderID) + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Program.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Program.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Program.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Program.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/Properties/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 2c57ef890..cc210b754 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RerunnableBatch_sample", "RerunnableBatch_sample.vbproj", "{22C1AE38-FC51-41A6-870B-8B180B73CE67}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BE19019B-9AB5-4655-A07B-2C70FBC72CE4} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj similarity index 95% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj index 1ea8da959..bdf946792 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj @@ -10,7 +10,7 @@ Properties RerunnableBatch_sample RerunnableBatch_sample - v4.6 + v4.8 @@ -41,15 +41,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config similarity index 94% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config index 6306e27b8..71340f3f2 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -61,14 +61,14 @@ - + - - + + - + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/readme.txt b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/readme.txt new file mode 100644 index 000000000..7d978b91b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/readme.txt @@ -0,0 +1,8 @@ +＜使い方＞ +事前にNorthwindデータベースに対し「CREATE ORDERS2.sql」を実行しORDERS2テーブルを作成して下さい。 +実行の都度、Northwindデータベースに対し「DELETE FROM ORDERS2」と実行しORDERS2テーブルのデータをクリアして下さい。 + +＜特徴＞ +通常のオンライン処理と同様のデータアクセスをバッチ的に行います。 +通常は、静的SQLを使います。必要に応じて動的SQLへ切替えて評価可能です。 +（LayerBクラス内のコードを、dao.S1_Insert → D1_Insertに修正する）。 diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Business/LayerB.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql new file mode 100644 index 000000000..68cd3f8f5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/CREATE ORDERS2.sql @@ -0,0 +1,34 @@ +USE [Northwind] +GO + +/****** Object: Table [dbo].[Orders2] Script Date: 09/18/2012 20:02:26 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +CREATE TABLE [dbo].[Orders2]( + [OrderID] [int] NOT NULL, + [CustomerID] [nchar](5) NULL, + [EmployeeID] [int] NULL, + [OrderDate] [datetime] NULL, + [RequiredDate] [datetime] NULL, + [ShippedDate] [datetime] NULL, + [ShipVia] [int] NULL, + [Freight] [money] NULL, + [ShipName] [nvarchar](40) NULL, + [ShipAddress] [nvarchar](60) NULL, + [ShipCity] [nvarchar](15) NULL, + [ShipRegion] [nvarchar](15) NULL, + [ShipPostalCode] [nvarchar](10) NULL, + [ShipCountry] [nvarchar](15) NULL, + CONSTRAINT [PK_Orders2] PRIMARY KEY CLUSTERED +( + [OrderID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/ExecuteBatchProcessParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/SelectPkListReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Common/VoidReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml new file mode 100644 index 000000000..37c7dff3d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D1_Insert.xml @@ -0,0 +1,47 @@ + + + -- DaoOrders2_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [Orders2] + ( + + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry], + + ) + VALUES + ( + + @OrderID, + @CustomerID, + @EmployeeID, + @OrderDate, + @RequiredDate, + @ShippedDate, + @ShipVia, + @Freight, + @ShipName, + @ShipAddress, + @ShipCity, + @ShipRegion, + @ShipPostalCode, + @ShipCountry, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml new file mode 100644 index 000000000..bfc69d3dc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D2_Select.xml @@ -0,0 +1,53 @@ + + + -- DaoOrders2_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [OrderID] LIKE @OrderID_Like + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [CustomerID] LIKE @CustomerID_Like + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [EmployeeID] LIKE @EmployeeID_Like + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [OrderDate] LIKE @OrderDate_Like + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [RequiredDate] LIKE @RequiredDate_Like + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShippedDate] LIKE @ShippedDate_Like + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [ShipVia] LIKE @ShipVia_Like + AND [Freight] = @FreightAND [Freight] IS NULL + AND [Freight] LIKE @Freight_Like + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipName] LIKE @ShipName_Like + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipAddress] LIKE @ShipAddress_Like + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipCity] LIKE @ShipCity_Like + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipRegion] LIKE @ShipRegion_Like + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipPostalCode] LIKE @ShipPostalCode_Like + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + AND [ShipCountry] LIKE @ShipCountry_Like + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml new file mode 100644 index 000000000..1d63b95a7 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D3_Update.xml @@ -0,0 +1,41 @@ + + + -- DaoOrders2_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Orders2] + SET + + [OrderID] = @Set_OrderID_forUPD, + [CustomerID] = @Set_CustomerID_forUPD, + [EmployeeID] = @Set_EmployeeID_forUPD, + [OrderDate] = @Set_OrderDate_forUPD, + [RequiredDate] = @Set_RequiredDate_forUPD, + [ShippedDate] = @Set_ShippedDate_forUPD, + [ShipVia] = @Set_ShipVia_forUPD, + [Freight] = @Set_Freight_forUPD, + [ShipName] = @Set_ShipName_forUPD, + [ShipAddress] = @Set_ShipAddress_forUPD, + [ShipCity] = @Set_ShipCity_forUPD, + [ShipRegion] = @Set_ShipRegion_forUPD, + [ShipPostalCode] = @Set_ShipPostalCode_forUPD, + [ShipCountry] = @Set_ShipCountry_forUPD, + + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [Freight] = @FreightAND [Freight] IS NULL + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml new file mode 100644 index 000000000..1b213a3a8 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D4_Delete.xml @@ -0,0 +1,24 @@ + + + -- DaoOrders2_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [Freight] = @FreightAND [Freight] IS NULL + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml new file mode 100644 index 000000000..9aa13071f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_D5_SelCnt.xml @@ -0,0 +1,40 @@ + + + -- DaoOrders2_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [OrderID] LIKE @OrderID_Like + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [CustomerID] LIKE @CustomerID_Like + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [EmployeeID] LIKE @EmployeeID_Like + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [OrderDate] LIKE @OrderDate_Like + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [RequiredDate] LIKE @RequiredDate_Like + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShippedDate] LIKE @ShippedDate_Like + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [ShipVia] LIKE @ShipVia_Like + AND [Freight] = @FreightAND [Freight] IS NULL + AND [Freight] LIKE @Freight_Like + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipName] LIKE @ShipName_Like + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipAddress] LIKE @ShipAddress_Like + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipCity] LIKE @ShipCity_Like + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipRegion] LIKE @ShipRegion_Like + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipPostalCode] LIKE @ShipPostalCode_Like + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + AND [ShipCountry] LIKE @ShipCountry_Like + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql new file mode 100644 index 000000000..333a66f53 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S1_Insert.sql @@ -0,0 +1,37 @@ +-- DaoOrders2_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [Orders2] + ( + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + ) +VALUES + ( + @OrderID, + @CustomerID, + @EmployeeID, + @OrderDate, + @RequiredDate, + @ShippedDate, + @ShipVia, + @Freight, + @ShipName, + @ShipAddress, + @ShipCity, + @ShipRegion, + @ShipPostalCode, + @ShipCountry + ) diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml new file mode 100644 index 000000000..3c2f96e56 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S2_Select.xml @@ -0,0 +1,26 @@ + + + -- DaoOrders2_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders2] + + WHERE + [OrderID] = @OrderID + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml new file mode 100644 index 000000000..7ca37a7ea --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S3_Update.xml @@ -0,0 +1,26 @@ + + + -- DaoOrders2_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Orders2] + SET + + [OrderID] = @Set_OrderID_forUPD, + [CustomerID] = @Set_CustomerID_forUPD, + [EmployeeID] = @Set_EmployeeID_forUPD, + [OrderDate] = @Set_OrderDate_forUPD, + [RequiredDate] = @Set_RequiredDate_forUPD, + [ShippedDate] = @Set_ShippedDate_forUPD, + [ShipVia] = @Set_ShipVia_forUPD, + [Freight] = @Set_Freight_forUPD, + [ShipName] = @Set_ShipName_forUPD, + [ShipAddress] = @Set_ShipAddress_forUPD, + [ShipCity] = @Set_ShipCity_forUPD, + [ShipRegion] = @Set_ShipRegion_forUPD, + [ShipPostalCode] = @Set_ShipPostalCode_forUPD, + [ShipCountry] = @Set_ShipCountry_forUPD, + + WHERE + [OrderID] = @OrderID + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml new file mode 100644 index 000000000..590771730 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/DaoOrders2_S4_Delete.xml @@ -0,0 +1,11 @@ + + + -- DaoOrders2_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Orders2] + + WHERE + [OrderID] = @OrderID + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml new file mode 100644 index 000000000..7d26ab1ad --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectAllOrderID.xml @@ -0,0 +1,9 @@ + + + SELECT + OrderID + FROM + Orders + ORDER BY + OrderID + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml new file mode 100644 index 000000000..60f7cd99a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Dao/SelectInOrderID.xml @@ -0,0 +1,25 @@ + + + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders] + WITH (UPDLOCK) + + WHERE + AND [OrderID] IN(@OrderID) + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Program.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Program.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Program.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Program.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/Properties/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index 2da351b6c..a5f8ca7d7 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.vbproj", "{22C1AE38-FC51-41A6-870B-8B180B73CE67}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {061FDDD3-7916-4684-9527-17F796FF254C} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj similarity index 95% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj index 18137d658..53249b572 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj @@ -25,7 +25,7 @@ false false true - v4.6 + v4.8 @@ -56,15 +56,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config similarity index 94% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 7ce5ee118..585e5eb28 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -61,14 +61,14 @@ - + - - + + - + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt new file mode 100644 index 000000000..86f259706 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/readme.txt @@ -0,0 +1,8 @@ +＜使い方＞ +事前にNorthwindデータベースに対し「CREATE ORDERS2.sql」を実行しORDERS2テーブルを作成して下さい。 +実行の都度、Northwindデータベースに対し「DELETE FROM ORDERS2」と実行しORDERS2テーブルのデータをクリアして下さい。 + +＜特徴＞ +ラウンドトリップ軽減のため、SQLUtilityと共に、ExecGenerateSQLメソッドを使用します。 +通常は、静的SQLを使います。必要に応じて動的SQLへ切替えて評価可能です。 +（LayerBクラス内のコードを、DaoOrders2_S1_Insert.sql → DaoOrders2_D1_Insert.xmlに修正する）。 \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Business/LayerB.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql new file mode 100644 index 000000000..68cd3f8f5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/CREATE ORDERS2.sql @@ -0,0 +1,34 @@ +USE [Northwind] +GO + +/****** Object: Table [dbo].[Orders2] Script Date: 09/18/2012 20:02:26 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +CREATE TABLE [dbo].[Orders2]( + [OrderID] [int] NOT NULL, + [CustomerID] [nchar](5) NULL, + [EmployeeID] [int] NULL, + [OrderDate] [datetime] NULL, + [RequiredDate] [datetime] NULL, + [ShippedDate] [datetime] NULL, + [ShipVia] [int] NULL, + [Freight] [money] NULL, + [ShipName] [nvarchar](40) NULL, + [ShipAddress] [nvarchar](60) NULL, + [ShipCity] [nvarchar](15) NULL, + [ShipRegion] [nvarchar](15) NULL, + [ShipPostalCode] [nvarchar](10) NULL, + [ShipCountry] [nvarchar](15) NULL, + CONSTRAINT [PK_Orders2] PRIMARY KEY CLUSTERED +( + [OrderID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/ExecuteBatchProcessParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/SelectPkListReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Common/VoidReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml new file mode 100644 index 000000000..37c7dff3d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D1_Insert.xml @@ -0,0 +1,47 @@ + + + -- DaoOrders2_D1_Insert + -- 2014/2/9 日立 太郎 + INSERT INTO + [Orders2] + ( + + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry], + + ) + VALUES + ( + + @OrderID, + @CustomerID, + @EmployeeID, + @OrderDate, + @RequiredDate, + @ShippedDate, + @ShipVia, + @Freight, + @ShipName, + @ShipAddress, + @ShipCity, + @ShipRegion, + @ShipPostalCode, + @ShipCountry, + + ) + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml new file mode 100644 index 000000000..bfc69d3dc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D2_Select.xml @@ -0,0 +1,53 @@ + + + -- DaoOrders2_D2_Select + -- 2014/2/9 日立 太郎 + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [OrderID] LIKE @OrderID_Like + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [CustomerID] LIKE @CustomerID_Like + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [EmployeeID] LIKE @EmployeeID_Like + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [OrderDate] LIKE @OrderDate_Like + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [RequiredDate] LIKE @RequiredDate_Like + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShippedDate] LIKE @ShippedDate_Like + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [ShipVia] LIKE @ShipVia_Like + AND [Freight] = @FreightAND [Freight] IS NULL + AND [Freight] LIKE @Freight_Like + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipName] LIKE @ShipName_Like + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipAddress] LIKE @ShipAddress_Like + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipCity] LIKE @ShipCity_Like + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipRegion] LIKE @ShipRegion_Like + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipPostalCode] LIKE @ShipPostalCode_Like + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + AND [ShipCountry] LIKE @ShipCountry_Like + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml new file mode 100644 index 000000000..1d63b95a7 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D3_Update.xml @@ -0,0 +1,41 @@ + + + -- DaoOrders2_D3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Orders2] + SET + + [OrderID] = @Set_OrderID_forUPD, + [CustomerID] = @Set_CustomerID_forUPD, + [EmployeeID] = @Set_EmployeeID_forUPD, + [OrderDate] = @Set_OrderDate_forUPD, + [RequiredDate] = @Set_RequiredDate_forUPD, + [ShippedDate] = @Set_ShippedDate_forUPD, + [ShipVia] = @Set_ShipVia_forUPD, + [Freight] = @Set_Freight_forUPD, + [ShipName] = @Set_ShipName_forUPD, + [ShipAddress] = @Set_ShipAddress_forUPD, + [ShipCity] = @Set_ShipCity_forUPD, + [ShipRegion] = @Set_ShipRegion_forUPD, + [ShipPostalCode] = @Set_ShipPostalCode_forUPD, + [ShipCountry] = @Set_ShipCountry_forUPD, + + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [Freight] = @FreightAND [Freight] IS NULL + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml new file mode 100644 index 000000000..1b213a3a8 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D4_Delete.xml @@ -0,0 +1,24 @@ + + + -- DaoOrders2_D4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [Freight] = @FreightAND [Freight] IS NULL + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml new file mode 100644 index 000000000..9aa13071f --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_D5_SelCnt.xml @@ -0,0 +1,40 @@ + + + -- DaoOrders2_D5_SelCnt + -- 2014/2/9 日立 太郎 + SELECT + COUNT(*) + FROM + [Orders2] + + WHERE + AND [OrderID] = @OrderIDAND [OrderID] IS NULL + AND [OrderID] LIKE @OrderID_Like + AND [CustomerID] = @CustomerIDAND [CustomerID] IS NULL + AND [CustomerID] LIKE @CustomerID_Like + AND [EmployeeID] = @EmployeeIDAND [EmployeeID] IS NULL + AND [EmployeeID] LIKE @EmployeeID_Like + AND [OrderDate] = @OrderDateAND [OrderDate] IS NULL + AND [OrderDate] LIKE @OrderDate_Like + AND [RequiredDate] = @RequiredDateAND [RequiredDate] IS NULL + AND [RequiredDate] LIKE @RequiredDate_Like + AND [ShippedDate] = @ShippedDateAND [ShippedDate] IS NULL + AND [ShippedDate] LIKE @ShippedDate_Like + AND [ShipVia] = @ShipViaAND [ShipVia] IS NULL + AND [ShipVia] LIKE @ShipVia_Like + AND [Freight] = @FreightAND [Freight] IS NULL + AND [Freight] LIKE @Freight_Like + AND [ShipName] = @ShipNameAND [ShipName] IS NULL + AND [ShipName] LIKE @ShipName_Like + AND [ShipAddress] = @ShipAddressAND [ShipAddress] IS NULL + AND [ShipAddress] LIKE @ShipAddress_Like + AND [ShipCity] = @ShipCityAND [ShipCity] IS NULL + AND [ShipCity] LIKE @ShipCity_Like + AND [ShipRegion] = @ShipRegionAND [ShipRegion] IS NULL + AND [ShipRegion] LIKE @ShipRegion_Like + AND [ShipPostalCode] = @ShipPostalCodeAND [ShipPostalCode] IS NULL + AND [ShipPostalCode] LIKE @ShipPostalCode_Like + AND [ShipCountry] = @ShipCountryAND [ShipCountry] IS NULL + AND [ShipCountry] LIKE @ShipCountry_Like + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql new file mode 100644 index 000000000..333a66f53 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S1_Insert.sql @@ -0,0 +1,37 @@ +-- DaoOrders2_S1_Insert +-- 2014/2/9 日立 太郎 +INSERT INTO + [Orders2] + ( + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + ) +VALUES + ( + @OrderID, + @CustomerID, + @EmployeeID, + @OrderDate, + @RequiredDate, + @ShippedDate, + @ShipVia, + @Freight, + @ShipName, + @ShipAddress, + @ShipCity, + @ShipRegion, + @ShipPostalCode, + @ShipCountry + ) diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml new file mode 100644 index 000000000..3c2f96e56 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S2_Select.xml @@ -0,0 +1,26 @@ + + + -- DaoOrders2_S2_Select + -- 2014/2/9 日立 太郎 + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders2] + + WHERE + [OrderID] = @OrderID + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml new file mode 100644 index 000000000..7ca37a7ea --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S3_Update.xml @@ -0,0 +1,26 @@ + + + -- DaoOrders2_S3_Update + -- 2014/2/9 日立 太郎 + UPDATE + [Orders2] + SET + + [OrderID] = @Set_OrderID_forUPD, + [CustomerID] = @Set_CustomerID_forUPD, + [EmployeeID] = @Set_EmployeeID_forUPD, + [OrderDate] = @Set_OrderDate_forUPD, + [RequiredDate] = @Set_RequiredDate_forUPD, + [ShippedDate] = @Set_ShippedDate_forUPD, + [ShipVia] = @Set_ShipVia_forUPD, + [Freight] = @Set_Freight_forUPD, + [ShipName] = @Set_ShipName_forUPD, + [ShipAddress] = @Set_ShipAddress_forUPD, + [ShipCity] = @Set_ShipCity_forUPD, + [ShipRegion] = @Set_ShipRegion_forUPD, + [ShipPostalCode] = @Set_ShipPostalCode_forUPD, + [ShipCountry] = @Set_ShipCountry_forUPD, + + WHERE + [OrderID] = @OrderID + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml new file mode 100644 index 000000000..590771730 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/DaoOrders2_S4_Delete.xml @@ -0,0 +1,11 @@ + + + -- DaoOrders2_S4_Delete + -- 2014/2/9 日立 太郎 + DELETE FROM + [Orders2] + + WHERE + [OrderID] = @OrderID + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml new file mode 100644 index 000000000..7d26ab1ad --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectAllOrderID.xml @@ -0,0 +1,9 @@ + + + SELECT + OrderID + FROM + Orders + ORDER BY + OrderID + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml new file mode 100644 index 000000000..60f7cd99a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Dao/SelectInOrderID.xml @@ -0,0 +1,25 @@ + + + SELECT + [OrderID], + [CustomerID], + [EmployeeID], + [OrderDate], + [RequiredDate], + [ShippedDate], + [ShipVia], + [Freight], + [ShipName], + [ShipAddress], + [ShipCity], + [ShipRegion], + [ShipPostalCode], + [ShipCountry] + FROM + [Orders] + WITH (UPDLOCK) + + WHERE + AND [OrderID] IN(@OrderID) + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Program.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Program.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Program.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Program.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/Properties/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 14b19779a..f94621828 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.vbproj", "{22C1AE38-FC51-41A6-870B-8B180B73CE67}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4B5F2626-1F75-4271-B83D-7168C22E48B4} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj similarity index 95% rename from root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj index 838b0def9..360e276c7 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj @@ -25,7 +25,7 @@ false false true - v4.6 + v4.8 @@ -56,15 +56,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config similarity index 94% rename from root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config rename to root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 85757be57..606477a5b 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -61,14 +61,14 @@ - + - - + + - + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt new file mode 100644 index 000000000..ca5a9d30d --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/readme.txt @@ -0,0 +1,7 @@ +＜使い方＞ +事前にNorthwindデータベースに対し「CREATE ORDERS2.sql」を実行しORDERS2テーブルを作成して下さい。 +実行の都度、Northwindデータベースに対し「DELETE FROM ORDERS2」と実行しORDERS2テーブルのデータをクリアして下さい。 + +＜特徴＞ +ラウンドトリップ軽減のため、SQLUtilityを使用してDataTableからInsert文を生成します。 +この測定モデルでは、動的SQLは使用しません。静的SQLのみを使用します。 diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Business/LayerB.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Common/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/DaoShippers.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Dao/LayerD.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Module1.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Module1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Module1.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/Module1.vb diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/Business/RichClient/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 56241cddd..b5343cefc 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SimpleBatch_sample", "SimpleBatch_sample.vbproj", "{AC32DA05-D3CA-4AD3-BC48-0746B457712D}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3B1E11BF-7A37-403D-9E7A-FFD8B62A9C2D} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj similarity index 95% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj index f9cc4a726..47e58f3cb 100644 --- a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj @@ -11,7 +11,7 @@ SimpleBatch_sample SimpleBatch_sample Console - v4.6 + v4.8 2.0 @@ -56,15 +56,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config similarity index 94% rename from root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config rename to root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config index 68ae34b1f..151c6d559 100644 --- a/root_VS2015/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -61,14 +61,14 @@ - + - - + + - + diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/readme.txt b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/readme.txt new file mode 100644 index 000000000..c501c1efb --- /dev/null +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/readme.txt @@ -0,0 +1,4 @@ +以下の様なコマンドライン引数をプロジェクトのプロパティの +デバッグ → 開始オプション → コマンドライン引数から設定して下さい。 + +/Dap SQL /Mode1 individual /Mode2 static /EXROLLBACK - \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Application.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/AsyncFunc.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/My Project/MyExtensions/MyWpfExtension.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml new file mode 100644 index 000000000..6748977c1 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMInProcessDefinition.xml @@ -0,0 +1,18 @@ + + + + +]> + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml new file mode 100644 index 000000000..4a6e66334 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition.xml @@ -0,0 +1,44 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml new file mode 100644 index 000000000..4207915e3 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/TMProtocolDefinition2.xml @@ -0,0 +1,44 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln similarity index 95% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 07922466e..2fd8034fd 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSClientWPF_sample", "WSClientWPF_sample.vbproj", "{5B5899DA-98C9-47B7-8832-A21768D788B0}" EndProject @@ -57,4 +57,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4E1F8E19-8DBC-4795-8D20-CC6E5EF46B71} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj similarity index 96% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj index 7b2b7b00e..59f229bd6 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj @@ -8,7 +8,7 @@ WinExe WSClientWPF_sample WSClientWPF_sample - v4.6 + v4.8 Custom @@ -52,19 +52,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window0.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/Window1.xaml.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config similarity index 96% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index b0b57716f..9c1ed8fe4 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -120,6 +120,11 @@ + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/ByReturn.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form0.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form1.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form2.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.resx diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Form3.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Login.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Program.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/Splash.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx new file mode 100644 index 000000000..aa6999f66 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.resx @@ -0,0 +1,1115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + /9j/4AAQSkZJRgABAgEBLAEsAAD/7QlMUGhvdG9zaG9wIDMuMAA4QklNA+0KUmVzb2x1dGlvbgAAAAAQ + ASwAAAABAAEBLAAAAAEAAThCSU0EDRhGWCBHbG9iYWwgTGlnaHRpbmcgQW5nbGUAAAAABAAAAHg4QklN + BBkSRlggR2xvYmFsIEFsdGl0dWRlAAAAAAQAAAAeOEJJTQPzC1ByaW50IEZsYWdzAAAACQAAAAAAAAAA + AQA4QklNBAoOQ29weXJpZ2h0IEZsYWcAAAAAAQAAOEJJTScQFEphcGFuZXNlIFByaW50IEZsYWdzAAAA + AAoAAQAAAAAAAAACOEJJTQP1F0NvbG9yIEhhbGZ0b25lIFNldHRpbmdzAAAASAAvZmYAAQBsZmYABgAA + AAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThC + SU0D+BdDb2xvciBUcmFuc2ZlciBTZXR0aW5ncwAAAHAAAP////////////////////////////8D6AAA + AAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP// + //////////////////////////8D6AAAOEJJTQQIBkd1aWRlcwAAAAAQAAAAAQAAAkAAAAJAAAAAADhC + SU0EHg1VUkwgb3ZlcnJpZGVzAAAABAAAAAA4QklNBBoGU2xpY2VzAAAAAHUAAAAGAAAAAAAAAAAAAAJY + AAADIAAAAAoAVQBuAHQAaQB0AGwAZQBkAC0AMQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAA + AAADIAAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOEJJTQQREUlDQyBVbnRhZ2dl + ZCBGbGFnAAAAAQEAOEJJTQQUF0xheWVyIElEIEdlbmVyYXRvciBCYXNlAAAABAAAAAI4QklNBAwVTmV3 + IFdpbmRvd3MgVGh1bWJuYWlsAAAFpAAAAAEAAABwAAAAVAAAAVAAAG5AAAAFiAAYAAH/2P/gABBKRklG + AAECAQBIAEgAAP/uAA5BZG9iZQBkgAAAAAH/2wCEAAwICAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgR + 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 + WVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI + ycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYH + CAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy + 0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWG + h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz + 9PX29/j5+v/aAAwDAQACEQMRAD8A9NzRmm7hSbvzrWxycw/NGaZkUuaLBzDs0ZpuaM0WDmHZozTc0ZpW + DmHc0ZpuaM07BzDs0ZpuaM0rBcdmjNNzRmiwcw7NGaTNGaB3HZozTc0ZosLmHZopuaM0WC47NGabmjNF + h3HZozTc0ZosFx2aM0maKB3FozSZozRYOYdmkzSZozRYOYXNFJmjNAXFozSUmaAuOzRmm5ozRYOYdRmk + zRmiwXFzRmm5pciiwcw7NFNzRmiwXHZozTc0ZpDuOozTc0ZoC46jNNzRmgLjs0ZpuaWgLi5ozTc0ZoC4 + 7NGabmjNAXHZpKTNFMLjs0ZptFAXHZozTc0ZoC47NGaTNJmkFx2aM0lGaAuLRmm0ZoC47NGabmjNAXHU + U3NLmgLi5ozSZozQFxaM03NLmgLi0ZpuaXNA7i0ZpM0ZoC4tGaTNGaAuLmjNJmkzRYVxc0ZpM0hbr3p2 + FzDs0ZqJpHA4Xk9BUOydjktj2qlHu7ESq22TZbzRmqghlB+/+NSRhh1Yn3ocV3uJVW94tE+aM0wZHejd + zU2L5h+aMmm5ozRYLjt1G6m5pM0WDmH7qM0zNGaLBzD80ZpmaM0WDnH5ozTM0ZosPnI80ZNNJNANXYxu + OzzRmm5//XSmiwri5Of5UZpM0Z/SiwXFzS7u1NzRmiwXHZozTetGfyosFx27mjdTKM8UWHcfuo3cVHmg + HmiwXJN35Uu7io93AoBNFguSbqN1MzxijNFguP3UbqZn8aM0WC4/NG6mUZPaiwXH7qN1MzQCaLBckzRu + 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 + FA+h/9k= + + + + + /9j/4AAQSkZJRgABAgEBLAEsAAD/7QlMUGhvdG9zaG9wIDMuMAA4QklNA+0KUmVzb2x1dGlvbgAAAAAQ + ASwAAAABAAEBLAAAAAEAAThCSU0EDRhGWCBHbG9iYWwgTGlnaHRpbmcgQW5nbGUAAAAABAAAAHg4QklN + BBkSRlggR2xvYmFsIEFsdGl0dWRlAAAAAAQAAAAeOEJJTQPzC1ByaW50IEZsYWdzAAAACQAAAAAAAAAA + AQA4QklNBAoOQ29weXJpZ2h0IEZsYWcAAAAAAQAAOEJJTScQFEphcGFuZXNlIFByaW50IEZsYWdzAAAA + AAoAAQAAAAAAAAACOEJJTQP1F0NvbG9yIEhhbGZ0b25lIFNldHRpbmdzAAAASAAvZmYAAQBsZmYABgAA + AAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThC + SU0D+BdDb2xvciBUcmFuc2ZlciBTZXR0aW5ncwAAAHAAAP////////////////////////////8D6AAA + AAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP// + //////////////////////////8D6AAAOEJJTQQIBkd1aWRlcwAAAAAQAAAAAQAAAkAAAAJAAAAAADhC + SU0EHg1VUkwgb3ZlcnJpZGVzAAAABAAAAAA4QklNBBoGU2xpY2VzAAAAAHUAAAAGAAAAAAAAAAAAAAJY + AAADIAAAAAoAVQBuAHQAaQB0AGwAZQBkAC0AMQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAA + AAADIAAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOEJJTQQREUlDQyBVbnRhZ2dl + ZCBGbGFnAAAAAQEAOEJJTQQUF0xheWVyIElEIEdlbmVyYXRvciBCYXNlAAAABAAAAAI4QklNBAwVTmV3 + IFdpbmRvd3MgVGh1bWJuYWlsAAAFpAAAAAEAAABwAAAAVAAAAVAAAG5AAAAFiAAYAAH/2P/gABBKRklG + AAECAQBIAEgAAP/uAA5BZG9iZQBkgAAAAAH/2wCEAAwICAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgR + 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 + WVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI + ycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYH + CAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy + 0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWG + h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz + 9PX29/j5+v/aAAwDAQACEQMRAD8A9NzRmm7hSbvzrWxycw/NGaZkUuaLBzDs0ZpuaM0WDmHZozTc0ZpW + DmHc0ZpuaM07BzDs0ZpuaM0rBcdmjNNzRmiwcw7NGaTNGaB3HZozTc0ZosLmHZopuaM0WC47NGabmjNF + h3HZozTc0ZosFx2aM0maKB3FozSZozRYOYdmkzSZozRYOYXNFJmjNAXFozSUmaAuOzRmm5ozRYOYdRmk + zRmiwXFzRmm5pciiwcw7NFNzRmiwXHZozTc0ZpDuOozTc0ZoC46jNNzRmgLjs0ZpuaWgLi5ozTc0ZoC4 + 7NGabmjNAXHZpKTNFMLjs0ZptFAXHZozTc0ZoC47NGaTNJmkFx2aM0lGaAuLRmm0ZoC47NGabmjNAXHU + U3NLmgLi5ozSZozQFxaM03NLmgLi0ZpuaXNA7i0ZpM0ZoC4tGaTNGaAuLmjNJmkzRYVxc0ZpM0hbr3p2 + FzDs0ZqJpHA4Xk9BUOydjktj2qlHu7ESq22TZbzRmqghlB+/+NSRhh1Yn3ocV3uJVW94tE+aM0wZHejd + zU2L5h+aMmm5ozRYLjt1G6m5pM0WDmH7qM0zNGaLBzD80ZpmaM0WDnH5ozTM0ZosPnI80ZNNJNANXYxu + OzzRmm5//XSmiwri5Of5UZpM0Z/SiwXFzS7u1NzRmiwXHZozTetGfyosFx27mjdTKM8UWHcfuo3cVHmg + HmiwXJN35Uu7io93AoBNFguSbqN1MzxijNFguP3UbqZn8aM0WC4/NG6mUZPaiwXH7qN1MzQCaLBckzRu + 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 + FA+h/9k= + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControl3.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.resx diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlChild.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/UserControlParent.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index 09d64096b..a61dc59ba 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSClientWin2_sample", "WSClientWin2_sample.vbproj", "{FBA01A43-1A3F-4C92-ABD1-59C51005A084}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2EF3795B-DF95-4BFA-949C-7971AC6518FD} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj similarity index 97% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj index 26cb243e4..03e4e06c7 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj @@ -11,7 +11,7 @@ WSClientWin2_sample WSClientWin2_sample WindowsFormsWithCustomSubMain - v4.6 + v4.8 2.0 @@ -56,23 +56,23 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config similarity index 88% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config index 6734fd9de..0aed4cfb9 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config @@ -45,6 +45,10 @@ + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/AsyncFunc.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.resx diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Form1.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Login.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Program.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.Designer.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx new file mode 100644 index 000000000..19dc0dd8b --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/Splash.vb diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml new file mode 100644 index 000000000..6748977c1 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMInProcessDefinition.xml @@ -0,0 +1,18 @@ + + + + +]> + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml new file mode 100644 index 000000000..4a6e66334 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition.xml @@ -0,0 +1,44 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml new file mode 100644 index 000000000..4207915e3 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/TMProtocolDefinition2.xml @@ -0,0 +1,44 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln similarity index 94% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 078cb6a57..36be2d5f4 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSClientWin_sample", "WSClientWin_sample.vbproj", "{FBA01A43-1A3F-4C92-ABD1-59C51005A084}" EndProject @@ -45,4 +45,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3A86428A-4B72-42AC-9433-71E6E3B211F3} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj similarity index 96% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj index e6e41bc03..0dc36798f 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj @@ -11,7 +11,7 @@ WSClientWin_sample WSClientWin_sample WindowsFormsWithCustomSubMain - v4.6 + v4.8 2.0 @@ -65,19 +65,19 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.RichClient.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.RichClient.dll packages\Owin.1.0\lib\net40\Owin.dll @@ -85,7 +85,7 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config similarity index 95% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index 60433d9de..94a50f035 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -62,10 +62,10 @@ - + - + @@ -142,6 +142,10 @@ + + + + diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config similarity index 71% rename from root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config rename to root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config index 01670b67c..b2bf84b2a 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj similarity index 95% rename from root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj rename to root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj index bf2cec9ad..7ca9e48bf 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj @@ -11,7 +11,7 @@ WSIFType_sample Windows - v4.6 + v4.8 2.0 @@ -56,10 +56,10 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/Business/LayerB.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/Dao/DaoShippers.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/Dao/LayerD.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/Dao/LayerD.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/Dao/LayerD.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/Dao/LayerD.vb diff --git a/root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.myapp similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.myapp rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.myapp diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln similarity index 89% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index cf570e7f6..4f91c1ce8 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSServer_sample", "WSServer_sample.vbproj", "{15F78DB3-7AB0-4ADF-ADCA-48AFBD54C31E}" EndProject @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {09EC980F-7A96-4740-89E6-F465BAA4D18C} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj similarity index 94% rename from root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj rename to root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj index fe4799f5f..4f00f5ca8 100644 --- a/root_VS2015/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj @@ -11,7 +11,7 @@ WSServer_sample Windows - v4.6 + v4.8 2.0 @@ -56,15 +56,15 @@ False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll False - ..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln similarity index 82% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index 37d45af5b..f4965f025 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MVC_Sample", "MVC_Sample\MVC_Sample.vbproj", "{4427474C-E9AD-451F-BF2C-4EE737D59A60}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6DE80116-495B-4AB0-9677-60A9F20BC4F3} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/BundleConfig.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/FilterConfig.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/RouteConfig.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/App_Start/WebApiConfig.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/app/Site.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-grid.min.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap-reboot.min.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/bootstrap.min.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/font-awesome.min.css diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css new file mode 100644 index 000000000..9bf527574 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css @@ -0,0 +1,205 @@ +/* common.jsで使用している。 */ +.dialog-mask +{ + position : absolute; + top : 0; + left : 0; + opacity : 0.5; + -ms-filter : "alpha(opacity=50)"; /* IE対応 */ + background-color : gray; + z-index : 1000; /* 1000なら最前面だろう ( ToMost相当が無い */ +} + +.progress-dialog +{ + position : fixed; + top : 0; + left : 0; + padding : 10px 10px 0 10px; + text-align : center; + overflow : hidden; /* hiddenに変更*/ + /*width : 300px;*/ /* 位置計算はJSで行うため */ + /*height : 200px;*/ /* 位置計算はJSで行うため */ + background-color : lightcyan; + z-index : 1001; /* dialog-maskより前面に出す。*/ +} + +/* *.master の 分割で使用している。 */ + +/* ヘッダー固定 */ +.page-header +{ + position : fixed; /* ヘッダーの固定 */ + top : 0; /* 位置 (上0px) */ + left : 0; /* 位置 (右0px) */ + margin : 0; + padding : 0; + width : 100%; /* 横幅 100%　*/ + height : 100px; /* 縦幅 100px */ + background-color : #D6DBE9; /* 背景色 */ + z-index : 100; +} + +#header-bk { + background-color : #D6DBE9; /* 背景色 */ + margin : 0; + padding : 0; + width : 100%; /* 横幅 100% */ + height : 100%; /* 縦高 header-fixedと同じ */ +} +#header { + margin : 0; + padding : 5px 0 0 5px; + width : 100%; /* 横幅 100% */ + height : 100%; /* 縦高 header-fixedと同じ */ +} + +#header-logo { + float : left; + text-align : left; + margin : 10px; + padding : 0px; +} +#header-logo img { + width : 80px; + height : 80px; +} +#header-title{ + padding : 20px 0 0 0; +} +#header-button { + padding-top : 20px; +} + +/* フッターの固定 */ +.footer { + position: fixed; + bottom: 0; + width: 100%; + height: 50px; + background-color: #283955; +} +.footer .container { + width: auto; + padding: 0 15px; +} +.footer .container .text-muted { + color: white; + margin: 15px 0; +} + +/* ボディの定義 */ +#body-bk{ + margin : 0; + padding-top : 100px; /* 上にヘッダー分の余白を取る */ + width : 100%; /* 横幅 100% */ + height : 100%; /* 縦幅 100px */ +} +#body{ + margin : 0; + padding : 0; + width : 100%; /* 横幅 100% */ + height : 100%; /* 縦高 body-fixedと同じ */ +} + +/* 左メニューの定義 */ +.nav-side-menu { + overflow: auto; + font-family: verdana; + font-size: 12px; + font-weight: 200; + background-color: #2e353d; + height: 100%; + color: #e1ffff; +} +.nav-side-menu .brand { + line-height: 50px; + display: block; + text-align: center; + font-size: 14px; +} +.nav-side-menu .toggle-btn { + display: none; +} +.nav-side-menu ul, +.nav-side-menu li { + list-style: none; + padding: 0px; + margin: 0px; + line-height: 35px; + cursor: pointer; +} +.nav-side-menu ul :not(collapsed) .arrow:before, +.nav-side-menu li :not(collapsed) .arrow:before { + font-family: FontAwesome; + content: "\f078"; + display: inline-block; + padding-left: 10px; + padding-right: 10px; + vertical-align: middle; + float: right; +} +.nav-side-menu ul .active, +.nav-side-menu li .active { + border-left: 3px solid #d19b3d; + background-color: #4f5b69; +} +.nav-side-menu ul .sub-menu li.active, +.nav-side-menu li .sub-menu li.active { + color: #d19b3d; +} +.nav-side-menu ul .sub-menu li.active a, +.nav-side-menu li .sub-menu li.active a { + color: #d19b3d; +} +.nav-side-menu ul .sub-menu li, +.nav-side-menu li .sub-menu li { + background-color: #181c20; + border: none; + line-height: 28px; + border-bottom: 1px solid #23282e; + margin-left: 0px; +} +.nav-side-menu ul .sub-menu li:hover, +.nav-side-menu li .sub-menu li:hover { + background-color: #020203; +} +.nav-side-menu ul .sub-menu li:before, +.nav-side-menu li .sub-menu li:before { + font-family: FontAwesome; + content: "\f105"; + display: inline-block; + padding-left: 10px; + padding-right: 10px; + vertical-align: middle; +} +.nav-side-menu li { + padding-left: 0px; + border-left: 3px solid #2e353d; + border-bottom: 1px solid #23282e; + + text-decoration: none; + color: #e1ffff; +} +.nav-side-menu li i { + padding-left: 10px; + width: 20px; + padding-right: 20px; +} +.nav-side-menu li:hover { + border-left: 3px solid #d19b3d; + background-color: #4f5b69; + -webkit-transition: all 1s ease; + -moz-transition: all 1s ease; + -o-transition: all 1s ease; + -ms-transition: all 1s ease; + transition: all 1s ease; +} + +/* コンテンツの定義 */ +#contents{ + background-color : #FFFFFF; /* 背景色 */ + float : left; + margin : 0; + padding : 5px 0 50px 5px; +} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud1Controller.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/ErrorController.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/HomeController.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Controllers/PingController.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Global.asax.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Index.html diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Business/LayerB.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Common/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/DaoShippers.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Logic/Dao/LayerD.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj similarity index 95% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj index 370513aa8..42a555534 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj @@ -1,7 +1,7 @@  - + - + Debug AnyCPU @@ -13,7 +13,7 @@ Library MVC_Sample MVC_Sample - v4.6 + v4.8 On Binary Off @@ -29,6 +29,11 @@ ..\ true 3.0 + + + + + 15.0 true @@ -227,18 +232,18 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.Security.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.Security.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -246,7 +251,7 @@ False - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll @@ -320,11 +325,6 @@ - - - - - @@ -343,4 +343,5 @@ + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/BaseViewModel.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/CrudViweModel.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/LoginViewModel.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/ShipperViweModel.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Models/ViewModels/TestShipperViweModel.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/README.md diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/app/Site.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.bundle.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/bootstrap.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper-utils.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/esm/popper.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/index.d.ts diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.intellisense.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.min.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery-3.4.1.slim.min.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.unobtrusive-ajax.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate-vsdoc.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/jquery.validate.unobtrusive.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/modernizr-2.8.3.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper-utils.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/popper.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.matchmedia.addListener.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/respond.min.js diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js new file mode 100644 index 000000000..d07c2cd61 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/common.js @@ -0,0 +1,819 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +// Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//********************************************************************************** +//* ファイル名 ：common.js +//* ファイル日本語名 ：共通のJS処理 +//* +//* 作成日時 ：－ +//* 作成者 ：－ +//* 更新履歴 ：－ +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 201?/0?/0? 西野 大介 新規作成 +//* 2015/02/06 Supragyan Added condition for check AjaxPostBackElement in Fx_AjaxExtensionInitializeRequest +//* 2015/02/06 Supragyan Added condition for check AjaxPostBackElement in Fx_AjaxExtensionEndRequest +//* 2015/02/09 Supragyan Added condition for Trident on Internet Explorer +//* 2015/09/09 Sandeep Added condition code to detect IE-9, IE-10 and IE-11, to suppress double transmission +//* 2015/12/28 Sai Added Java script method for preventing session timeout. +//* 2015/12/28 Sai Commented out window.setInterval method. +//* 2016/01/11 Sai Removed unnecessary code. +//* 2016/01/12 Sai Changed interval in method window.setInterval(HttpPing, 5000) +//* 2016/01/13 Sai Removed Ajax extensions code and added JQuery's Ajax Complete method. +//* 2016/01/22 Sai Added .ajaxSend method to prevent double submit functionality in Ajax form. +//* 2016/01/22 Sai Added flag variable 'PreventAjaxDoubleSubmit', added if condiation to this flag in +//* ajaxSend method to skip progress dialogue also added codign for setting this flag to +//* false in ajaxComplete method. +//* 2016/02/01 Sai Fixed Progress dialog mask not displaying problem. +//* 2016/02/11 Nishi Finish up of the prevent double submition function. +//* 2016/04/15 Sandeep Implemented cross-browser detection method, to suppress double transmission +//* 2016/04/20 Sandeep Created form submission flag, to suppress double transmission +//* 2016/07/05 Sandeep Added cache property in the Ajax ping request to prevent the session timeout. +//* 2017/04/20 西野 大介 showModalDialogのないモダン・ブラウザをサポートするための実装。 +//* 2017/05/11 西野 大介 擬似dialog系のstyleについて色々調整を行った（css化やsize計算方法の変更）。 +//* 2019/03/04 西野 大介 リネーム（ResolveServerUrl -> Fx_ResolveServerUrl） +//* 2019/03/04 西野 大介 二重送信防止のブラウザ判定処理を修正 +//* 2019/03/04 西野 大介 WebForms版とMVC版のDiffを取り易く修正。 +//********************************************************************************** + +// --------------------------------------------------------------- +// ページがロードされた時に呼ばれる +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_Document_OnLoad() { + // OnLoad処理を別スレッドで実行 + setTimeout("Fx_Document_OnLoad2()", 1); +} + +// Form submission flag, to suppress double transmission +var Form_IsSubmitted = false; + +// --------------------------------------------------------------- +// ページがロードされた時に呼ばれる +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_Document_OnLoad2() { + + window.returnValue = ""; + + // Cross-browser detection(先頭に移動) + Fx_WhichBrowser(); + + // Dialogの初期化 + Fx_InitDialogMask(); // Dialog Maskの初期化 + Fx_InitProgressDialog(); // Progress Dialogの初期化 + + // Sessionタイムアウト防止機能 - Open 棟梁 Wiki + // https://opentouryo.osscons.jp/index.php?Session%E3%82%BF%E3%82%A4%E3%83%A0%E3%82%A2%E3%82%A6%E3%83%88%E9%98%B2%E6%AD%A2%E6%A9%9F%E8%83%BD + // Webサーバへ一定時間ごとにpingを行う + //window.setInterval(HttpPing, 5 * 60 * 1000); +} + +// --------------------------------------------------------------- +// セッションタイムアウトを防ぐため、Webサーバへ一定期間ごとにPINGを行う +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function HttpPing() { + $.ajax({ + type: 'GET', + url: Fx_ResolveServerUrl('~/Ping'), + contentType: "application/json; charset=utf-8", + data: {}, + cache:false, + dataType: "json", + success: function () {}, + error: function () {} + }); +} + +// for diff + +// --------------------------------------------------------------- +// このDialogを閉じた時に呼ばれる（ダミー） +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_Document_OnClose() { +} + +// ダウンロード処理の場合、Dialogを表示しない。 +var IsDownload = false; + +// --------------------------------------------------------------- +// サブミットする時に呼ばれ、２重送信を抑止する。 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_OnSubmit() { + + // ---------- + + // このカバレージ（onSubmit）は、 + // ・ポスト バック + // ・ASP.NET Ajax Extension + // のどちらも、通過する。 + + // ---------- + + // In Chrome, Safari and Firefox, document.readyState always returns complete + // Hence double transmission is prevented using Form_IsSubmitted flag + + // ---------- + + if (Browser_IsIE) { + + // Detected browser is Internet Explorer + + if (navigator.appVersion.indexOf("MSIE 6.0") !== -1) { + // IE6.0では、hrefのdoPostBackの２重送信を抑止できない。 + // （onSubmitイベントがハンドルされないため） + } + else if (navigator.appVersion.indexOf("MSIE 7.0") !== -1) { + // IE7.0では完全に有効 + } + else if (navigator.appVersion.indexOf("MSIE 8.0") !== -1) { + // IE8.0では完全に有効 + } + else if (navigator.appVersion.indexOf("MSIE 9.0") !== -1) { + // IE9.0で問題の報告を受けていません。 + } + else if (navigator.appVersion.indexOf("MSIE 10.0") !== -1) { + // IE10.0で問題の報告を受けていません。 + } + else if (navigator.appVersion.indexOf("Trident/7") !== -1) { + // IE11.0で問題があった場合、報告をお願いします。 + } + + if (document.readyState === "complete") { + + // 受信完了 + + // Ajaxでは、completeのままになるので、 + // フラグでのチェックが必要になる。 + if (Ajax_IsProgressed) { + + // An Ajax request is processing + // Prevent other transmissions + return false; + } + else { + + // 送信許可 + Fx_SetProgressDialog(); + return true; + } + } + else { + + // 受信未完了 + // Prevent other transmissions + return false; + } + } + else if (Browser_IsEdge) { + + // Detected browser is Edge + + if (document.readyState === "complete") { + + // 受信完了 + + // Ajaxでは、completeのままになるので、 + // フラグでのチェックが必要になる。 + if (Ajax_IsProgressed) { + + // An Ajax request is processing + // Prevent other transmissions + return false; + } + else { + + // 送信許可 + Fx_SetProgressDialog(); + return true; + } + } + else { + + // 受信未完了 + // Prevent other transmissions + return false; + } + } + else if (Browser_IsChrome || Browser_IsSafari) { + + // Detected browser is Chrome or Safari + + if (Form_IsSubmitted) { + + // A postback or an Ajax request is processing + // Prevent other transmissions + return false; + } + else { + + // 送信許可 + Fx_SetProgressDialog(); + + // Set double submission prevention flag + Form_IsSubmitted = true; + return true; + } + } + else if (Browser_IsFirefox) { + + // Detected browser is Firefox + + if (Form_IsSubmitted) { + + // A postback or an Ajax request is processing + // Prevent other transmissions + return false; + } + else { + + // 送信許可 + Fx_SetProgressDialog(); + + // Set double submission prevention flag + Form_IsSubmitted = true; + return true; + } + } + else if (Browser_IsOpera) { + + // Detected browser is Opera + + if (Form_IsSubmitted) { + + // A postback or an Ajax request is processing + // Prevent other transmissions + return false; + } + else { + + // 送信許可 + Fx_SetProgressDialog(); + + // Set double submission prevention flag + Form_IsSubmitted = true; + return true; + } + } + else { + + // Other browsers + + if (Form_IsSubmitted) { + + // A postback or an Ajax request is processing + // Prevent other transmissions + return false; + } + else { + + // 送信許可 + Fx_SetProgressDialog(); + + // Set double submission prevention flag + Form_IsSubmitted = true; + return true; + } + } +} + +//********************************************************************************** +// Dialog Mask +//********************************************************************************** + +// Ajax：マスク（div） +var Fx_AjaxDialogMask; + +// --------------------------------------------------------------- +// マスクの初期化 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_InitDialogMask() { + + var _div = document.createElement("div"); + _div.className = "dialog-mask"; + + //"100%";では、初期表示画面サイズになってしまう。 + _div.style.height = Math.max.apply(null, [Fx_getBrowserHeight(), Fx_getContentsHeight()]) + "px"; + _div.style.width = Math.max.apply(null, [Fx_getBrowserWidth(), Fx_getContentsWidth()]) + "px"; + + // div → Dialog Mask + Fx_AjaxDialogMask = _div; +} + +// --------------------------------------------------------------- +// マスクのリサイズ +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +var Fx_AjaxDialogMaskResizeTimer; + +window.addEventListener('resize', function (event) { + + if (Fx_AjaxDialogMaskResizeTimer !== false) { + clearTimeout(Fx_AjaxDialogMaskResizeTimer); + } + + Fx_AjaxDialogMaskResizeTimer = setTimeout(function () { + + // マスクのサイズの再計算 + Fx_AjaxDialogMask.style.height = Math.max.apply(null, [Fx_getBrowserHeight(), Fx_getContentsHeight()]) + "px"; + Fx_AjaxDialogMask.style.width = Math.max.apply(null, [Fx_getBrowserWidth(), Fx_getContentsWidth()]) + "px"; + + }, 100); // 100 msec 間隔 +}); + +// --------------------------------------------------------------- +// マスクする。 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_DialogMaskOn() { + document.body.appendChild(Fx_AjaxDialogMask); +} + +// --------------------------------------------------------------- +// マスクを外す。 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_DialogMaskOff() { + document.body.removeChild(Fx_AjaxDialogMask); +} + +//********************************************************************************** +// Progress Dialog +//********************************************************************************** +// Ajax：Progress Dialog（div） +var Fx_AjaxProgressDialog; + +// Ajax：Progress Dialogのサイズ（div） +var Fx_AjaxProgressDialog_Width = 300; +var Fx_AjaxProgressDialog_Height = 200; + +// Ajax：Progress Dialogの表示タイマ +var Fx_ProgressDialogTimer; + +// --------------------------------------------------------------- +// Progress Dialogの初期化 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// ★★★ Dialogのデザインを変える場合は、ここを直接編集 +// --------------------------------------------------------------- +function Fx_InitProgressDialog() { + + // divを生成 + var _div = document.createElement("div"); + _div.id = "AjaxProgressDialog"; + _div.className = "progress-dialog"; + + // 幅を指定 + _div.style.width = Fx_AjaxProgressDialog_Width + "px"; + _div.style.height = Fx_AjaxProgressDialog_Height + "px"; + + // 内容を指定 + _div.innerHTML = "処理中です。しばらくお待ち下さい・・・
"; + + // imgを生成 + var _img = document.createElement("img"); + _img.src = Fx_ResolveServerUrl("~/images/touryo/loading.gif"); + _img.style.width = "50px"; + _img.style.height = "50px"; + _img.alt = "処理中画像"; + + // divにimgを追加 + _div.appendChild(_img); + + // div → Progress Dialog + Fx_AjaxProgressDialog = _div; +} + +// --------------------------------------------------------------- +// Progress Dialog表示を仕掛ける。 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_SetProgressDialog() { + if (IsDownload) { + // ダウンロードの場合 + + // フラグを戻す + IsDownload = false; + } + else { + // ダウンロードでない場合 + + // Dialog表示（２秒後） + Fx_ProgressDialogTimer = setTimeout("Fx_DisplayProgressDialog()", 2000); + } +} + +// --------------------------------------------------------------- +// Progress Dialog表示 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_DisplayProgressDialog() { + // はじめにタイマをクリアする。 + clearTimeout(Fx_ProgressDialogTimer); + + try { + // 表示位置の計算 + Fx_AjaxProgressDialog.style.top = (Fx_getBrowserHeight() / 2) - (Fx_AjaxProgressDialog_Height / 2) + "px"; + Fx_AjaxProgressDialog.style.left = (Fx_getBrowserWidth() / 2) - (Fx_AjaxProgressDialog_Width / 2) + "px"; + + // Progress Dialogを表示する。 + Fx_DialogMaskOn(); + document.body.appendChild(Fx_AjaxProgressDialog); + + } catch (e) { + //alert( e );//エラー内容 + } +} + + +//********************************************************************************** +// フレームワーク機能（Ajax） +//********************************************************************************** + +// Ajax：処理中かどうか +var Ajax_IsProgressed = false; +// Flag variable for enable/disable "Prevent Double Submit functionality" for Ajax.BeginForm. +var PreventAjaxDoubleSubmit = false; +// Flag variable for control "Prevent Double Submit functionality" for Ajax.BeginForm. +var IsAborted = false; + +// --------------------------------------------------------------- +// Ajaxの開始前イベント処理 +// --------------------------------------------------------------- +// Enables the functionality of Prevent Double Submit for Ajax.BeginForm based on the button submitted. +$(document).ajaxSend(function (eo, jqXHRo, settings) { + // checks and disables progress dialogue if PreventAjaxDoubleSubmit set to true. + if (PreventAjaxDoubleSubmit) { + if ( Fx_OnSubmit() ) { + // 二重送信フラグの設定 + Ajax_IsProgressed = true; + } + else { + IsAborted = true; + jqXHRo.abort(); + } + } +}); + +// --------------------------------------------------------------- +// Ajaxの終了後イベント処理 +// --------------------------------------------------------------- +//$(document).ajaxComplete(function (eo, jqXHRo, settings) { + +// --------------------------------------------------------------- +// Ajaxの正常終了後イベント処理 +// --------------------------------------------------------------- +// 引数 +// ・第1引数：イベントオブジェクト +// ・第2引数：jqXHRオブジェクト +// ・第3引数：ajaxのセッティング情報 +// 戻り値 － +// --------------------------------------------------------------- +$(document).ajaxSuccess(function (eo, jqXHRo, settings) { + // ajax通信が正常終了した場合 + Fx_ClearPreventDoubleSubmissionSettings(); +}); + +// --------------------------------------------------------------- +// Ajaxの異常終了後イベント処理 +// --------------------------------------------------------------- +// 引数 +// ・第1引数：イベントオブジェクト +// ・第2引数：jqXHRオブジェクト +// ・第3引数：ajaxのセッティング情報 +// ・第4引数：例外オブジェクト +// 戻り値 － +// --------------------------------------------------------------- +$(document).ajaxError(function (eo, jqXHRo, settings, error) { + // ajax通信が異常終了した場合、 + + if (IsAborted) + { + // 二重送信防止した場合。 + // ・・・何もしない。 + } + else + { + // その他の異常終了。 + Fx_ClearPreventDoubleSubmissionSettings(); + } +}); + +// --------------------------------------------------------------- +// 二重送信防止機能の設定を解除 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_ClearPreventDoubleSubmissionSettings() +{ + // はじめにタイマをクリアする。 + clearTimeout(Fx_ProgressDialogTimer); + + // Progress Dialogを非表示にする。 + try { + + Fx_DialogMaskOff(); + document.body.removeChild(Fx_AjaxProgressDialog); + + } catch (e) { + //alert( e );//エラー内容 + } + + // 二重送信フラグの設定 + Ajax_IsProgressed = false; + + // Reset the form submission flag. + Form_IsSubmitted = false; + //Disables Prevent Double Submit finctionality by setting flag to flase. + PreventAjaxDoubleSubmit = false; +} + +//********************************************************************************** +// ユーティリティ +//********************************************************************************** + +// --------------------------------------------------------------- +// Cookie処理関数 +// --------------------------------------------------------------- + +// --------------------------------------------------------------- +// Cookieを参照する関数（Cookieから指定されたデータを抜きだす） +// --------------------------------------------------------------- +// 引数 Cookie名 +// 戻り値 成功した時はCookie値、失敗した時はfalseを返す +// --------------------------------------------------------------- +function Fx_GetCookie(name) { + // "="を追加 + name += "="; + + // 検索時最終項目で-1になるのを防ぐ + myCookie = document.cookie + ";"; + + // 指定されたセクション名を検索する + start = myCookie.indexOf(name); + + if (start !== -1) { + // 見つかった場合 + + // データを抜きだす + end = myCookie.indexOf(";", start); + return unescape(myCookie.substring(start + name.length, end)); + } + else { + // 見つからなかった場合 + return false; + } +} + +// --------------------------------------------------------------- +// Cookieを設定する関数（Cookieにデータを保存する） +// --------------------------------------------------------------- +// 引数 Cookie名 +// 戻り値 成功した時はtrue、失敗した時はfalseを返す +// --------------------------------------------------------------- +function Fx_SetCookie(name, value, option) { + // nullチェック + if ((name !== null) && (value !== null)) { + // データ保存 + document.cookie = name + "=" + escape(value) + ";" + option; + return true; + } + else { + return false; + } +} + +// --------------------------------------------------------------- +// サイズ取得関数 +// --------------------------------------------------------------- + +// --------------------------------------------------------------- +// ブラウザ画面の幅取得 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_getBrowserWidth() { + if (window.innerWidth) { + return window.innerWidth; + } + + // documentがnullになることがある・・・ + if (document === null || document === undefined) { + // 処理しない。 + } + else { + // 処理する。 + + if (document.documentElement && document.documentElement.clientWidth !== 0) { + return document.documentElement.clientWidth; + } + + if (document.body) { + return document.body.clientWidth; + } + } + + return 0; +} + +// --------------------------------------------------------------- +// ブラウザ画面の高さ取得 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_getBrowserHeight() { + + if (window.innerHeight) { + return window.innerHeight; + } + + // documentがnullになることがある・・・ + if (document === null || document === undefined) { + // 処理しない。 + } + else { + // 処理する。 + + if (document.documentElement && document.documentElement.clientHeight !== 0) { + return document.documentElement.clientHeight; + } + + if (document.body) { + return document.body.clientHeight; + } + } + + return 0; +} + +// --------------------------------------------------------------- +// コンテンツ全体の幅を取得 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_getContentsWidth() { + // コンテンツ全体の幅を取得する + return Math.max.apply( + null, + [document.body.clientWidth, + document.body.scrollWidth, + document.documentElement.scrollWidth, + document.documentElement.clientWidth]); +} + +// --------------------------------------------------------------- +// コンテンツ全体の高さ取得 +// --------------------------------------------------------------- +// 引数 － +// 戻り値 － +// --------------------------------------------------------------- +function Fx_getContentsHeight() { + // コンテンツ全体の高さを取得する + return Math.max.apply( + null, + [document.body.clientHeight, + document.body.scrollHeight, + document.documentElement.scrollHeight, + document.documentElement.clientHeight]); +} + +// --------------------------------------------------------------- +// Cross-browser関連の関数 +// --------------------------------------------------------------- + +// --------------------------------------------------------------- +// Cross-browser detection function +// --------------------------------------------------------------- + +// To store client browser information +var Browser_IsIE = false; +var Browser_IsEdge = false; +var Browser_IsFirefox = false; +var Browser_IsChrome = false; +var Browser_IsOpera = false; +var Browser_IsSafari = false; +//var Browser_IsBlink = false; + +// --------------------------------------------------------------- +// To detect client browser information +// --------------------------------------------------------------- +function Fx_WhichBrowser() { + + // Value will true, when the client browser is Internet Explorer 6-11 + Browser_IsIE = /*@cc_on!@*/false || !!document.documentMode; + + // Value will true, when the client browser is Edge 20+ + Browser_IsEdge = !Browser_IsIE && !!window.StyleMedia; + + // Value will true, when the client browser is Firefox 1.0+ + Browser_IsFirefox = typeof InstallTrigger !== 'undefined'; + + // Value will true, when the client browser is Chrome 1+ + //Browser_IsChrome = !!window.chrome && !!window.chrome.webstore; + Browser_IsChrome = !!window.chrome; + + // Value will true, when the client browser is Opera 8.0+ + Browser_IsOpera = (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0; + + // Value will true, when the client browser is Safari 3+ + Browser_IsSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; + + // Value will true, when the client browser having Blink engine + //Browser_IsBlink = (Browser_IsChrome || Browser_IsOpera) && !!window.CSS; +} + +// --------------------------------------------------------------- +// その他 +// --------------------------------------------------------------- + +// --------------------------------------------------------------- +// Resolves the path of a specified url based on the application server +// --------------------------------------------------------------- +// Parameter － Relative url +// Return value － Resolved relative url +// --------------------------------------------------------------- +function Fx_ResolveServerUrl(url) { + if (url.indexOf("~/") === 0) { + url = baseUrl + url.substring(2); + } + return url; +} + +// --------------------------------------------------------------- +// ランダムな文字列を生成する +// --------------------------------------------------------------- +// 引数 len +// 戻り値 Random String +// --------------------------------------------------------------- +function Fx_GetRandomString(len) { + //使用文字の定義 + var str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!#$%&=~/*-+"; + + //ランダムな文字列の生成 + var result = ""; + for (var i = 0; i < len; i++) { + result += str.charAt(Math.floor(Math.random() * str.length)); + } + return result; +} + +// --------------------------------------------------------------- +// Debug出力 +// --------------------------------------------------------------- +// 引数 testLabel: ラベル, object: オブジェクト +// 戻り値 － +// --------------------------------------------------------------- +function Fx_DebugOutput(testLabel, object) { + console.log(testLabel); + if (object) { + console.log(object); + console.log(JSON.stringify(object)); + } +} \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/touryo/else.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper-utils.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Scripts/umd/popper.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Startup.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/Index.cshtml diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml new file mode 100644 index 000000000..a94e07247 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_ChartView.cshtml @@ -0,0 +1,46 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_ChartView + //* クラス日本語名 ：Chart部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@if (Model != null && Model.Shippers != null) +{ + + + + + + + + + + @foreach (ShipperViweModel svm in Model.Shippers) + { + + + + + + } + +
ShipperIdCompanyNamePhone
@svm.ShipperID@svm.CompanyName@svm.Phone
+} diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml new file mode 100644 index 000000000..81b2a5671 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud1/_MessageView.cshtml @@ -0,0 +1,24 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_MessageView + //* クラス日本語名 ：Message部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml new file mode 100644 index 000000000..a94e07247 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml @@ -0,0 +1,46 @@ +@* + //********************************************************************************** + //* サンプル アプリ・モデル + //********************************************************************************** + + // テスト用クラスなので、必要に応じて流用 or 削除して下さい。 + + //********************************************************************************** + //* クラス名 ：_ChartView + //* クラス日本語名 ：Chart部分View + //* + //* 作成日時 ：－ + //* 作成者 ：－ + //* 更新履歴 ：－ + //* + //* 日時 更新者 内容 + //* ---------- ---------------- ------------------------------------------------- + //* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ + //********************************************************************************** +*@ + +@using MVC_Sample.Models.ViewModels +@model CrudViweModel + +@if (Model != null && Model.Shippers != null) +{ + + + + + + + + + + @foreach (ShipperViweModel svm in Model.Shippers) + { + + + + + + } + +
ShipperIdCompanyNamePhone
@svm.ShipperID@svm.CompanyName@svm.Phone
+} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Error/Index.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Index.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Login.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Home/Scroll.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/Error.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Shared/_Layout.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/Web.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Views/_ViewStart.cshtml diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Debug.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.Release.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config similarity index 92% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index a3babfe9e..69df54cdc 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -24,18 +24,14 @@ - + - - - - - + @@ -184,7 +180,7 @@ http://msdn2.microsoft.com/ja-jp/library/e1f13641.aspx http://msdn2.microsoft.com/ja-jp/library/e1f13641(VS.80).aspx --> - + @@ -205,6 +201,10 @@ + + + + @@ -214,23 +214,35 @@ - - + + + + + + - + + + + + + + + + - - + + - + diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/app.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/FontAwesome.otf diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.eot diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.svg diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.ttf diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/fonts/fontawesome-webfont.woff2 diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/loading.gif diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/logo.png rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/images/touryo/logo.png diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config similarity index 63% rename from root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config index ac9e02f35..f2b9465b7 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/packages.config @@ -1,40 +1,40 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln similarity index 83% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln index 73755e309..c08ce435b 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WebForms_Sample", "WebForms_Sample\WebForms_Sample.vbproj", "{758EB140-49AB-4FD1-9A6C-CCC68CC0C56B}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6DA54DB0-6BD4-4227-8101-91857ED4D2A1} + EndGlobalSection EndGlobal diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/3TierTableAdapter/ProductsTableAdapter.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/GetMasterData.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Business/LayerB.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestParameterValue.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Common/TestReturnValue.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoCategories.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoShippers.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/DaoSuppliers.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/sample/Dao/LayerD.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_mcn.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/AppCode/testPublic/Business/TestMTC_txg.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/BundleConfig.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/App_Start/RouteConfig.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/ErrorScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/sampleScreen.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Separate.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testAspNetAjaxExtension_Single.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreen.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testBlankScreenNoJs.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testClientCallback.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage1.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/branchMasterPage2.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/noBaseMasterPage.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/rootMasterPage.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp1.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen1bmp2.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp1.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testNest/testScreen2bmp2.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen1.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreen2.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Master/testScreenCtrl.master.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleChildControl.ascx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Common/Wuc/sampleControl.ascx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogFrame.htm diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/DialogLoader.htm diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/Ping.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myOKMessageDialog.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/Framework/myYesNoMessageDialog.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/OAuth2/OAuth2AuthorizationCodeGrantClient.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsConditionalSearch.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsDetail.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/3Tier/ProductsSearchAndUpdate.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/sample/crud/sampleScreen_cc.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/login.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/logout.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/start/menu.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testNestMasterScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen1nest.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/nest/testScreen2nest.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noBaseMasterScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/noMasterScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen0.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen1.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/normal/testScreen2.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testGridView.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testJQGridJson.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testListView.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/table/testRepeater.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLFrame.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDLScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testDialogAtOnLoad.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/testTransitionAheadScreen.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/wcc/testWCTextBox.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testClientCallback.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Separate.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testFxLayerP/withAjax/testExtension_Single.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/Google.PNG diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm0.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm1.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm2.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm3.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm4.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.designer.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/WebForm5.aspx.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc1.PNG diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc2.PNG diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc3.PNG diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc4.PNG diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Aspx/testScreenCtrl/sc5.PNG diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Bundle.config diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css new file mode 100644 index 000000000..4dd56f411 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/app/Site.css @@ -0,0 +1,9 @@ +html { + width : 100%; + height : 100%; +} + +body { + width : 100%; + height : 100%; +} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-grid.min.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap-reboot.min.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/bootstrap.min.css.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/font-awesome.min.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Global.asax.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Index.html diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/My Project/AssemblyInfo.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/My Project/AssemblyInfo.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/My Project/AssemblyInfo.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/README.md diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/DetailsView.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Focus.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/GridView.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjax.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/Menu.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/MenuStandards.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/SmartNav.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/TreeView.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebForms.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebParts.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/WebForms/WebUIValidation.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/app/Site.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.bundle.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/bootstrap.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper-utils.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/esm/popper.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/index.d.ts diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.intellisense.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.min.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/jquery-3.4.1.slim.min.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/modernizr-2.8.3.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper-utils.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/popper.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.matchmedia.addListener.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/respond.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/common.js diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js new file mode 100644 index 000000000..3f978e482 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/else.js @@ -0,0 +1,64 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +// Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +function Fx_CommonAdjustStyle(offset) { + var menuTopMargin = $('.page-header').height(); + var targetScrollValue = offset.top - menuTopMargin; + + var wScrollvalue = $(window).scrollTop(); + var span_test = $("span.test"); + if (span_test) { span_test.text(wScrollvalue); } + + var menuZIndex = $(".nav-side-menu").css('z-index'); + if (menuZIndex === 'auto') { + // サイドバーの z-index が auto の場合は、画面の横幅が広い (PC 向け) + + if (wScrollvalue > targetScrollValue) { + if (span_test) { span_test.append(" / " + targetScrollValue + " / " + offset.top); } + + // サイドバーの位置を調整する + var movePosition = wScrollvalue + "px"; + $(".nav-side-menu").css('top', movePosition); + } + else { + $(".nav-side-menu").css('top', 0); + } + } + else { + // サイドバーの z-index が auto でない場合は、画面の横幅が狭い (スマホ・タブレット向け) + $(".nav-side-menu").css('top', menuTopMargin); + } +} + +function Fx_AdjustStyle() { + // 画面初期化時の、サイドバーのオフセットを退避しておく + offset = $(".nav-side-menu").offset(); + + // 画面表示時に、描画位置を調整する + Fx_CommonAdjustStyle(offset); + + // スクロール時に、サイドバーの位置を調整する + $(window).scroll(function () { + Fx_CommonAdjustStyle(offset); + }); + // ウィンドウのリサイズ時に、描画位置を調整する + $(window).resize(function () { + var scrollTop = $(window).scrollTop(); + Fx_CommonAdjustStyle(offset); + }); +} diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/touryo/ie_key_event.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper-utils.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Scripts/umd/popper.min.js.map diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Startup.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Debug.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.Release.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj similarity index 96% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj index 3b1534034..1c96ba317 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj @@ -1,19 +1,24 @@  - + - + Debug AnyCPU - + 2.0 {758EB140-49AB-4FD1-9A6C-CCC68CC0C56B} {349c5851-65df-11da-9384-00065b846f21};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} Library WebForms_Sample WebForms_Sample - v4.6 + v4.8 + On + Binary + Off + On + false true 44333 @@ -21,7 +26,14 @@ + ..\ + true 3.0 + + + + + 15.0 true @@ -699,22 +711,22 @@ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.CustomControl.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.CustomControl.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Framework.dll ..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll @@ -737,23 +749,23 @@ True - ..\..\..\..\Frameworks\Infrastructure\Build_net46\MySql.Data.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\MySql.Data.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\Npgsql.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\Npgsql.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.Security.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.Security.dll - ..\..\..\..\Frameworks\Infrastructure\Build_net46\Oracle.ManagedDataAccess.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\Oracle.ManagedDataAccess.dll ..\packages\Owin.1.0\lib\net40\Owin.dll True - ..\..\..\..\Frameworks\Infrastructure\Build_net46\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_net48\OpenTouryo.Public.dll @@ -800,8 +812,6 @@ - - @@ -820,4 +830,5 @@ + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/IJSONService.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.vb b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.vb similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.vb rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebService/JSONService.svc.vb diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/app.config diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/FontAwesome.otf diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.eot diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.svg diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.ttf diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/fonts/fontawesome-webfont.woff2 diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/error.ico diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/image.jpg diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/information.ico diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..3e0220309b75cfdbe2f58b698373b159247e833e GIT binary patch literal 32137 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

u+ztqO`l`>wgtBesvaklV4@xFxP;&E{q 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 Hu0mjfS@w#g literal 0 HcmV?d00001 diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/question.ico diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico similarity index 100% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/images/touryo/warning.ico diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config similarity index 59% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config index 09872386a..da42f5e25 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/packages.config @@ -1,29 +1,29 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config similarity index 99% rename from root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config rename to root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config index 48ef5af20..e2984968f 100644 --- a/root_VS2015/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config @@ -33,7 +33,7 @@ - + - + diff --git a/root_VS2015/programs/VB/_Please run with a double-click to build bat file here.txt b/root_VS2022/programs/VB/_Please run with a double-click to build bat file here.txt similarity index 100% rename from root_VS2015/programs/VB/_Please run with a double-click to build bat file here.txt rename to root_VS2022/programs/VB/_Please run with a double-click to build bat file here.txt diff --git a/root_VS2015/programs/VB/z_Common.bat b/root_VS2022/programs/VB/z_Common.bat similarity index 62% rename from root_VS2015/programs/VB/z_Common.bat rename to root_VS2022/programs/VB/z_Common.bat index 3262f1dc8..316b1b414 100644 --- a/root_VS2015/programs/VB/z_Common.bat +++ b/root_VS2022/programs/VB/z_Common.bat @@ -9,13 +9,24 @@ set BUILDFILEPATH2.0="C:\Windows\Microsoft.NET\Framework\v2.0.50727\MSBuild.exe" set BUILDFILEPATH3.5="C:\Windows\Microsoft.NET\Framework\v3.5\MSBuild.exe" set BUILDFILEPATH4.0="C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" -if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" -) else ( +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" ( set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" ) +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" +) + +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" +) -set BUILDFILEPATH=%BUILDFILEPATH4.0% +set BUILDFILEPATH=%BUILDFILEPATH15% @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). diff --git a/root_VS2015/programs/VB/z_Common2.bat b/root_VS2022/programs/VB/z_Common2.bat similarity index 100% rename from root_VS2015/programs/VB/z_Common2.bat rename to root_VS2022/programs/VB/z_Common2.bat diff --git a/root_VS2015/programs/nuget.exe b/root_VS2022/programs/nuget.exe similarity index 100% rename from root_VS2015/programs/nuget.exe rename to root_VS2022/programs/nuget.exe From cd1588bbedfae8404b6073b860d660fb2f376aef Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Wed, 30 Mar 2022 22:27:19 +0900 Subject: [PATCH 15/34] Now, I am fixing #107. --- .../resource/Log/SampleLogConfMobile.xml | 140 ---------------- .../Business/Business_net47.csproj | 30 ++-- .../Business/Business_netcore20.csproj | 10 +- .../Business.RichClient_net47.csproj | 12 +- .../Business/RichClient/packages.config | 6 +- .../Infrastructure/Business/packages.config | 10 +- .../CustomControl.RichClient_net47.csproj | 12 +- .../CustomControl/RichClient/packages.config | 6 +- .../Business/Business_net47.vbproj | 155 ++++++++++++++++-- .../Infrastructure/Business/app.config | 16 ++ .../Infrastructure/Business/packages.config | 59 ++++++- 11 files changed, 259 insertions(+), 197 deletions(-) delete mode 100644 root_VS2017/files/resource/Log/SampleLogConfMobile.xml diff --git a/root_VS2017/files/resource/Log/SampleLogConfMobile.xml b/root_VS2017/files/resource/Log/SampleLogConfMobile.xml deleted file mode 100644 index 634177ae3..000000000 --- a/root_VS2017/files/resource/Log/SampleLogConfMobile.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj index 871e6bb86..159a6f0a4 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj @@ -101,23 +101,29 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net47\OpenTouryo.DamManagedOdp.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net47\OpenTouryo.DamManagedOdp.dll + True - - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net47\OpenTouryo.DamMySQL.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net47\OpenTouryo.DamMySQL.dll + True - - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net47\OpenTouryo.DamPstGrS.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net47\OpenTouryo.DamPstGrS.dll + True - - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net47\OpenTouryo.Framework.dll + + ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + True - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net47\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + True ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net47\OpenTouryo.Public.Security.dll + True ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll @@ -133,6 +139,10 @@ + + ..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll + True + diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj index 80f890bf0..476414d33 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj index 55e54ae29..b1ae794e7 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj @@ -75,14 +75,14 @@ ..\..\Build_net47\OpenTouryo.DamPstGrS.dll - - ..\..\Build_net47\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net47\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll - - ..\..\Build_net47\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll 3.0 diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index 82f258445..cdc28b5cb 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config index 6ed40b44f..e8618401b 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj index 9a1a49ab5..32036155d 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj @@ -63,14 +63,14 @@ false - - ..\..\Build_net47\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net47\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll - - ..\..\Build_net47\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index 82f258445..cdc28b5cb 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj index 014a83108..7d9782b5c 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj @@ -81,6 +81,11 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True + + ..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll + True + True + ..\packages\MySql.Data.8.0.13\lib\net452\MySql.Data.dll @@ -91,23 +96,23 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net47\OpenTouryo.DamManagedOdp.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net47\OpenTouryo.DamManagedOdp.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net47\OpenTouryo.DamMySQL.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net47\OpenTouryo.DamMySQL.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net47\OpenTouryo.DamPstGrS.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net47\OpenTouryo.DamPstGrS.dll - - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net47\OpenTouryo.Framework.dll + + ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net47\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll - - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net47\OpenTouryo.Public.Security.dll + + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net47\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll @@ -117,23 +122,146 @@ True + + ..\packages\System.AppContext.4.1.0\lib\net463\System.AppContext.dll + True + True + + + + ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll + True + True + + + ..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.Diagnostics.Tracing.4.1.0\lib\net462\System.Diagnostics.Tracing.dll + True + True + + + ..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll + True + True + + + ..\packages\System.IO.4.1.0\lib\net462\System.IO.dll + True + True + + + ..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll + True + True + + + + ..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll + True + True + + + ..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll + True + True + + + ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.Linq.4.1.0\lib\net463\System.Linq.dll + True + True + + + ..\packages\System.Linq.Expressions.4.1.0\lib\net463\System.Linq.Expressions.dll + True + True + - + + ..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll + True + True + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll True + + ..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll + True + True + + + + ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll + True + True + + + ..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net462\System.Reflection.TypeExtensions.dll + + + ..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll + True + True + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll + True + True + + + ..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll + True + True + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + + + ..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + ..\packages\System.Text.RegularExpressions.4.1.0\lib\net463\System.Text.RegularExpressions.dll + True + True + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -172,6 +300,7 @@ True + diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config index 7a45c39f4..b57b02383 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config @@ -19,6 +19,22 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config index 6ed40b44f..9f032ae21 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -10,20 +10,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + \ No newline at end of file From b21279d462609e022e6327880b62750dfd52f6c9 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Wed, 30 Mar 2022 23:32:26 +0900 Subject: [PATCH 16/34] Now, I am fixing #107. --- .../Business/Business_net47.vbproj | 131 +----------------- .../Business.RichClient_net47.vbproj | 14 +- .../Business/RichClient/packages.config | 6 +- .../Infrastructure/Business/app.config | 16 --- .../Infrastructure/Business/packages.config | 47 ------- .../CustomControl.RichClient_net47.vbproj | 12 +- .../CustomControl/RichClient/packages.config | 6 +- 7 files changed, 21 insertions(+), 211 deletions(-) diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj index 7d9782b5c..c9b83c0e2 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj @@ -81,11 +81,6 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - ..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll - True - True - ..\packages\MySql.Data.8.0.13\lib\net452\MySql.Data.dll @@ -122,146 +117,23 @@ True - - ..\packages\System.AppContext.4.1.0\lib\net463\System.AppContext.dll - True - True - - - - ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - True - - - ..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Diagnostics.Tracing.4.1.0\lib\net462\System.Diagnostics.Tracing.dll - True - True - - - ..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll - True - True - - - ..\packages\System.IO.4.1.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll - True - True - - - - ..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\packages\System.Linq.4.1.0\lib\net463\System.Linq.dll - True - True - - - ..\packages\System.Linq.Expressions.4.1.0\lib\net463\System.Linq.Expressions.dll - True - True - - - ..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll - True - True - + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll True - - ..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll - True - True - - - - ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net462\System.Reflection.TypeExtensions.dll - - - ..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - True - True - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll - True - True - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - ..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\packages\System.Text.RegularExpressions.4.1.0\lib\net463\System.Text.RegularExpressions.dll - True - True - ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -300,7 +172,6 @@ True - diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj index c936c782c..cbec58253 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj @@ -71,11 +71,14 @@ ..\..\Build_net47\OpenTouryo.DamPstGrS.dll - - ..\..\Build_net47\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net47\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll + + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll ..\..\Build_net47\Oracle.ManagedDataAccess.dll @@ -86,9 +89,6 @@ 3.0 - - ..\..\Build_net47\OpenTouryo.Public.dll - diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index 82f258445..cdc28b5cb 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config index b57b02383..7a45c39f4 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/app.config @@ -19,22 +19,6 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config index 9f032ae21..e5817337e 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -10,63 +10,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj index b363896db..e931d11d7 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj @@ -59,12 +59,14 @@ TRACE,NET47 - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net47\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll - - False - ..\..\Build_net47\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll + + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index 82f258445..cdc28b5cb 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file From 51204abe23758c3a1fd0794c7390fb7929b7c684 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 10:50:13 +0900 Subject: [PATCH 17/34] Now, I am fixing #107. --- .../Business/Business_net47.csproj | 5 - .../resource/Log/SampleLogConfMobile.xml | 140 ------------------ .../Business/Business_net48.csproj | 24 +-- .../Business/Business_netcore50.csproj | 10 +- .../Business.RichClient_net48.csproj | 12 +- .../Business.RichClient_netcore50.csproj | 2 +- .../Business/RichClient/packages.config | 6 +- .../Infrastructure/Business/packages.config | 12 +- .../CustomControl/CustomControl_net48.csproj | 4 +- .../CustomControl.RichClient_net48.csproj | 12 +- .../CustomControl.RichClient_netcore50.csproj | 2 +- .../CustomControl/RichClient/packages.config | 6 +- .../CustomControl/packages.config | 2 +- .../Business/Business_net48.vbproj | 24 +-- .../Business.RichClient_net48.vbproj | 14 +- .../Business/RichClient/packages.config | 6 +- .../Infrastructure/Business/packages.config | 12 +- .../CustomControl/CustomControl_net48.vbproj | 4 +- .../CustomControl.RichClient_net48.vbproj | 12 +- .../CustomControl/RichClient/packages.config | 6 +- .../CustomControl/packages.config | 2 +- 21 files changed, 87 insertions(+), 230 deletions(-) delete mode 100644 root_VS2019/files/resource/Log/SampleLogConfMobile.xml diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj index 159a6f0a4..a217e017f 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj @@ -123,7 +123,6 @@ ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net47\OpenTouryo.Public.Security.dll - True ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll @@ -139,10 +138,6 @@ - - ..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll - True - diff --git a/root_VS2019/files/resource/Log/SampleLogConfMobile.xml b/root_VS2019/files/resource/Log/SampleLogConfMobile.xml deleted file mode 100644 index 634177ae3..000000000 --- a/root_VS2019/files/resource/Log/SampleLogConfMobile.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj index c7b0faeb9..96a7963e0 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj @@ -98,23 +98,23 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net48\OpenTouryo.DamManagedOdp.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net48\OpenTouryo.DamMySQL.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net48\OpenTouryo.DamPstGrS.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll - - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net48\OpenTouryo.Framework.dll + + ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll - - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net48\OpenTouryo.Public.Security.dll + + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj index 1a66abad3..ad780c4e3 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj index 935589f2a..64504fa8f 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj @@ -75,14 +75,14 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - - ..\..\Build_net48\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\Build_net48\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll 3.0 diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj index f355f0e00..0ce199f2b 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj @@ -58,7 +58,7 @@ - + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index f6612f4ab..ff5d353fd 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config index 109e0ecc0..7df73e2c9 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj index b58b5a458..45d328095 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj @@ -71,8 +71,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj index 2b8281ece..636a6cca6 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj @@ -53,14 +53,14 @@ false - - ..\..\Build_net48\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\Build_net48\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj index baf256b98..1e4a1fdb3 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj @@ -33,7 +33,7 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index f6612f4ab..ff5d353fd 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config index a2b25f722..c40537f25 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj index af02c203a..cab746d93 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj @@ -91,23 +91,23 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net48\OpenTouryo.DamManagedOdp.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net48\OpenTouryo.DamMySQL.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net48\OpenTouryo.DamPstGrS.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll - - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net48\OpenTouryo.Framework.dll + + ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll - - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net48\OpenTouryo.Public.Security.dll + + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj index eda37dafb..2fd190ed3 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj @@ -71,11 +71,14 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - - ..\..\Build_net48\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll ..\..\Build_net48\Oracle.ManagedDataAccess.dll @@ -86,9 +89,6 @@ 3.0 - - ..\..\Build_net48\OpenTouryo.Public.dll - diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index 82f258445..d416cdef7 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config index 6ed40b44f..2c9ef3938 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj index 8fa508cc2..638a20eff 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj @@ -64,8 +64,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj index 2fd2d5b62..68cbf03a4 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj @@ -59,12 +59,14 @@ TRACE,NET48 - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - False - ..\..\Build_net48\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index f6612f4ab..ff5d353fd 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config index a2b25f722..c40537f25 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file From 4bb7914ca4385bf78b5be1b0b79fd212a700483f Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 11:16:52 +0900 Subject: [PATCH 18/34] Now, I am fixing #107, #110. --- .../resource/Log/SampleLogConfMobile.xml | 140 ------------------ root_VS2022/programs/CS/0_ExecAllBat.bat | 4 +- ... 3_Build_BusinessRichClient_netcore60.bat} | 4 +- ...e50.bat => 3_Build_Business_netcore60.bat} | 4 +- ...ore50.csproj => Business_netcore60.csproj} | 20 +-- ...j => Business.RichClient_netcore60.csproj} | 24 +-- ...0.sln => BusinessRichClient_netcore60.sln} | 8 +- ...s_netcore50.sln => Business_netcore60.sln} | 6 +- ...CustomControl.RichClient_netcore60.csproj} | 16 +- 9 files changed, 43 insertions(+), 183 deletions(-) delete mode 100644 root_VS2022/files/resource/Log/SampleLogConfMobile.xml rename root_VS2022/programs/CS/{3_Build_BusinessRichClient_netcore50.bat => 3_Build_BusinessRichClient_netcore60.bat} (94%) rename root_VS2022/programs/CS/{3_Build_Business_netcore50.bat => 3_Build_Business_netcore60.bat} (90%) rename root_VS2022/programs/CS/Frameworks/Infrastructure/Business/{Business_netcore50.csproj => Business_netcore60.csproj} (86%) rename root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/{Business.RichClient_netcore50.csproj => Business.RichClient_netcore60.csproj} (71%) rename root_VS2022/programs/CS/Frameworks/Infrastructure/{BusinessRichClient_netcore50.sln => BusinessRichClient_netcore60.sln} (81%) rename root_VS2022/programs/CS/Frameworks/Infrastructure/{Business_netcore50.sln => Business_netcore60.sln} (80%) rename root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/{CustomControl.RichClient_netcore50.csproj => CustomControl.RichClient_netcore60.csproj} (76%) diff --git a/root_VS2022/files/resource/Log/SampleLogConfMobile.xml b/root_VS2022/files/resource/Log/SampleLogConfMobile.xml deleted file mode 100644 index 634177ae3..000000000 --- a/root_VS2022/files/resource/Log/SampleLogConfMobile.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root_VS2022/programs/CS/0_ExecAllBat.bat b/root_VS2022/programs/CS/0_ExecAllBat.bat index f3266ada0..fd6b1205d 100644 --- a/root_VS2022/programs/CS/0_ExecAllBat.bat +++ b/root_VS2022/programs/CS/0_ExecAllBat.bat @@ -5,9 +5,9 @@ echo | call 1_DeleteFile.bat timeout 5 echo | call 3_Build_Business_net48.bat -echo | call 3_Build_Business_netcore50.bat +echo | call 3_Build_Business_netcore60.bat echo | call 3_Build_BusinessRichClient_net48.bat -echo | call 3_Build_BusinessRichClient_netcore50.bat +echo | call 3_Build_BusinessRichClient_netcore60.bat @echo on timeout 5 diff --git a/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat b/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore60.bat similarity index 94% rename from root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat rename to root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore60.bat index 80730d81c..e78e55430 100644 --- a/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore50.bat +++ b/root_VS2022/programs/CS/3_Build_BusinessRichClient_netcore60.bat @@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Build the batch Infrastructure rem -------------------------------------------------- -call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore50.sln" -call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore50.sln" +call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore60.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore60.sln" pause diff --git a/root_VS2022/programs/CS/3_Build_Business_netcore50.bat b/root_VS2022/programs/CS/3_Build_Business_netcore60.bat similarity index 90% rename from root_VS2022/programs/CS/3_Build_Business_netcore50.bat rename to root_VS2022/programs/CS/3_Build_Business_netcore60.bat index 372a64a01..25e09e4fc 100644 --- a/root_VS2022/programs/CS/3_Build_Business_netcore50.bat +++ b/root_VS2022/programs/CS/3_Build_Business_netcore60.bat @@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Build the batch Infrastructure rem -------------------------------------------------- -call dotnet restore "Frameworks\Infrastructure\Business_netcore50.sln" -call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore50.sln" +call dotnet restore "Frameworks\Infrastructure\Business_netcore60.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore60.sln" pause diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj similarity index 86% rename from root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj index 1a66abad3..770a4d2cc 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Touryo.Infrastructure.Business OpenTouryo.Business true @@ -9,8 +9,8 @@ TRACE;DEBUG;NETCOREAPP - ..\Build_netcore50\ - ..\Build_netcore50\net5.0\OpenTouryo.Business.xml + ..\Build_netcore60\ + ..\Build_netcore60\net6.0\OpenTouryo.Business.xml full true 1701;1702;NU1701 @@ -18,8 +18,8 @@ TRACE;NETCOREAPP - ..\Build_netcore50\ - ..\Build_netcore50\net5.0\OpenTouryo.Business.xml + ..\Build_netcore60\ + ..\Build_netcore60\net6.0\OpenTouryo.Business.xml portable true 1701;1702;NU1701 @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj similarity index 71% rename from root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj index f355f0e00..1354d0990 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj @@ -2,7 +2,7 @@ Library - net5.0-windows + net6.0-windows true true OpenTouryo.Business.RichClient @@ -12,8 +12,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore50\ - ..\..\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.xml + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.xml full true 1701;1702;NU1701 @@ -21,8 +21,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore50\ - ..\..\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.xml + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.xml portable true 1701;1702;NU1701 @@ -34,22 +34,22 @@ - ..\..\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\Build_netcore50\net5.0\OpenTouryo.DamManagedOdp.dll + ..\..\Build_netcore&0\net6.0\OpenTouryo.DamManagedOdp.dll - ..\..\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll - ..\..\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.Public.dll @@ -58,7 +58,7 @@ - + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore60.sln similarity index 81% rename from root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln rename to root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore60.sln index f01183333..06ab39dc4 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore60.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore30", "Business\RichClient\Business.RichClient_netcore50.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore60", "Business\RichClient\Business.RichClient_netcore60.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore30", "CustomControl\RichClient\CustomControl.RichClient_netcore50.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore60", "CustomControl\RichClient\CustomControl.RichClient_netcore60.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore60.sln similarity index 80% rename from root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln rename to root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore60.sln index b9f8c8748..361adea6c 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_netcore60.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business", "Business\Business_netcore50.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business_netcore60", "Business\Business_netcore60.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj similarity index 76% rename from root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj rename to root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj index baf256b98..72538b313 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj @@ -2,7 +2,7 @@ Library - net5.0-windows + net6.0-windows true true OpenTouryo.CustomControl.RichClient @@ -12,8 +12,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore50\ - ..\..\Build_netcore50\net5.0-windows\OpenTouryo.CustomControl.RichClient.xml + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.CustomControl.RichClient.xml full true 1701;1702;NU1701 @@ -21,8 +21,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore50\ - ..\..\Build_netcore50\net5.0-windows\OpenTouryo.CustomControl.RichClient.xml + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.CustomControl.RichClient.xml portable true 1701;1702;NU1701 @@ -33,15 +33,15 @@ - + - ..\..\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.Public.dll From 678af5c5a1d56c48d8f590f31938c9d9aac547ba Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 12:13:59 +0900 Subject: [PATCH 19/34] Now, I am fixing #107. --- .../Business/Business_net48.csproj | 24 +++++++++---------- .../Business.RichClient_net48.csproj | 12 +++++----- .../Business.RichClient_netcore60.csproj | 2 +- .../Business/RichClient/packages.config | 6 ++--- .../Infrastructure/Business/packages.config | 12 +++++----- .../BusinessRichClient_net48.sln | 8 +++---- .../Infrastructure/Business_net48.sln | 8 +++---- .../CustomControl/CustomControl_net48.csproj | 4 ++-- .../CustomControl.RichClient_net48.csproj | 12 +++++----- .../CustomControl/RichClient/packages.config | 6 ++--- .../CustomControl/packages.config | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj index c7b0faeb9..96a7963e0 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj @@ -98,23 +98,23 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net48\OpenTouryo.DamManagedOdp.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net48\OpenTouryo.DamMySQL.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net48\OpenTouryo.DamPstGrS.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll - - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net48\OpenTouryo.Framework.dll + + ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll - - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net48\OpenTouryo.Public.Security.dll + + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj index 935589f2a..64504fa8f 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj @@ -75,14 +75,14 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - - ..\..\Build_net48\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\Build_net48\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll 3.0 diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj index 1354d0990..1ea9e6852 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj @@ -37,7 +37,7 @@ ..\..\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\Build_netcore&0\net6.0\OpenTouryo.DamManagedOdp.dll + ..\..\Build_netcore60\net6.0\OpenTouryo.DamManagedOdp.dll ..\..\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index f6612f4ab..ff5d353fd 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config index 109e0ecc0..7df73e2c9 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln index 6e5953df8..98e8e282b 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net48.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient_net48", "Business\RichClient\Business.RichClient_net48.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net48.csproj", "{85861BE7-A77E-46BE-9FFE-330654571C32}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl.RichClient_net48", "CustomControl\RichClient\CustomControl.RichClient_net48.csproj", "{85861BE7-A77E-46BE-9FFE-330654571C32}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln index af760c2c0..86edb4434 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business_net48.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business_net48", "Business\Business_net48.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl", "CustomControl\CustomControl_net48.csproj", "{2C6108F5-DEB1-4821-8CE0-E80619A06E03}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl_net48", "CustomControl\CustomControl_net48.csproj", "{2C6108F5-DEB1-4821-8CE0-E80619A06E03}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj index b58b5a458..45d328095 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj @@ -71,8 +71,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj index 2b8281ece..636a6cca6 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj @@ -53,14 +53,14 @@ false - - ..\..\Build_net48\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll - - ..\..\Build_net48\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index f6612f4ab..ff5d353fd 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config index a2b25f722..c40537f25 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file From 3a372ea6f1633a22ccb418564de364ba58be8c5d Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 13:35:29 +0900 Subject: [PATCH 20/34] Now, I am fixing #107. --- .../Infrastructure/BusinessRichClient_netcore50.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln b/root_VS2019/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln index f01183333..974798382 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore50.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore30", "Business\RichClient\Business.RichClient_netcore50.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore50", "Business\RichClient\Business.RichClient_netcore50.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore30", "CustomControl\RichClient\CustomControl.RichClient_netcore50.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore50", "CustomControl\RichClient\CustomControl.RichClient_netcore50.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 94637809ff3f33aabdd1edf046ef9d52b4d37193 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 13:56:15 +0900 Subject: [PATCH 21/34] Now, I am fixing #108, #110. --- .../Tools/DPQuery_Tool/DPQuery_Tool.sln | 4 +- .../DPQuery_Tool/DPQuery_ToolCore.csproj | 10 +- .../Tools/DPQuery_Tool/DPQuery_ToolCore.sln | 9 +- .../Tools/DaoGen_Tool/DaoGen_Tool.sln | 4 +- .../Tools/DaoGen_Tool/DaoGen_ToolCore.csproj | 10 +- .../Tools/DaoGen_Tool/DaoGen_ToolCore.sln | 9 +- .../DeployZipPackWithHTTP.sln | 6 +- .../DeployZipPackWithHTTPCore.csproj | 95 +++++++++++++++++++ .../DeployZipPackWithHTTPCore.sln | 25 +++++ .../Tools/DeployZipPackWithHTTP/Form1.cs | 17 +++- .../Tools/DeployZipPackWithHTTP/Form2.cs | 1 + .../Tools/DeployZipPackWithHTTP/Program.cs | 6 ++ .../Tools/DeployZipPackWithHTTP/app.config | 6 +- .../DeployZipPackWithHTTP/appsettings.json | 18 ++++ .../DeployZipPackWithHTTP/packages.config | 2 +- 15 files changed, 191 insertions(+), 31 deletions(-) create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln create mode 100644 root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln index 45323617e..f6e26a810 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPQuery_Tool", "DPQuery_Tool.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" EndProject diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj index dcef11020..4e1fbebc1 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -40,16 +40,16 @@ - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamManagedOdp.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.DamManagedOdp.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamMySQL.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.DamMySQL.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamPstGrS.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.DamPstGrS.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln index 8190fe20f..5b5b93e27 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPQuery_Tool", "DPQuery_ToolCore.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DPQuery_ToolCore", "DPQuery_ToolCore.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F8B04722-F5A7-48E7-8D6D-7A060A338927} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln index 3743d80f7..5b47bdf62 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaoGen_Tool", "DaoGen_Tool.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj index 9bc713625..45ec26263 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -40,16 +40,16 @@ - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamManagedOdp.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.DamManagedOdp.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamMySQL.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.DamMySQL.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.DamPstGrS.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.DamPstGrS.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln index 1e294ac6a..57789b666 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaoGen_Tool", "DaoGen_ToolCore.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaoGen_ToolCore", "DaoGen_ToolCore.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C978D2D2-749B-455F-8565-8C3A665142A0} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln index cb380778f..b1d0d316d 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployZipPackWithHTTP", "DeployZipPackWithHTTP.csproj", "{F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}" EndProject @@ -20,6 +20,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {70C98F1B-54AD-4AFD-B670-98D383EF1BEE} + SolutionGuid = {52D312DC-E37A-4F2A-AF7F-AECDC645D53F} EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj new file mode 100644 index 000000000..0ecd0ef7e --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj @@ -0,0 +1,95 @@ + + + + WinExe + net6.0-windows + true + + + DeployZipPackWithHTTP + OpenTouryo.DeployZipPackWithHTTP + + + + TRACE;NETCOREAPP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll + + + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll + + + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll + + + + + + Always + + + Always + + + Always + + + + + + True + True + Resource.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + + + + Always + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln new file mode 100644 index 000000000..459dbdeae --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployZipPackWithHTTPCore", "DeployZipPackWithHTTPCore.csproj", "{B988A3B4-7296-4491-878B-7C3C2A330A1F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A32A525E-B7F7-4751-877C-46F7BB73BCE5} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs index 4d67eedcf..2ea862132 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs @@ -43,6 +43,7 @@ //* Moved all the Japanese language exception messages to MSGDefinition_ja-JP.xml file Placed all the converted //* Japanese language exception messages to MSGDefinition.xml file for internationalization supporting English Language. //* 2014/04/25 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call +//* 2020/08/03 西野 大介 NETCOREAPP対応 //********************************************************************************** using System; @@ -107,7 +108,10 @@ private void Form1_Load(object sender, EventArgs e) this.cmbEnc.SelectedIndex = 0; this.cmbCyp.DataSource = Enum.GetValues(typeof(EncryptionAlgorithm)); this.cmbCmpLv.DataSource = Enum.GetValues(typeof(CompressionLevel)); +#if NETCOREAPP +#else this.cmbFormat.DataSource = Enum.GetValues(typeof(SelfExtractorFlavor)); +#endif this.cmbEEFA.DataSource = Enum.GetValues(typeof(ExtractExistingFileAction)); // ZIP作成 @@ -234,10 +238,13 @@ private void btnCompress_Click(object sender, EventArgs e) } // 形式指定 +#if NETCOREAPP +#else SelfExtractorFlavor? selfEx = null; if (this.cmbFormat.Enabled) { selfEx = (SelfExtractorFlavor)this.cmbFormat.SelectedItem; } +#endif // ZIP内パスのルート名 string[] temp = this.txtFile.Text.Split('\\'); @@ -259,7 +266,13 @@ private void btnCompress_Click(object sender, EventArgs e) scd, exts, rootPathInArchive, // ここを空文字列にするとルートフォルダ無しになる。 Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), (EncryptionAlgorithm)this.cmbCyp.SelectedItem, this.txtPass.Text, - (CompressionLevel)this.cmbCmpLv.SelectedItem, selfEx); + (CompressionLevel)this.cmbCmpLv.SelectedItem +#if NETCOREAPP + ); +#else + , selfEx); +#endif + //// 圧縮（２）：selectionCriteriaStringでフィルタ //string selectionCriteriaString = ""; @@ -551,7 +564,7 @@ private void btnCreateManifesto_Click(object sender, EventArgs e) #endregion #region 更新チェック＆インストール - + ///

更新チェック＆インストール private void btnCheckUpdateAndInstall_Click(object sender, EventArgs e) { diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs index e7ef041b6..5b876640e 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs @@ -44,6 +44,7 @@ //* （リカバリしない時ログを出力しないよう変更）。 //* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 //* 2014/04/26 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call +//* 2020/08/03 西野 大介 NETCOREAPP対応 //********************************************************************************** using System; diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs index c30a2b1b0..b0f5adfda 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs @@ -267,6 +267,12 @@ private static extern bool SetWindowPos( [STAThread] static void Main() { +#if NETCOREAPP + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); +#else +#endif + // Add DefaultCulture key in app.Config file and take the culture value from app.Config file. string culture = GetConfigParameter.GetConfigValue("DefaultCulture"); if (!string.IsNullOrEmpty(culture)) diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config index 295eaf797..b6124f82c 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config @@ -21,10 +21,6 @@ - - - - - \ No newline at end of file + diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json new file mode 100644 index 000000000..6de259a69 --- /dev/null +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json @@ -0,0 +1,18 @@ +{ + // appSettings section + "appSettings": { + // リソース ファイルの場合 + //"FxXMLMSGDefinition": "MSGDefinition.xml", + "FxLog4NetConfFile": "Log4DeployZipPackWithHTTP.xml", + // 埋め込まれたリソースの場合 + "FxXMLMSGDefinition": "DeployZipPackWithHTTP.MSGDefinition.xml", + //"FxLog4NetConfFile": "DeployZipPackWithHTTP.Log4DeployZipPackWithHTTP.xml", + // 非同期呼び出し処理の多重度（2以上の設定が必須） + "FxMaxThreadCount": "3", + // プログレスダイアログが閉じるまでの待機設定（秒） + "PDWSleepSec": "1", + "DefaultCulture": "ja-JP", + // "FxBusinessMessageCulture": "en-US", + "ClientSettingsProvider.ServiceUri": "" + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config index f57231acf..2069364c4 100644 --- a/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 5ef404d31c7d75a5ceda4c18d4b96674faa5b2ca Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 15:36:08 +0900 Subject: [PATCH 22/34] Now, I am fixing #110. --- .../WSClientWPF_sample.csproj | 4 ++-- .../programs/CS/6_Build_WSSrvCore_sample.bat | 4 ++-- .../ASPNETWebService/ASPNETWebService.sln | 4 ++-- .../ASPNETWebServiceCore.sln | 4 ++-- .../ASPNETWebServiceCore.csproj | 20 +++++++++---------- .../WCFService/WCFService.sln | 4 ++-- .../2CSClientWPF_sample.sln | 4 ++-- .../2CSClientWin_sample.sln | 4 ++-- .../AsyncEvent_sample/AsyncEvent_sample.sln | 4 ++-- .../CustCtrl_sample/CustCtrl_sample.sln | 4 ++-- .../GenDaoAndBatUpd_sample.sln | 4 ++-- .../TimeStamp_sample/TimeStamp_sample.sln | 4 ++-- .../RerunnableBatch_sample.sln | 4 ++-- .../RerunnableBatch_sample2.sln | 4 ++-- .../RerunnableBatch_sample3.sln | 4 ++-- .../SimpleBatch_sample/SimpleBatch_sample.sln | 4 ++-- .../WSClientWPF_sample/WSClientWPF_sample.sln | 4 ++-- .../WSClientWin2_sample.sln | 4 ++-- .../WSClientWinCone_sample.sln | 4 ++-- .../WSClientWin_sample/WSClientWin_sample.sln | 4 ++-- .../WSServer_sample/WSServer_sample.sln | 4 ++-- .../WebApp_sample/MVC_Sample/MVC_Sample.sln | 4 ++-- .../WebForms_Sample/WebForms_Sample.sln | 4 ++-- .../2CSClientWPF_sample.csproj | 12 +++++------ .../2CSClientWPF_sample.sln | 9 ++++++--- .../2CSClientWin_sample.csproj | 15 ++++++-------- .../2CSClientWin_sample.sln | 9 ++++++--- .../AsyncEvent_sample/AsyncEvent_sample.sln | 11 ++++++---- .../WindowsFormsApplication.csproj | 6 +++--- .../WpfApplication/WpfApplication.csproj | 6 +++--- .../CustCtrl_sample/CustCtrl_sample.csproj | 4 ++-- .../CustCtrl_sample/CustCtrl_sample.sln | 9 ++++++--- .../GenDaoAndBatUpd_sample.csproj | 12 +++++------ .../GenDaoAndBatUpd_sample.sln | 9 ++++++--- .../TimeStamp_sample/TimeStamp_sample.csproj | 8 ++++---- .../TimeStamp_sample/TimeStamp_sample.sln | 9 ++++++--- .../RerunnableBatch_sample.csproj | 12 +++++------ .../RerunnableBatch_sample.sln | 4 ++-- .../RerunnableBatch_sample2.csproj | 12 +++++------ .../RerunnableBatch_sample2.sln | 4 ++-- .../RerunnableBatch_sample3.csproj | 12 +++++------ .../RerunnableBatch_sample3.sln | 4 ++-- .../SimpleBatch_sample.csproj | 12 +++++------ .../SimpleBatch_sample/SimpleBatch_sample.sln | 4 ++-- .../WSClientWPF_sample.csproj | 16 +++++++-------- .../WSClientWPF_sample/WSClientWPF_sample.sln | 11 ++++++---- .../WSClientWin2_sample.csproj | 12 +++++------ .../WSClientWin2_sample.sln | 9 ++++++--- .../WSClientWin_sample.csproj | 16 +++++++-------- .../WSClientWin_sample/WSClientWin_sample.sln | 8 ++++---- .../WSIFType_sample/WSIFType_sample.csproj | 8 ++++---- .../WSServer_sample/WSServer_sample.csproj | 8 ++++---- .../WSServer_sample/WSServer_sample.sln | 4 ++-- root_VS2022/programs/CS/z_Common.bat | 20 ++++++++++++++----- root_VS2022/programs/CS/z_Common2.bat | 3 ++- root_VS2022/programs/VB/z_Common.bat | 20 ++++++++++++++----- root_VS2022/programs/VB/z_Common2.bat | 3 ++- 57 files changed, 236 insertions(+), 193 deletions(-) diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj index 608fa701e..dc6326f9b 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj @@ -70,10 +70,10 @@ ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll - ..\..\Build\net5.0-windows\WSIFType_sample.dll + ..\..\Build\net5.0\WSIFType_sample.dll - ..\..\Build\net5.0-windows\WSServer_sample.dll + ..\..\Build\net5.0\WSServer_sample.dll diff --git a/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat b/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat index 03c8065ca..7209899e7 100644 --- a/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat +++ b/root_VS2022/programs/CS/6_Build_WSSrvCore_sample.bat @@ -27,8 +27,8 @@ rem -------------------------------------------------- dotnet restore "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln" dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln" -xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0\" -xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Build\net5.0\" +xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net6.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net6.0\" +xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net6.0" "Samples4NetCore\Legacy\WS_sample\Build\net6.0\" pause diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln index f443e20db..478c088d1 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebService", "ASPNETWebService\ASPNETWebService.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" EndProject diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln index 3075dcd3b..26de6e55b 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASPNETWebServiceCore", "ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}" EndProject diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj index f05ed04fe..dd279d138 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true @@ -15,31 +15,31 @@ - ..\..\..\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\Build_netcore50\net5.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\..\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll - ..\..\..\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\..\..\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll - ..\..\..\..\..\Samples4NetCore\Legacy\WS_sample\Build\net5.0\WSIFType_sample.dll + ..\..\..\..\..\Samples4NetCore\Legacy\WS_sample\Build\net6.0\WSIFType_sample.dll - ..\..\..\..\..\Samples4NetCore\Legacy\WS_sample\Build\net5.0\WSServer_sample.dll + ..\..\..\..\..\Samples4NetCore\Legacy\WS_sample\Build\net6.0\WSServer_sample.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln index cac0a7415..aa5c33d65 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCFService", "WCFService.csproj", "{096A202A-72E4-41D8-8B61-970E48E38135}" EndProject diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index 8dc0efe58..5fb2d48d1 100644 --- a/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index 6760b6a32..0ef74d6da 100644 --- a/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index 8472fb7f9..dc57d1435 100644 --- a/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" EndProject diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index c171c93f6..49f8a2838 100644 --- a/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" EndProject diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index 11e71188d..5bbfcca57 100644 --- a/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" EndProject diff --git a/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 4e96633bd..78d4c7fa1 100644 --- a/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root_VS2022/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 98f8229fa..fc3fc9398 100644 --- a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index 51b36b587..451335228 100644 --- a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 2abf219c0..3e0d62411 100644 --- a/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 74b1e7d9f..3e5e444e5 100644 --- a/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root_VS2022/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 449f467aa..d0aa49a92 100644 --- a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index ec1408fea..f8f181eed 100644 --- a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin2_sample", "WSClientWin2_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln index fe6e87885..ccf8691d2 100644 --- a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWinCone_sample", "WSClientWinCone_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 85a35a5b8..ab6aea7b8 100644 --- a/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index 63c933109..f344e69eb 100644 --- a/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root_VS2022/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSServer_sample", "WSServer_sample.csproj", "{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index bd63fac4e..ee0a1fbf5 100644 --- a/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{4BA4D9DE-2656-4FBD-8F1F-31FC9583B5F5}" EndProject diff --git a/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln index 6aa8b40c9..380d49ee5 100644 --- a/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln +++ b/root_VS2022/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebForms_Sample", "WebForms_Sample\WebForms_Sample.csproj", "{74CCC7E1-12DB-4BEB-8003-6261A6C2C7FA}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj index 1f1813a94..0cfbe7961 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true _2CSClientWPF_sample 2CSClientWPF_sample @@ -31,19 +31,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index a58a56287..bac550c06 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2061FCB3-559A-4555-9E05-A38FE63492F1} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj index 1e42c74f5..21bbfdb14 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -33,19 +33,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll @@ -54,7 +54,4 @@ Always - - - \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index 37733c8b7..9774f070a 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FD0B4528-3920-4CB7-B3B2-D9796BB35874} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index ada5d61b8..134686550 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication", "WpfApplication\WpfApplication.csproj", "{14296AF4-CB38-44B9-A42D-C104FE16CE33}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApplication", "WpfApplication\WpfApplication.csproj", "{14296AF4-CB38-44B9-A42D-C104FE16CE33}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F9C8F1ED-81C5-4BBF-AE5C-3D6C6F78F71B} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj index c71d2afb1..539731498 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -12,10 +12,10 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj index 71a55e513..97ee87a85 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true WpfApplication WpfApplication @@ -10,10 +10,10 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj index 96798ed52..0a8c3b2d0 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -20,7 +20,7 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.CustomControl.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.CustomControl.RichClient.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 071185357..7af268fec 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E2AD002B-A6B6-4319-9901-26458056C1C1} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj index 72e888eb4..85c126821 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -144,19 +144,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index c828a4cef..d549afe54 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,6 +19,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9C7A84F3-AA58-40FF-941C-BA3D65D2A296} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj index e07de8b3c..b5aa9323f 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -247,13 +247,13 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 983f7b036..eb1a2005b 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,6 +19,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {ACAEF256-1450-4470-B63A-41EE55A442E0} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj index 800a5b3ef..801bead03 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -29,19 +29,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index f5ec09f1b..2b00681ee 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj index 800a5b3ef..801bead03 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -29,19 +29,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index 0d5e3488c..a5427471c 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj index 800a5b3ef..801bead03 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -29,19 +29,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index c017b2d5a..e87c96a4d 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj index adf810757..6520677f5 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -28,19 +28,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 75bafee17..87bed367e 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{4E1E7400-A012-49E2-8D28-A361F0E1BEE2}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj index 608fa701e..f22984d33 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true WSClientWPF_sample WSClientWPF_sample @@ -55,25 +55,25 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll - ..\..\Build\net5.0-windows\WSIFType_sample.dll + ..\..\Build\net6.0\WSIFType_sample.dll - ..\..\Build\net5.0-windows\WSServer_sample.dll + ..\..\Build\net6.0\WSServer_sample.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index ca5facab9..0ed93524f 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebServiceCore", "..\..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASPNETWebServiceCore", "..\..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -35,4 +35,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {03541A7D-6263-43D4-83E1-6751E882C704} + EndGlobalSection EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj index 0087c5e1a..4f7a70a22 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -30,19 +30,19 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index 01c2ce261..bb0c979ae 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin2_sample", "WSClientWin2_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSClientWin2_sample", "WSClientWin2_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -29,6 +29,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {60E4E08B-DCB5-4A2B-AD0B-AD1A46773B52} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj index cfb7c58ad..fc25cf0bc 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -57,25 +57,25 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll - ..\..\Build\net5.0\WSIFType_sample.dll + ..\..\Build\net6.0\WSIFType_sample.dll - ..\..\Build\net5.0\WSServer_sample.dll + ..\..\Build\net6.0\WSServer_sample.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 71fa00c42..6ef1a9af8 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebServiceCore", "..\..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASPNETWebServiceCore", "..\..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebServiceCore\ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj index 3c921ecd7..45e58925e 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 @@ -10,13 +10,13 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj index fb5520bfa..bdcd61e9d 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 @@ -20,13 +20,13 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln index 2cd564b8b..2bb926b19 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2015 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSServer_sample", "WSServer_sample.csproj", "{E11525D4-EB70-4F4E-B758-42861377705E}" EndProject diff --git a/root_VS2022/programs/CS/z_Common.bat b/root_VS2022/programs/CS/z_Common.bat index 316b1b414..fa944d38b 100644 --- a/root_VS2022/programs/CS/z_Common.bat +++ b/root_VS2022/programs/CS/z_Common.bat @@ -17,22 +17,32 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild ) if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" + set BUILDFILEPATH16="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" ) if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" + set BUILDFILEPATH16="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" ) if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" + set BUILDFILEPATH16="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ) -set BUILDFILEPATH=%BUILDFILEPATH15% +if exist "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe" +) + +set BUILDFILEPATH=%BUILDFILEPATH17% @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). @echo -------------------------------------------------- set BUILD_CONFIG=Debug -set VisualStudioVersion=14.0 +set VisualStudioVersion=17.0 @echo -------------------------------------------------- @echo Creating a build command. diff --git a/root_VS2022/programs/CS/z_Common2.bat b/root_VS2022/programs/CS/z_Common2.bat index 5c83cd5f1..a7c6d4661 100644 --- a/root_VS2022/programs/CS/z_Common2.bat +++ b/root_VS2022/programs/CS/z_Common2.bat @@ -18,8 +18,9 @@ set BUILDFILEPATH4.5.1="%PROGRAM_FILES%\Microsoft Visual Studio 12.0\Common7\IDE set BUILDFILEPATH4.6="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com" set BUILDFILEPATH4.7="%PROGRAM_FILES%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe" set BUILDFILEPATH4.8="%PROGRAM_FILES%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe" +set BUILDFILEPATH6.0="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" -set BUILDFILEPATH=BUILDFILEPATH4.8 +set BUILDFILEPATH=BUILDFILEPATH6.0 @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). diff --git a/root_VS2022/programs/VB/z_Common.bat b/root_VS2022/programs/VB/z_Common.bat index 316b1b414..fa944d38b 100644 --- a/root_VS2022/programs/VB/z_Common.bat +++ b/root_VS2022/programs/VB/z_Common.bat @@ -17,22 +17,32 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild ) if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" + set BUILDFILEPATH16="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" ) if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" + set BUILDFILEPATH16="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" ) if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ( - set BUILDFILEPATH15="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" + set BUILDFILEPATH16="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ) -set BUILDFILEPATH=%BUILDFILEPATH15% +if exist "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe" +) +if exist "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe" +) + +set BUILDFILEPATH=%BUILDFILEPATH17% @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). @echo -------------------------------------------------- set BUILD_CONFIG=Debug -set VisualStudioVersion=14.0 +set VisualStudioVersion=17.0 @echo -------------------------------------------------- @echo Creating a build command. diff --git a/root_VS2022/programs/VB/z_Common2.bat b/root_VS2022/programs/VB/z_Common2.bat index 5c83cd5f1..a7c6d4661 100644 --- a/root_VS2022/programs/VB/z_Common2.bat +++ b/root_VS2022/programs/VB/z_Common2.bat @@ -18,8 +18,9 @@ set BUILDFILEPATH4.5.1="%PROGRAM_FILES%\Microsoft Visual Studio 12.0\Common7\IDE set BUILDFILEPATH4.6="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com" set BUILDFILEPATH4.7="%PROGRAM_FILES%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe" set BUILDFILEPATH4.8="%PROGRAM_FILES%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe" +set BUILDFILEPATH6.0="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" -set BUILDFILEPATH=BUILDFILEPATH4.8 +set BUILDFILEPATH=BUILDFILEPATH6.0 @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). From ab46b44860276cf0386ed2621ea7b7219e8a5312 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 15:57:11 +0900 Subject: [PATCH 23/34] Now, I am fixing #107. --- .../Business/Business_net48.vbproj | 24 +++++++++---------- .../Business.RichClient_net48.vbproj | 14 +++++------ .../Business/RichClient/packages.config | 6 ++--- .../Infrastructure/Business/packages.config | 12 +++++----- .../BusinessRichClient_net48.sln | 8 +++---- .../Infrastructure/Business_net48.sln | 8 +++---- .../CustomControl/CustomControl_net48.vbproj | 4 ++-- .../CustomControl.RichClient_net48.vbproj | 12 ++++++---- .../CustomControl/RichClient/packages.config | 6 ++--- .../CustomControl/packages.config | 2 +- 10 files changed, 49 insertions(+), 47 deletions(-) diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj index af02c203a..cab746d93 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj @@ -91,23 +91,23 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.2.7.0\lib\net48\OpenTouryo.DamManagedOdp.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.2.7.0\lib\net48\OpenTouryo.DamMySQL.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll - - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.2.7.0\lib\net48\OpenTouryo.DamPstGrS.dll + + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll - - ..\packages\Touryo.Infrastructure.Framework.2.7.0\lib\net48\OpenTouryo.Framework.dll + + ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll - - ..\packages\Touryo.Infrastructure.Public.Security.2.7.0\lib\net48\OpenTouryo.Public.Security.dll + + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj index eda37dafb..2fd190ed3 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj @@ -71,11 +71,14 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - - ..\..\Build_net48\OpenTouryo.Framework.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll ..\..\Build_net48\Oracle.ManagedDataAccess.dll @@ -86,9 +89,6 @@ 3.0 - - ..\..\Build_net48\OpenTouryo.Public.dll - diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index 82f258445..d416cdef7 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config index 6ed40b44f..2c9ef3938 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln index 8efa2f596..a739cb6fd 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net48.vbproj", "{7649D699-681D-4BE0-9A36-24B0815ABCEF}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business.RichClient_net48", "Business\RichClient\Business.RichClient_net48.vbproj", "{7649D699-681D-4BE0-9A36-24B0815ABCEF}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net48.vbproj", "{76C5D665-A592-4A35-85D9-B75590E026AA}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl.RichClient_net48", "CustomControl\RichClient\CustomControl.RichClient_net48.vbproj", "{76C5D665-A592-4A35-85D9-B75590E026AA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln index d057a422b..9b1428b91 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business_net48.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business", "Business\Business_net48.vbproj", "{BCB5C7D0-FBE4-43E2-8BED-096700A6A187}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business_net48", "Business\Business_net48.vbproj", "{BCB5C7D0-FBE4-43E2-8BED-096700A6A187}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl", "CustomControl\CustomControl_net48.vbproj", "{64EDF4AB-8739-4027-976B-18BB731DAF76}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl_net48", "CustomControl\CustomControl_net48.vbproj", "{64EDF4AB-8739-4027-976B-18BB731DAF76}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj index 8fa508cc2..638a20eff 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj @@ -64,8 +64,8 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Touryo.Infrastructure.Public.2.7.0\lib\net48\OpenTouryo.Public.dll + + ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj index 2fd2d5b62..68cbf03a4 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj @@ -59,12 +59,14 @@ TRACE,NET48 - - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.2.7.0\lib\net48\OpenTouryo.Framework.RichClient.dll + + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll - - False - ..\..\Build_net48\OpenTouryo.Public.dll + + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + + + ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index f6612f4ab..ff5d353fd 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config index a2b25f722..c40537f25 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file From f422fe5e012f163f0f67cb004e70204aae242431 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 16:54:34 +0900 Subject: [PATCH 24/34] Now, I am fixing #110. --- .../ASPNETWebService/ASPNETWebService.sln | 14 ++++----- .../WCFService/WCFService.sln | 4 +-- .../2CSClientWPF_sample.sln | 4 +-- .../2CSClientWin_sample.sln | 4 +-- .../AsyncEvent_sample/AsyncEvent_sample.sln | 4 +-- .../CustCtrl_sample/CustCtrl_sample.sln | 4 +-- .../GenDaoAndBatUpd_sample.sln | 4 +-- .../TimeStamp_sample/TimeStamp_sample.sln | 4 +-- .../RerunnableBatch_sample.sln | 4 +-- .../RerunnableBatch_sample2.sln | 4 +-- .../RerunnableBatch_sample3.sln | 4 +-- .../SimpleBatch_sample/SimpleBatch_sample.sln | 4 +-- .../WSClientWPF_sample/WSClientWPF_sample.sln | 30 +++++++++---------- .../WSClientWin2_sample.sln | 4 +-- .../WSClientWin_sample/WSClientWin_sample.sln | 22 +++++++------- .../WSServer_sample/WSServer_sample.sln | 4 +-- .../WebApp_sample/MVC_Sample/MVC_Sample.sln | 4 +-- .../MVC_Sample/MVC_Sample/MVC_Sample.vbproj | 2 +- .../WebForms_Sample/WebForms_Sample.vbproj | 1 - 19 files changed, 62 insertions(+), 63 deletions(-) diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln index 2a9fe405c..302d8c0b5 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "ASPNETWebService\ASPNETWebService.vbproj", "{CD8E53D2-B177-494B-AE08-1CEEF98E43D7}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "ASPNETWebService\ASPNETWebService.vbproj", "{C02AC124-7839-4686-87C3-5D65FB089ABD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Any CPU.Build.0 = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln index fdfba7e4e..6c5559844 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WCFService", "WCFService.vbproj", "{48114116-045D-4BB9-93FD-61306697F589}" EndProject diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index bd34ff64f..8d15094da 100644 --- a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2CSClientWPF_sample", "2CSClientWPF_sample.vbproj", "{3D1A8517-4939-424F-80D5-13E022870858}" EndProject diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index cdbff4156..cb7f72a55 100644 --- a/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2CSClientWin_sample", "2CSClientWin_sample.vbproj", "{188A545F-5667-4349-949C-F1372AB592D5}" EndProject diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index e1d73ad65..b1ebfa6be 100644 --- a/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.vbproj", "{F7C3BD4A-F362-4BF2-A3E5-0327038DF0D3}" EndProject diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index aa7e372ee..644f341cf 100644 --- a/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustCtrl_sample", "CustCtrl_sample.vbproj", "{43441376-87E2-4668-8722-8A094AE5C179}" EndProject diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index 5c18eeaa2..6a7bf3cf5 100644 --- a/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.vbproj", "{BEE90CB9-1CDA-4914-BF07-786242CF425B}" EndProject diff --git a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 2e3fa8feb..ebbaa9bab 100644 --- a/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root_VS2022/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TimeStamp_sample", "TimeStamp_sample.vbproj", "{6FEA6EAD-BE15-46A0-A978-D2BA436C7EA6}" EndProject diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index cc210b754..737af45f5 100644 --- a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RerunnableBatch_sample", "RerunnableBatch_sample.vbproj", "{22C1AE38-FC51-41A6-870B-8B180B73CE67}" EndProject diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index a5f8ca7d7..8913aeda9 100644 --- a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.vbproj", "{22C1AE38-FC51-41A6-870B-8B180B73CE67}" EndProject diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index f94621828..9d984b4f2 100644 --- a/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.vbproj", "{22C1AE38-FC51-41A6-870B-8B180B73CE67}" EndProject diff --git a/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index b5343cefc..018ae31b4 100644 --- a/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root_VS2022/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SimpleBatch_sample", "SimpleBatch_sample.vbproj", "{AC32DA05-D3CA-4AD3-BC48-0746B457712D}" EndProject diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 2fd8034fd..3f883b4ce 100644 --- a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSClientWPF_sample", "WSClientWPF_sample.vbproj", "{5B5899DA-98C9-47B7-8832-A21768D788B0}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService\ASPNETWebService.vbproj", "{CD8E53D2-B177-494B-AE08-1CEEF98E43D7}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService\ASPNETWebService.vbproj", "{C02AC124-7839-4686-87C3-5D65FB089ABD}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WCFService", "..\..\..\..\Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.vbproj", "{48114116-045D-4BB9-93FD-61306697F589}" EndProject @@ -29,18 +29,18 @@ Global {5B5899DA-98C9-47B7-8832-A21768D788B0}.Release|Mixed Platforms.Build.0 = Release|x86 {5B5899DA-98C9-47B7-8832-A21768D788B0}.Release|x86.ActiveCfg = Release|x86 {5B5899DA-98C9-47B7-8832-A21768D788B0}.Release|x86.Build.0 = Release|x86 - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|x86.ActiveCfg = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|x86.Build.0 = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Any CPU.Build.0 = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|x86.ActiveCfg = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|x86.Build.0 = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|x86.ActiveCfg = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|x86.Build.0 = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Any CPU.Build.0 = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|x86.ActiveCfg = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|x86.Build.0 = Release|Any CPU {48114116-045D-4BB9-93FD-61306697F589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48114116-045D-4BB9-93FD-61306697F589}.Debug|Any CPU.Build.0 = Debug|Any CPU {48114116-045D-4BB9-93FD-61306697F589}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index a61dc59ba..537fb9f7e 100644 --- a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSClientWin2_sample", "WSClientWin2_sample.vbproj", "{FBA01A43-1A3F-4C92-ABD1-59C51005A084}" EndProject diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 36be2d5f4..b18e92282 100644 --- a/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSClientWin_sample", "WSClientWin_sample.vbproj", "{FBA01A43-1A3F-4C92-ABD1-59C51005A084}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService\ASPNETWebService.vbproj", "{CD8E53D2-B177-494B-AE08-1CEEF98E43D7}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ASPNETWebService", "..\..\..\..\Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService\ASPNETWebService.vbproj", "{C02AC124-7839-4686-87C3-5D65FB089ABD}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WCFService", "..\..\..\..\Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.vbproj", "{48114116-045D-4BB9-93FD-61306697F589}" EndProject @@ -25,14 +25,14 @@ Global {FBA01A43-1A3F-4C92-ABD1-59C51005A084}.Release|Any CPU.Build.0 = Release|Any CPU {FBA01A43-1A3F-4C92-ABD1-59C51005A084}.Release|x86.ActiveCfg = Release|Any CPU {FBA01A43-1A3F-4C92-ABD1-59C51005A084}.Release|x86.Build.0 = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|x86.ActiveCfg = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Debug|x86.Build.0 = Debug|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|Any CPU.Build.0 = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|x86.ActiveCfg = Release|Any CPU - {CD8E53D2-B177-494B-AE08-1CEEF98E43D7}.Release|x86.Build.0 = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|x86.ActiveCfg = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Debug|x86.Build.0 = Debug|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|Any CPU.Build.0 = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|x86.ActiveCfg = Release|Any CPU + {C02AC124-7839-4686-87C3-5D65FB089ABD}.Release|x86.Build.0 = Release|Any CPU {48114116-045D-4BB9-93FD-61306697F589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48114116-045D-4BB9-93FD-61306697F589}.Debug|Any CPU.Build.0 = Debug|Any CPU {48114116-045D-4BB9-93FD-61306697F589}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index 4f91c1ce8..f6d32d6d9 100644 --- a/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root_VS2022/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WSServer_sample", "WSServer_sample.vbproj", "{15F78DB3-7AB0-4ADF-ADCA-48AFBD54C31E}" EndProject diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index f4965f025..471a97ba8 100644 --- a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MVC_Sample", "MVC_Sample\MVC_Sample.vbproj", "{4427474C-E9AD-451F-BF2C-4EE737D59A60}" EndProject diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj index 42a555534..1fee82660 100644 --- a/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj @@ -343,5 +343,5 @@ - + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj index 1c96ba317..db6525484 100644 --- a/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj +++ b/root_VS2022/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj @@ -830,5 +830,4 @@ - \ No newline at end of file From c16f8a874a7938dc098357b2aa6412bcf2e4a408 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Thu, 31 Mar 2022 17:25:45 +0900 Subject: [PATCH 25/34] Now, I am fixing #110. --- z_CICD.bat | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/z_CICD.bat b/z_CICD.bat index 09bf8d54c..534811e71 100644 --- a/z_CICD.bat +++ b/z_CICD.bat @@ -1,18 +1,5 @@ set CURRENTDIR=%cd% -rem VS2015 -cd "root_VS2015\programs\CS" -echo | call 0_ExecAllBat.bat > ..\..\..\Build_2015CS.log - -cd %CURRENTDIR% -move /Y *.log .\BackupCICDLog - -cd "root_VS2015\programs\VB" -echo | call 0_ExecAllBat.bat > ..\..\..\Build_2015VB.log - -cd %CURRENTDIR% -move /Y *.log .\BackupCICDLog - rem VS2017 cd "root_VS2017\programs\CS" echo | call 0_ExecAllBat.bat > ..\..\..\Build_2017CS.log @@ -38,3 +25,16 @@ echo | call 0_ExecAllBat.bat > ..\..\..\Build_2019VB.log cd %CURRENTDIR% move /Y *.log .\BackupCICDLog + +rem VS2022 +cd "root_VS2022\programs\CS" +echo | call 0_ExecAllBat.bat > ..\..\..\Build_2022CS.log + +cd %CURRENTDIR% +move /Y *.log .\BackupCICDLog + +cd "root_VS2022\programs\VB" +echo | call 0_ExecAllBat.bat > ..\..\..\Build_2022VB.log + +cd %CURRENTDIR% +move /Y *.log .\BackupCICDLog \ No newline at end of file From 7628c0443da85c1dd4d8631053afd41601b80322 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Fri, 1 Apr 2022 18:14:58 +0900 Subject: [PATCH 26/34] Now, I am fixing #108. --- .../programs/CS/5_Build_CLICore_sample.bat | 43 +++ .../programs/CS/5_Build_CLI_sample.bat | 27 ++ .../ServiceInterface/WCFService/App.config | 8 +- .../Tools/DeployZipPackWithHTTP/Form1.cs | 17 +- .../Tools/DeployZipPackWithHTTP/Form2.cs | 1 + .../Tools/DeployZipPackWithHTTP/Program.cs | 6 + .../RerunnableBatch_sample/Program.cs | 6 +- .../RerunnableBatch_sample2/Program.cs | 6 +- .../RerunnableBatch_sample3/Program.cs | 6 +- .../Bat_sample/SimpleBatch_sample/Program.cs | 5 +- .../CS/4_Build_Framework_ToolCore.bat | 8 + .../programs/CS/5_Build_CLICore_sample.bat | 43 +++ .../programs/CS/5_Build_CLI_sample.bat | 27 ++ .../ServiceInterface/WCFService/App.config | 12 +- .../DeployZipPackWithHTTPCore.csproj | 95 +++++ .../DeployZipPackWithHTTPCore.sln | 25 ++ .../Tools/DeployZipPackWithHTTP/Form1.cs | 17 +- .../Tools/DeployZipPackWithHTTP/Form2.cs | 1 + .../Tools/DeployZipPackWithHTTP/Program.cs | 6 + .../DeployZipPackWithHTTP/appsettings.json | 18 + .../CLI_sample/DAG_Login_CLI/README.md | 4 + .../CLI_sample/LIR_Login_CLI/README.md | 4 + .../Samples/CLI_sample/Simple_CLI/README.md | 1 + .../CLI_sample/Simple_CLI/Simple_CLI.sln | 25 ++ .../Simple_CLI/Simple_CLI/App.config | 14 + .../Simple_CLI/Simple_CLI/Program.cs | 337 +++++++++++++++++ .../Simple_CLI/Properties/AssemblyInfo.cs | 36 ++ .../Simple_CLI/Simple_CLI/Simple_CLI.csproj | 80 ++++ .../Simple_CLI/Simple_CLI/packages.config | 12 + .../RerunnableBatch_sample/Program.cs | 6 +- .../RerunnableBatch_sample2/Program.cs | 6 +- .../RerunnableBatch_sample3/Program.cs | 6 +- .../Bat_sample/SimpleBatch_sample/Program.cs | 5 +- .../DAG_Login_CLI/DAG_Login_CLI.sln | 25 ++ .../DAG_Login_CLI/DAG_Login_CLI.csproj | 44 +++ .../DAG_Login_CLI/MSGDefinition.xml | 23 ++ .../DAG_Login_CLI/DAG_Login_CLI/Program.cs | 290 +++++++++++++++ .../DAG_Login_CLI/SPDefinition.xml | 15 + .../DAG_Login_CLI/SampleLogConf2CS.xml | 133 +++++++ .../DAG_Login_CLI/appsettings.json | 16 + .../Legacy/CLI_sample/DAG_Login_CLI/README.md | 1 + .../LIR_Login_CLI/LIR_Login_CLI.sln | 25 ++ .../LIR_Login_CLI/LIR_Login_CLI.csproj | 45 +++ .../LIR_Login_CLI/MSGDefinition.xml | 23 ++ .../LIR_Login_CLI/LIR_Login_CLI/Program.cs | 345 ++++++++++++++++++ .../LIR_Login_CLI/SPDefinition.xml | 15 + .../LIR_Login_CLI/SampleLogConf2CS.xml | 133 +++++++ .../LIR_Login_CLI/appsettings.json | 17 + .../Legacy/CLI_sample/LIR_Login_CLI/README.md | 1 + .../Legacy/CLI_sample/Simple_CLI/README.md | 1 + .../CLI_sample/Simple_CLI/Simple_CLI.sln | 25 ++ .../Simple_CLI/Simple_CLI/Program.cs | 337 +++++++++++++++++ .../Simple_CLI/Simple_CLI/Simple_CLI.csproj | 14 + .../programs/VB/5_Build_CLI_sample.bat | 27 ++ .../CLI_sample/DAG_Login_CLI/README.md | 4 + .../CLI_sample/LIR_Login_CLI/README.md | 4 + .../Samples/CLI_sample/Simple_CLI/README.md | 1 + .../CLI_sample/Simple_CLI/Simple_CLI.sln | 25 ++ .../Simple_CLI/Simple_CLI/App.config | 14 + .../Simple_CLI/Simple_CLI/Module1.vb | 272 ++++++++++++++ .../My Project/Application.Designer.vb | 13 + .../Simple_CLI/My Project/Application.myapp | 10 + .../Simple_CLI/My Project/AssemblyInfo.vb | 35 ++ .../My Project/Resources.Designer.vb | 62 ++++ .../Simple_CLI/My Project/Resources.resx | 117 ++++++ .../My Project/Settings.Designer.vb | 73 ++++ .../Simple_CLI/My Project/Settings.settings | 7 + .../Simple_CLI/Simple_CLI/Simple_CLI.vbproj | 138 +++++++ .../Simple_CLI/Simple_CLI/packages.config | 12 + .../CS/4_Build_Framework_ToolCore.bat | 8 + .../programs/CS/5_Build_CLICore_sample.bat | 43 +++ .../programs/CS/5_Build_CLI_sample.bat | 27 ++ .../ServiceInterface/WCFService/App.config | 12 +- .../CLI_sample/DAG_Login_CLI/README.md | 4 + .../CLI_sample/LIR_Login_CLI/README.md | 4 + .../Samples/CLI_sample/Simple_CLI/README.md | 1 + .../CLI_sample/Simple_CLI/Simple_CLI.sln | 25 ++ .../Simple_CLI/Simple_CLI/App.config | 14 + .../Simple_CLI/Simple_CLI/Program.cs | 337 +++++++++++++++++ .../Simple_CLI/Properties/AssemblyInfo.cs | 36 ++ .../Simple_CLI/Simple_CLI/Simple_CLI.csproj | 80 ++++ .../Simple_CLI/Simple_CLI/packages.config | 12 + .../RerunnableBatch_sample/Program.cs | 6 +- .../RerunnableBatch_sample2/Program.cs | 6 +- .../RerunnableBatch_sample3/Program.cs | 6 +- .../Bat_sample/SimpleBatch_sample/Program.cs | 5 +- .../DAG_Login_CLI/DAG_Login_CLI.sln | 25 ++ .../DAG_Login_CLI/DAG_Login_CLI.csproj | 44 +++ .../DAG_Login_CLI/MSGDefinition.xml | 23 ++ .../DAG_Login_CLI/DAG_Login_CLI/Program.cs | 290 +++++++++++++++ .../DAG_Login_CLI/SPDefinition.xml | 15 + .../DAG_Login_CLI/SampleLogConf2CS.xml | 133 +++++++ .../DAG_Login_CLI/appsettings.json | 16 + .../Legacy/CLI_sample/DAG_Login_CLI/README.md | 1 + .../LIR_Login_CLI/LIR_Login_CLI.sln | 25 ++ .../LIR_Login_CLI/LIR_Login_CLI.csproj | 45 +++ .../LIR_Login_CLI/MSGDefinition.xml | 23 ++ .../LIR_Login_CLI/LIR_Login_CLI/Program.cs | 345 ++++++++++++++++++ .../LIR_Login_CLI/SPDefinition.xml | 15 + .../LIR_Login_CLI/SampleLogConf2CS.xml | 133 +++++++ .../LIR_Login_CLI/appsettings.json | 17 + .../Legacy/CLI_sample/LIR_Login_CLI/README.md | 1 + .../Legacy/CLI_sample/Simple_CLI/README.md | 1 + .../CLI_sample/Simple_CLI/Simple_CLI.sln | 25 ++ .../Simple_CLI/Simple_CLI/Program.cs | 337 +++++++++++++++++ .../Simple_CLI/Simple_CLI/Simple_CLI.csproj | 14 + .../programs/VB/5_Build_CLI_sample.bat | 27 ++ .../CLI_sample/DAG_Login_CLI/README.md | 4 + .../CLI_sample/LIR_Login_CLI/README.md | 4 + .../Samples/CLI_sample/Simple_CLI/README.md | 1 + .../CLI_sample/Simple_CLI/Simple_CLI.sln | 25 ++ .../Simple_CLI/Simple_CLI/App.config | 14 + .../Simple_CLI/Simple_CLI/Module1.vb | 272 ++++++++++++++ .../My Project/Application.Designer.vb | 13 + .../Simple_CLI/My Project/Application.myapp | 10 + .../Simple_CLI/My Project/AssemblyInfo.vb | 35 ++ .../My Project/Resources.Designer.vb | 62 ++++ .../Simple_CLI/My Project/Resources.resx | 117 ++++++ .../My Project/Settings.Designer.vb | 73 ++++ .../Simple_CLI/My Project/Settings.settings | 7 + .../Simple_CLI/Simple_CLI/Simple_CLI.vbproj | 138 +++++++ .../Simple_CLI/Simple_CLI/packages.config | 12 + 122 files changed, 6193 insertions(+), 30 deletions(-) create mode 100644 root_VS2017/programs/CS/5_Build_CLICore_sample.bat create mode 100644 root_VS2017/programs/CS/5_Build_CLI_sample.bat create mode 100644 root_VS2019/programs/CS/5_Build_CLICore_sample.bat create mode 100644 root_VS2019/programs/CS/5_Build_CLI_sample.bat create mode 100644 root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj create mode 100644 root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln create mode 100644 root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/README.md create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj create mode 100644 root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs create mode 100644 root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj create mode 100644 root_VS2019/programs/VB/5_Build_CLI_sample.bat create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/README.md create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj create mode 100644 root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config create mode 100644 root_VS2022/programs/CS/5_Build_CLICore_sample.bat create mode 100644 root_VS2022/programs/CS/5_Build_CLI_sample.bat create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/README.md create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj create mode 100644 root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs create mode 100644 root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj create mode 100644 root_VS2022/programs/VB/5_Build_CLI_sample.bat create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/README.md create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj create mode 100644 root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config diff --git a/root_VS2017/programs/CS/5_Build_CLICore_sample.bat b/root_VS2017/programs/CS/5_Build_CLICore_sample.bat new file mode 100644 index 000000000..3b725890a --- /dev/null +++ b/root_VS2017/programs/CS/5_Build_CLICore_sample.bat @@ -0,0 +1,43 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\Simple_CLI\Simple_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of DAG_Login_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\DAG_Login_CLI\DAG_Login_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\DAG_Login_CLI\DAG_Login_CLI.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of LIR _Login_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\LIR_Login_CLI\LIR_Login_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\LIR_Login_CLI\LIR_Login_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2017/programs/CS/5_Build_CLI_sample.bat b/root_VS2017/programs/CS/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root_VS2017/programs/CS/5_Build_CLI_sample.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +..\nuget.exe restore "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 2818dd0ad..ecd91bde6 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -1,4 +1,4 @@ - + @@ -27,7 +27,11 @@ - + diff --git a/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs b/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs index 4d67eedcf..2ea862132 100644 --- a/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs +++ b/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs @@ -43,6 +43,7 @@ //* Moved all the Japanese language exception messages to MSGDefinition_ja-JP.xml file Placed all the converted //* Japanese language exception messages to MSGDefinition.xml file for internationalization supporting English Language. //* 2014/04/25 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call +//* 2020/08/03 西野 大介 NETCOREAPP対応 //********************************************************************************** using System; @@ -107,7 +108,10 @@ private void Form1_Load(object sender, EventArgs e) this.cmbEnc.SelectedIndex = 0; this.cmbCyp.DataSource = Enum.GetValues(typeof(EncryptionAlgorithm)); this.cmbCmpLv.DataSource = Enum.GetValues(typeof(CompressionLevel)); +#if NETCOREAPP +#else this.cmbFormat.DataSource = Enum.GetValues(typeof(SelfExtractorFlavor)); +#endif this.cmbEEFA.DataSource = Enum.GetValues(typeof(ExtractExistingFileAction)); // ZIP作成 @@ -234,10 +238,13 @@ private void btnCompress_Click(object sender, EventArgs e) } // 形式指定 +#if NETCOREAPP +#else SelfExtractorFlavor? selfEx = null; if (this.cmbFormat.Enabled) { selfEx = (SelfExtractorFlavor)this.cmbFormat.SelectedItem; } +#endif // ZIP内パスのルート名 string[] temp = this.txtFile.Text.Split('\\'); @@ -259,7 +266,13 @@ private void btnCompress_Click(object sender, EventArgs e) scd, exts, rootPathInArchive, // ここを空文字列にするとルートフォルダ無しになる。 Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), (EncryptionAlgorithm)this.cmbCyp.SelectedItem, this.txtPass.Text, - (CompressionLevel)this.cmbCmpLv.SelectedItem, selfEx); + (CompressionLevel)this.cmbCmpLv.SelectedItem +#if NETCOREAPP + ); +#else + , selfEx); +#endif + //// 圧縮（２）：selectionCriteriaStringでフィルタ //string selectionCriteriaString = ""; @@ -551,7 +564,7 @@ private void btnCreateManifesto_Click(object sender, EventArgs e) #endregion #region 更新チェック＆インストール - + /// 更新チェック＆インストール private void btnCheckUpdateAndInstall_Click(object sender, EventArgs e) { diff --git a/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs b/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs index e7ef041b6..5b876640e 100644 --- a/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs +++ b/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs @@ -44,6 +44,7 @@ //* （リカバリしない時ログを出力しないよう変更）。 //* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 //* 2014/04/26 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call +//* 2020/08/03 西野 大介 NETCOREAPP対応 //********************************************************************************** using System; diff --git a/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs b/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs index c30a2b1b0..b0f5adfda 100644 --- a/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs +++ b/root_VS2017/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs @@ -267,6 +267,12 @@ private static extern bool SetWindowPos( [STAThread] static void Main() { +#if NETCOREAPP + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); +#else +#endif + // Add DefaultCulture key in app.Config file and take the culture value from app.Config file. string culture = GetConfigParameter.GetConfigValue("DefaultCulture"); if (!string.IsNullOrEmpty(culture)) diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs index b2c06e646..456e066f9 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs index 4a4c8db84..878cccf14 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample2.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs index 270d3df17..aa2d9d169 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample3.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs index 5ef0d898b..afe9a190d 100644 --- a/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs +++ b/root_VS2017/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs @@ -23,6 +23,7 @@ using System; using System.IO; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +47,9 @@ static void Main(string[] args) //////////////////////////////////////////////////////////////////////// // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2019/programs/CS/4_Build_Framework_ToolCore.bat b/root_VS2019/programs/CS/4_Build_Framework_ToolCore.bat index a33ae808e..259dee55f 100644 --- a/root_VS2019/programs/CS/4_Build_Framework_ToolCore.bat +++ b/root_VS2019/programs/CS/4_Build_Framework_ToolCore.bat @@ -31,5 +31,13 @@ call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DaoGen_Tool\DaoGen_ToolCore. pause +rem -------------------------------------------------- +rem Batch build of Deploy ZipPack With HTTP. +rem -------------------------------------------------- +call dotnet restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTPCore.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTPCore.sln" + +pause + rem ------------------------------------------------------- endlocal diff --git a/root_VS2019/programs/CS/5_Build_CLICore_sample.bat b/root_VS2019/programs/CS/5_Build_CLICore_sample.bat new file mode 100644 index 000000000..3b725890a --- /dev/null +++ b/root_VS2019/programs/CS/5_Build_CLICore_sample.bat @@ -0,0 +1,43 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\Simple_CLI\Simple_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of DAG_Login_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\DAG_Login_CLI\DAG_Login_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\DAG_Login_CLI\DAG_Login_CLI.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of LIR _Login_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\LIR_Login_CLI\LIR_Login_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\LIR_Login_CLI\LIR_Login_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2019/programs/CS/5_Build_CLI_sample.bat b/root_VS2019/programs/CS/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root_VS2019/programs/CS/5_Build_CLI_sample.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +..\nuget.exe restore "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 75d9fd5df..63866140e 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -1,4 +1,4 @@ - + @@ -27,11 +27,11 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj new file mode 100644 index 000000000..2a624db99 --- /dev/null +++ b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj @@ -0,0 +1,95 @@ + + + + WinExe + net5.0-windows + true + + + DeployZipPackWithHTTP + OpenTouryo.DeployZipPackWithHTTP + + + + TRACE;NETCOREAPP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + + + + + + Always + + + Always + + + Always + + + + + + True + True + Resource.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + + + + Always + + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln new file mode 100644 index 000000000..459dbdeae --- /dev/null +++ b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployZipPackWithHTTPCore", "DeployZipPackWithHTTPCore.csproj", "{B988A3B4-7296-4491-878B-7C3C2A330A1F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A32A525E-B7F7-4751-877C-46F7BB73BCE5} + EndGlobalSection +EndGlobal diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs index 4d67eedcf..2ea862132 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs +++ b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs @@ -43,6 +43,7 @@ //* Moved all the Japanese language exception messages to MSGDefinition_ja-JP.xml file Placed all the converted //* Japanese language exception messages to MSGDefinition.xml file for internationalization supporting English Language. //* 2014/04/25 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call +//* 2020/08/03 西野 大介 NETCOREAPP対応 //********************************************************************************** using System; @@ -107,7 +108,10 @@ private void Form1_Load(object sender, EventArgs e) this.cmbEnc.SelectedIndex = 0; this.cmbCyp.DataSource = Enum.GetValues(typeof(EncryptionAlgorithm)); this.cmbCmpLv.DataSource = Enum.GetValues(typeof(CompressionLevel)); +#if NETCOREAPP +#else this.cmbFormat.DataSource = Enum.GetValues(typeof(SelfExtractorFlavor)); +#endif this.cmbEEFA.DataSource = Enum.GetValues(typeof(ExtractExistingFileAction)); // ZIP作成 @@ -234,10 +238,13 @@ private void btnCompress_Click(object sender, EventArgs e) } // 形式指定 +#if NETCOREAPP +#else SelfExtractorFlavor? selfEx = null; if (this.cmbFormat.Enabled) { selfEx = (SelfExtractorFlavor)this.cmbFormat.SelectedItem; } +#endif // ZIP内パスのルート名 string[] temp = this.txtFile.Text.Split('\\'); @@ -259,7 +266,13 @@ private void btnCompress_Click(object sender, EventArgs e) scd, exts, rootPathInArchive, // ここを空文字列にするとルートフォルダ無しになる。 Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), (EncryptionAlgorithm)this.cmbCyp.SelectedItem, this.txtPass.Text, - (CompressionLevel)this.cmbCmpLv.SelectedItem, selfEx); + (CompressionLevel)this.cmbCmpLv.SelectedItem +#if NETCOREAPP + ); +#else + , selfEx); +#endif + //// 圧縮（２）：selectionCriteriaStringでフィルタ //string selectionCriteriaString = ""; @@ -551,7 +564,7 @@ private void btnCreateManifesto_Click(object sender, EventArgs e) #endregion #region 更新チェック＆インストール - + /// 更新チェック＆インストール private void btnCheckUpdateAndInstall_Click(object sender, EventArgs e) { diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs index e7ef041b6..5b876640e 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs +++ b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs @@ -44,6 +44,7 @@ //* （リカバリしない時ログを出力しないよう変更）。 //* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 //* 2014/04/26 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call +//* 2020/08/03 西野 大介 NETCOREAPP対応 //********************************************************************************** using System; diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs index c30a2b1b0..b0f5adfda 100644 --- a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs +++ b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs @@ -267,6 +267,12 @@ private static extern bool SetWindowPos( [STAThread] static void Main() { +#if NETCOREAPP + // configの初期化 + GetConfigParameter.InitConfiguration("appsettings.json"); +#else +#endif + // Add DefaultCulture key in app.Config file and take the culture value from app.Config file. string culture = GetConfigParameter.GetConfigValue("DefaultCulture"); if (!string.IsNullOrEmpty(culture)) diff --git a/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json new file mode 100644 index 000000000..6de259a69 --- /dev/null +++ b/root_VS2019/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json @@ -0,0 +1,18 @@ +{ + // appSettings section + "appSettings": { + // リソース ファイルの場合 + //"FxXMLMSGDefinition": "MSGDefinition.xml", + "FxLog4NetConfFile": "Log4DeployZipPackWithHTTP.xml", + // 埋め込まれたリソースの場合 + "FxXMLMSGDefinition": "DeployZipPackWithHTTP.MSGDefinition.xml", + //"FxLog4NetConfFile": "DeployZipPackWithHTTP.Log4DeployZipPackWithHTTP.xml", + // 非同期呼び出し処理の多重度（2以上の設定が必須） + "FxMaxThreadCount": "3", + // プログレスダイアログが閉じるまでの待機設定（秒） + "PDWSleepSec": "1", + "DefaultCulture": "ja-JP", + // "FxBusinessMessageCulture": "en-US", + "ClientSettingsProvider.ServiceUri": "" + } +} \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md b/root_VS2019/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..9597c69bf --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md @@ -0,0 +1,4 @@ +DAG : OAuth 2.0 Device Authorization Grant + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md b/root_VS2019/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..f1fb33853 --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md @@ -0,0 +1,4 @@ +LIR : Loopback Interface Redirection of OAuth 2.0 for Native Apps + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/README.md b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/README.md @@ -0,0 +1 @@ +System.CommandLine と Sharprompt を使用したCLIのサンプル / テンプレ \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..182231fcd --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31515.178 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple_CLI", "Simple_CLI\Simple_CLI.csproj", "{2F7D1A24-3882-4425-AC49-1E623D19C549}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {13A2C6FB-ED4C-48AA-AC89-679921A6D7B2} + EndGlobalSection +EndGlobal diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config new file mode 100644 index 000000000..9a6820f73 --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs new file mode 100644 index 000000000..bcd9704c4 --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs @@ -0,0 +1,337 @@ +//********************************************************************************** +//* 単純CLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：単純CLIサンプル アプリ +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Diagnostics; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; + +namespace Simple_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region subCommandComplex + Command subCommandComplex = new Command(name: "complex", description: "Sub command complex") + { + new Option("--an-int"), + new Option("--a-string") + }; + subCommandComplex.Handler = CommandHandler.Create((ComplexType complexType) => + { + Console.WriteLine($"Sub command complex: {JsonConvert.SerializeObject(complexType)}"); + }); + rootCommand.AddCommand(subCommandComplex); + #endregion + + #region subCommandInteractive + Command subCommandInteractive = new Command(name: "interactive", description: "Sub command interactive"); + subCommandInteractive.AddOption(new Option(alias: "--a-string")); + subCommandInteractive.Handler = CommandHandler.Create((string aString) => + { + Console.WriteLine($"Sub command interactive (Ctrl-C terminate): {aString}"); + + Prompt.ColorSchema.Answer = ConsoleColor.DarkRed; + Prompt.ColorSchema.Select = ConsoleColor.DarkCyan; + Console.OutputEncoding = Encoding.UTF8; + + string name = Prompt.Input("名前", validators: new[] { Validators.Required() }); + Console.WriteLine($"こんにちは, {name}"); + + int age = Prompt.Input("年齢"); + Console.WriteLine($"年齢: {age}"); + + string password = Prompt.Password("Type new password"); + Console.WriteLine("Password OK"); + + bool answer = Prompt.Confirm("Are you ready?"); + Console.WriteLine($"Your answer is {answer}"); + + EnumMonth value = Prompt.Select("Select enum value"); + Console.WriteLine($"You selected {value}"); + + Program.GetPrefectureList(out string[] prefectureList); + string prefecture = Prompt.Select("都道府県", prefectureList, pageSize: 5); + Console.WriteLine($"都道府県: {prefecture}"); + }); + rootCommand.AddCommand(subCommandInteractive); + #endregion + + #region subCommandDelay + Command subCommandDelay = new Command(name: "delay", description: "Sub command delay"); + subCommandDelay.AddOption(new Option(alias: "--a-string")); + subCommandDelay.Handler = CommandHandler.Create( + async (string aString, IConsole console, CancellationToken token) => + { + Console.WriteLine($"Sub command delay (Ctrl-C terminate): {aString}"); + + try + { + for (int i = 0; i < 10; i++) + { + Console.WriteLine($"Sub command delay: {i}"); + + await Task.Delay(1000, token); + } + + // 例えば... + //using (var httpClient = new HttpClient()) + //{ + // await httpClient.GetAsync("http://www.example.com", token); + //} + + Console.WriteLine("Sub command delay was completed."); + return 0; + } + catch (OperationCanceledException) + { + // ココのコードは.NET Fx系だとハングする。 + // .NET Core系だとハングしない。 + Console.WriteLine("Sub command delay was aborted."); + return 1; + } + } + ); + rootCommand.AddCommand(subCommandDelay); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandComplex + await rootCommand.InvokeAsync("complex --an-int 123 --a-string hogehoge"); + // subCommandInteractive + await rootCommand.InvokeAsync("interactive --a-string hoge"); + // subCommandDelay + await rootCommand.InvokeAsync("delay --a-string hogehoge"); + #endregion + } + #endregion + + #region SELECT + + /// EnumMonth + private enum EnumMonth : byte + { + January = 1, February, March, April, + May, June, July, August, + September, October, November, December + } + + /// GetPrefectureList + /// string[] + private static void GetPrefectureList(out string[] prefectureList) + { + prefectureList = new[] + { + "北海道", + "青森県", + "岩手県", + "宮城県", + "秋田県", + "山形県", + "福島県", + "茨城県", + "栃木県", + "群馬県", + "埼玉県", + "千葉県", + "東京都", + "神奈川県", + "新潟県", + "富山県", + "石川県", + "福井県", + "山梨県", + "長野県", + "岐阜県", + "静岡県", + "愛知県", + "三重県", + "滋賀県", + "京都府", + "大阪府", + "兵庫県", + "奈良県", + "和歌山県", + "鳥取県", + "島根県", + "岡山県", + "広島県", + "山口県", + "徳島県", + "香川県", + "愛媛県", + "高知県", + "福岡県", + "佐賀県", + "長崎県", + "熊本県", + "大分県", + "宮崎県", + "鹿児島県", + "沖縄県" + }; + } + #endregion + } + + /// ComplexType + public class ComplexType + { + // public ComplexType(int anInt, string aString) + // { + // AnInt = anInt; + // AString = aString; + // } + public int AnInt { get; set; } + public string AString { get; set; } + } +} diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..69118115c --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +// 制御されます。アセンブリに関連付けられている情報を変更するには、 +// これらの属性値を変更します。 +[assembly: AssemblyTitle("Simple_CLI")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Simple_CLI")] +[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントから +// 参照できなくなります。COM からこのアセンブリ内の型にアクセスする必要がある場合は、 +// その型の ComVisible 属性を true に設定します。 +[assembly: ComVisible(false)] + +// このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります +[assembly: Guid("2f7d1a24-3882-4425-ac49-1e623d19c549")] + +// アセンブリのバージョン情報は次の 4 つの値で構成されています: +// +// メジャー バージョン +// マイナー バージョン +// ビルド番号 +// リビジョン +// +// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます +// 既定値にすることができます: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj new file mode 100644 index 000000000..e56f1e9b6 --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj @@ -0,0 +1,80 @@ + + + + + Debug + AnyCPU + {2F7D1A24-3882-4425-AC49-1E623D19C549} + Exe + Simple_CLI + Simple_CLI + v4.6.1 + 512 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Sharprompt.2.2.1\lib\netstandard2.0\Sharprompt.dll + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.CommandLine.2.0.0-beta1.21216.1\lib\netstandard2.0\System.CommandLine.dll + + + ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root_VS2019/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs index b2c06e646..456e066f9 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs index 4a4c8db84..878cccf14 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample2.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs index 270d3df17..aa2d9d169 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample3.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs index 5ef0d898b..afe9a190d 100644 --- a/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs @@ -23,6 +23,7 @@ using System; using System.IO; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +47,9 @@ static void Main(string[] args) //////////////////////////////////////////////////////////////////////// // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln new file mode 100644 index 000000000..4d9944e8d --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31515.178 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DAG_Login_CLI", "DAG_Login_CLI\DAG_Login_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB325D9D-3010-4CAD-AB0D-9079A9471EF5} + EndGlobalSection +EndGlobal diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj new file mode 100644 index 000000000..cb9bb3a7d --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj @@ -0,0 +1,44 @@ + + + + Exe + net5.0 + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + + + + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs new file mode 100644 index 000000000..1a098d5ba --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs @@ -0,0 +1,290 @@ +//********************************************************************************** +//* DAGログインCLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：DAGログインCLIサンプル アプリ +//* DAG : OAuth 2.0 Device Authorization Grant +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Reflection; +using System.Diagnostics; +using System.Net.Http; + +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Util; +using Touryo.Infrastructure.Public.FastReflection; +using Touryo.Infrastructure.Framework.Authentication; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace DAG_Login_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + // 初期化 + // configの初期化 + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); + // デバイスフロー用 + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region LoginCommand + Command LoginCommand = new Command(name: "login", description: "Sub command login"); + LoginCommand.AddOption(new Option(alias: "--a-string")); + LoginCommand.Handler = CommandHandler.Create(Program.LoginCommand); + rootCommand.AddCommand(LoginCommand); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + + #region LoginCommand + /// LoginCommand + /// aString + private static async Task LoginCommand(string aString) + { + Console.WriteLine($"Sub command login: {aString}"); + + // リクエスト + + // URL + string rootAuthZUri = GetConfigParameter.GetConfigValue("RootAuthZUri"); + string oAuth2TokenEndpoint = GetConfigParameter.GetConfigValue("OAuth2TokenEndpoint"); + string oAuth2UselInfoEndpoint = GetConfigParameter.GetConfigValue("OAuth2UselInfoEndpoint"); + string deviceAuthZAuthorizeEndpoint = GetConfigParameter.GetConfigValue("DeviceAuthZAuthorizeEndpoint"); + + // パラメタ + string client_id = GetConfigParameter.GetConfigValue("ClientId"); + string device_code = ""; + string userCode = ""; + + // URI + Uri tokenEndpointUri = new Uri(rootAuthZUri + oAuth2TokenEndpoint); + Uri uselInfoEndpointUri = new Uri(rootAuthZUri + oAuth2UselInfoEndpoint); + Uri deviceAuthZAuthorizeEndpointUri = new Uri(rootAuthZUri + deviceAuthZAuthorizeEndpoint); + + // DeviceAuthZRequestAsync + // リクエスト + string responseString = await OAuth2AndOIDCClient + .DeviceAuthZRequestAsync(deviceAuthZAuthorizeEndpointUri, client_id); + + // レスポンス + JObject responseJObject = (JObject)JsonConvert.DeserializeObject(responseString); + device_code = (string)responseJObject[OAuth2AndOIDCConst.device_code]; + userCode = (string)responseJObject[OAuth2AndOIDCConst.user_code]; + string verificationUri = rootAuthZUri + (string)responseJObject[OAuth2AndOIDCConst.verification_uri]; + string verificationUriComplete = rootAuthZUri + (string)responseJObject[OAuth2AndOIDCConst.verification_uri_complete]; + + // 結果表示 + //Console.WriteLine("deviceCode: " + deviceCode); + Console.WriteLine("userCode: " + userCode); + Console.WriteLine("verificationUri: " + verificationUri); + Console.WriteLine("verificationUriComplete: " + verificationUriComplete); + + // ポーリング開始 + bool answer = Prompt.Confirm("Are you ready?"); + Console.WriteLine($"Your answer is {answer}"); + + bool continueLoop = true; + ExponentialBackoff exponentialBackoff = new ExponentialBackoff(10, 5); // config化必要？ + + while (continueLoop) + { + Console.WriteLine("... polling ..."); + + // Tokenリクエスト + // GetAccessTokenByDeviceAuthZAsync + string response = await OAuth2AndOIDCClient + .GetAccessTokenByDeviceAuthZAsync(tokenEndpointUri, client_id, device_code); + + JObject temp = (JObject)JsonConvert.DeserializeObject(response); + + if (!temp.ContainsKey(OAuth2AndOIDCConst.error)) + { + // 正常系 + continueLoop = false; + + // UserInfoリクエスト + // GetUserInfoAsync + string userInfo = await OAuth2AndOIDCClient + .GetUserInfoAsync(uselInfoEndpointUri, (string)temp[OAuth2AndOIDCConst.AccessToken]); + + Console.WriteLine("NORMAL_END :"); + Console.WriteLine(userInfo); + } + else + { + // 異常系 + if ((string)temp[OAuth2AndOIDCConst.error] == OAuth2AndOIDCEnum.CibaState.authorization_pending.ToStringByEmit()) + { + // authorization_pending + continueLoop = exponentialBackoff.Sleep(); + } + else + { + // authorization_pending以外 + // 終了 + continueLoop = false; + Console.WriteLine("ABNORMAL_END"); + } + } + } + } + #endregion + + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandLogin + await rootCommand.InvokeAsync("login"); + #endregion + } + #endregion + } +} diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json new file mode 100644 index 000000000..246ca0964 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json @@ -0,0 +1,16 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "RootAuthZUri": "https://localhost:44300/MultiPurposeAuthSite", + "OAuth2TokenEndpoint": "/token", + "OAuth2UselInfoEndpoint": "/userinfo", + "DeviceAuthZAuthorizeEndpoint": "/device_authz", + "ClientId": "ae5a179813234ca290c8de93ef2e31dc" + } +} \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..3fdab6ab5 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md @@ -0,0 +1 @@ +DAG : OAuth 2.0 Device Authorization Grant \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln new file mode 100644 index 000000000..b15ae132e --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31515.178 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LIR_Login_CLI", "LIR_Login_CLI\LIR_Login_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB325D9D-3010-4CAD-AB0D-9079A9471EF5} + EndGlobalSection +EndGlobal diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj new file mode 100644 index 000000000..99eacb4d0 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj @@ -0,0 +1,45 @@ + + + + Exe + net5.0 + + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + + + + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs new file mode 100644 index 000000000..8ac3d400a --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs @@ -0,0 +1,345 @@ +//********************************************************************************** +//* LIRログインCLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：LIRログインCLIサンプル アプリ +//* LIR：Loopback Interface Redirection of OAuth 2.0 for Native Apps +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Reflection; +using System.Diagnostics; +using System.ComponentModel; +using System.Runtime.InteropServices; +using System.Net; +using System.Net.Http; + +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Util; +using Touryo.Infrastructure.Public.FastReflection; +using Touryo.Infrastructure.Public.Security.Pwd; +using Touryo.Infrastructure.Framework.Authentication; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace LIR_Login_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + // 初期化 + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); + // OAuth PKCE用 + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region LoginCommand + Command LoginCommand = new Command(name: "login", description: "Sub command login"); + LoginCommand.AddOption(new Option(alias: "--a-string")); + LoginCommand.Handler = CommandHandler.Create(Program.LoginCommand); + rootCommand.AddCommand(LoginCommand); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + + #region LoginCommand + /// LoginCommand + /// aString + private static async Task LoginCommand(string aString) + { + if (!HttpListener.IsSupported) + { + Console.WriteLine("HttpListener is not supported."); + return; + } + + Console.WriteLine($"Sub command login: {aString}"); + + // リクエスト + + // URL + string rootAuthZUri = GetConfigParameter.GetConfigValue("RootAuthZUri"); + string oAuth2AuthorizeEndpoint = GetConfigParameter.GetConfigValue("OAuth2AuthorizeEndpoint"); + string oAuth2TokenEndpoint = GetConfigParameter.GetConfigValue("OAuth2TokenEndpoint"); + string oAuth2UselInfoEndpoint = GetConfigParameter.GetConfigValue("OAuth2UselInfoEndpoint"); + + // パラメタ + string client_id = GetConfigParameter.GetConfigValue("ClientId"); + string redirect_uri = "http://localhost:12345/"; + string state = GetPassword.Generate(10, 0); + string code_verifier = GetPassword.Base64UrlSecret(50); + string code_challenge = OAuth2AndOIDCClient.PKCE_S256_CodeChallengeMethod(code_verifier); + string target = rootAuthZUri + oAuth2AuthorizeEndpoint + string.Format( + "?client_id={0}&response_type={1}&scope={2}&state={3}&code_challenge={4}&code_challenge_method={5}", + client_id, + OAuth2AndOIDCConst.AuthorizationCodeResponseType, + OAuth2AndOIDCConst.email_verified, + state, code_challenge, + OAuth2AndOIDCConst.PKCE_S256); + + // URI + Uri tokenEndpointUri = new Uri(rootAuthZUri + oAuth2TokenEndpoint); + Uri uselInfoEndpointUri = new Uri(rootAuthZUri + oAuth2UselInfoEndpoint); + //Uri authorizeEndpointUri = new Uri(target); + + #region 認可リクエスト・レスポンス + HttpListener listener = null; + HttpListenerRequest listenerRequest = null; + HttpListenerResponse listenerResponse = null; + Stream output = null; + try + { + #region レスポンスの準備 + // リスナーを起動して受信 + listener = new HttpListener(); + listener.Prefixes.Add(redirect_uri); + listener.Start(); + Console.WriteLine("Listening..."); + #endregion + + #region 認可リクエスト。 + try + { + // ブラウザを起動して送信 + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + //Windowsのとき + target = target.Replace("&", "^&"); + Process.Start( + new ProcessStartInfo("cmd", $"/c start {target}") { CreateNoWindow = true }); + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + // Linuxのとき + Process.Start("xdg-open", target); + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + // Macのとき + Process.Start("open", target); + } + else + { + throw new Exception("Unknown OS platform."); + } + } + catch (Win32Exception noBrowser) + { + + Console.WriteLine(noBrowser.Message); + return; + } + catch (System.Exception other) + { + Console.WriteLine(other.Message); + return; + } + + // 受信と返信 + HttpListenerContext context = listener.GetContext(); + listenerRequest = context.Request; + listenerResponse = context.Response; + + byte[] buffer = System.Text.Encoding.UTF8.GetBytes( + "Accepted the authorization response."); + + // 返信 + listenerResponse.ContentLength64 = buffer.Length; + output = listenerResponse.OutputStream; + output.Write(buffer, 0, buffer.Length); + #endregion + } + finally + { + // 後処理 + output.Close(); + listener.Stop(); + } + #endregion + + string code = listenerRequest.QueryString["code"]; + + // Tokenリクエスト + // GetAccessTokenByDeviceAuthZAsync + string response = await OAuth2AndOIDCClient + .GetAccessTokenByCodeAsync( + tokenEndpointUri, client_id, "", + redirect_uri, code, code_verifier); + + JObject temp = (JObject)JsonConvert.DeserializeObject(response); + + if (!temp.ContainsKey(OAuth2AndOIDCConst.error)) + { + // 正常系 + + // UserInfoリクエスト + // GetUserInfoAsync + string userInfo = await OAuth2AndOIDCClient + .GetUserInfoAsync(uselInfoEndpointUri, (string)temp[OAuth2AndOIDCConst.AccessToken]); + + Console.WriteLine("NORMAL_END :"); + Console.WriteLine(userInfo); + } + else + { + // 異常系 + Console.WriteLine("ABNORMAL_END"); + } + } + #endregion + + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandLogin + await rootCommand.InvokeAsync("login"); + #endregion + } + #endregion + } +} diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json new file mode 100644 index 000000000..8bc58abcf --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json @@ -0,0 +1,17 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "RootAuthZUri": "https://localhost:44300/MultiPurposeAuthSite", + "OAuth2AuthorizeEndpoint": "/authorize", + "OAuth2TokenEndpoint": "/token", + "OAuth2UselInfoEndpoint": "/userinfo", + "DeviceAuthZAuthorizeEndpoint": "/device_authz", + "ClientId": "ae5a179813234ca290c8de93ef2e31dc" + } +} \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..92cb873e9 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md @@ -0,0 +1 @@ +LIR : Loopback Interface Redirection of OAuth 2.0 for Native Apps \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md @@ -0,0 +1 @@ +System.CommandLine と Sharprompt を使用したCLIのサンプル / テンプレ \ No newline at end of file diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..42c0bf023 --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31515.178 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple_CLI", "Simple_CLI\Simple_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB325D9D-3010-4CAD-AB0D-9079A9471EF5} + EndGlobalSection +EndGlobal diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs new file mode 100644 index 000000000..077896f3f --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs @@ -0,0 +1,337 @@ +//********************************************************************************** +//* 単純CLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：単純CLIサンプル アプリ +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Diagnostics; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; + +namespace Simple_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region subCommandComplex + Command subCommandComplex = new Command(name: "complex", description: "Sub command complex") + { + new Option("--an-int"), + new Option("--a-string") + }; + subCommandComplex.Handler = CommandHandler.Create((ComplexType complexType) => + { + Console.WriteLine($"Sub command complex: {JsonConvert.SerializeObject(complexType)}"); + }); + rootCommand.AddCommand(subCommandComplex); + #endregion + + #region subCommandInteractive + Command subCommandInteractive = new Command(name: "interactive", description: "Sub command interactive"); + subCommandInteractive.AddOption(new Option(alias: "--a-string")); + subCommandInteractive.Handler = CommandHandler.Create((string aString) => + { + Console.WriteLine($"Sub command interactive (Ctrl-C terminate): {aString}"); + + Prompt.ColorSchema.Answer = ConsoleColor.DarkRed; + Prompt.ColorSchema.Select = ConsoleColor.DarkCyan; + Console.OutputEncoding = Encoding.UTF8; + + string name = Prompt.Input("名前", validators: new[] { Validators.Required() }); + Console.WriteLine($"こんにちは, {name}"); + + int age = Prompt.Input("年齢"); + Console.WriteLine($"年齢: {age}"); + + string password = Prompt.Password("Type new password"); + Console.WriteLine("Password OK"); + + bool answer = Prompt.Confirm("Are you ready?"); + Console.WriteLine($"Your answer is {answer}"); + + EnumMonth value = Prompt.Select("Select enum value"); + Console.WriteLine($"You selected {value}"); + + Program.GetPrefectureList(out string[] prefectureList); + string prefecture = Prompt.Select("都道府県", prefectureList, pageSize: 5); + Console.WriteLine($"都道府県: {prefecture}"); + }); + rootCommand.AddCommand(subCommandInteractive); + #endregion + + #region subCommandDelay + Command subCommandDelay = new Command(name: "delay", description: "Sub command delay"); + subCommandDelay.AddOption(new Option(alias: "--a-string")); + subCommandDelay.Handler = CommandHandler.Create( + async (string aString, IConsole console, CancellationToken token) => + { + Console.WriteLine($"Sub command delay(Ctrl-C terminate): {aString}"); + + try + { + for (int i = 0; i < 10; i++) + { + Console.WriteLine($"Sub command delay: {i}"); + + await Task.Delay(1000, token); + } + + // 例えば... + //using (var httpClient = new HttpClient()) + //{ + // await httpClient.GetAsync("http://www.example.com", token); + //} + + Console.WriteLine("Sub command delay was completed."); + return 0; + } + catch (OperationCanceledException) + { + // ココのコードは.NET Fx系だとハングする。 + // .NET Core系だとハングしない。 + Console.WriteLine("Sub command delay was aborted."); + return 1; + } + } + ); + rootCommand.AddCommand(subCommandDelay); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandComplex + await rootCommand.InvokeAsync("complex --an-int 123 --a-string hogehoge"); + // subCommandInteractive + await rootCommand.InvokeAsync("interactive --a-string hoge"); + // subCommandDelay + await rootCommand.InvokeAsync("delay --a-string hogehoge"); + #endregion + } + #endregion + + #region SELECT + + /// EnumMonth + private enum EnumMonth : byte + { + January = 1, February, March, April, + May, June, July, August, + September, October, November, December + } + + /// GetPrefectureList + /// string[] + private static void GetPrefectureList(out string[] prefectureList) + { + prefectureList = new[] + { + "北海道", + "青森県", + "岩手県", + "宮城県", + "秋田県", + "山形県", + "福島県", + "茨城県", + "栃木県", + "群馬県", + "埼玉県", + "千葉県", + "東京都", + "神奈川県", + "新潟県", + "富山県", + "石川県", + "福井県", + "山梨県", + "長野県", + "岐阜県", + "静岡県", + "愛知県", + "三重県", + "滋賀県", + "京都府", + "大阪府", + "兵庫県", + "奈良県", + "和歌山県", + "鳥取県", + "島根県", + "岡山県", + "広島県", + "山口県", + "徳島県", + "香川県", + "愛媛県", + "高知県", + "福岡県", + "佐賀県", + "長崎県", + "熊本県", + "大分県", + "宮崎県", + "鹿児島県", + "沖縄県" + }; + } + #endregion + } + + /// ComplexType + public class ComplexType + { + // public ComplexType(int anInt, string aString) + // { + // AnInt = anInt; + // AString = aString; + // } + public int AnInt { get; set; } + public string AString { get; set; } + } +} diff --git a/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj new file mode 100644 index 000000000..f13eb956c --- /dev/null +++ b/root_VS2019/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj @@ -0,0 +1,14 @@ + + + + Exe + net5.0 + + + + + + + + + diff --git a/root_VS2019/programs/VB/5_Build_CLI_sample.bat b/root_VS2019/programs/VB/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root_VS2019/programs/VB/5_Build_CLI_sample.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +..\nuget.exe restore "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md b/root_VS2019/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..9597c69bf --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md @@ -0,0 +1,4 @@ +DAG : OAuth 2.0 Device Authorization Grant + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md b/root_VS2019/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..f1fb33853 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md @@ -0,0 +1,4 @@ +LIR : Loopback Interface Redirection of OAuth 2.0 for Native Apps + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/README.md b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/README.md @@ -0,0 +1 @@ +System.CommandLine と Sharprompt を使用したCLIのサンプル / テンプレ \ No newline at end of file diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..9b4920515 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31515.178 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Simple_CLI", "Simple_CLI\Simple_CLI.vbproj", "{816EC424-CAA7-4877-BEED-D71F5715EF26}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {51A58542-DF10-4EE0-82DD-152DD07363E2} + EndGlobalSection +EndGlobal diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config new file mode 100644 index 000000000..9a6820f73 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb new file mode 100644 index 000000000..a1f1bf2a7 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb @@ -0,0 +1,272 @@ + +' テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +'********************************************************************************** +'* クラス名 ：Program +'* クラス日本語名 ：単純CLIサンプル アプリ +'* +'* 作成日時 ：－ +'* 作成者 ：開発基盤部会 +'* 更新履歴 ： +'* +'* 日時 更新者 内容 +'* ---------- ---------------- ------------------------------------------------- +'* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +'********************************************************************************** + +Imports System +Imports System.Collections.Generic +Imports System.Linq +Imports System.Text +Imports System.Threading.Tasks + +Imports System.IO +Imports System.Threading +Imports System.Diagnostics + +Imports System.CommandLine +Imports System.CommandLine.Invocation + +Imports Sharprompt + +Imports Newtonsoft +Imports Newtonsoft.Json +Module Module1 + + ''' + ''' VBで非同期化できる？ + ''' Function Main(args As String()) As Task(Of Integer) + ''' + ''' string[] + Sub Main(args As String()) + +#Region "rootCommand" + ' Create a root command with some options + ' alias、default value、description + Dim rootCommand As Command = New RootCommand() From { + New [Option](Of Integer)([alias]:="--int-option", getDefaultValue:=Function() 42, description:="An option whose argument is parsed as an int"), + New [Option](Of Boolean)([alias]:="--bool-option", description:="An option whose argument is parsed as a bool"), + New [Option](Of FileInfo)([alias]:="--file-option", description:="An option whose argument is parsed as a FileInfo"), + New [Option](Of FileAccess)([alias]:="--file-access-option", getDefaultValue:=Function() FileAccess.Read, description:="An option whose argument is parsed as a FileAccess") + } + + rootCommand.Description = "My sample app" + + ' Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Of Integer, Boolean, FileInfo, FileAccess)(AddressOf Module1.RootCommand) +#End Region + +#Region "subCommand" + +#Region "subCommand1" + Dim subCommand1 As New Command(name:="cmd1", description:="Sub command cmd1") + subCommand1.AddOption(New [Option](Of Integer)([alias]:="--an-int")) + subCommand1.Handler = CommandHandler.Create(Of Integer)( + Sub(anInt As Integer) + Console.WriteLine("Sub command cmd1: {anInt}") + End Sub) + rootCommand.AddCommand(subCommand1) +#End Region + +#Region "subCommand2" + Dim subCommand2 As New Command(name:="cmd2", description:="Sub command cmd2") + subCommand2.AddOption(New [Option](Of String)([alias]:="--a-string")) + subCommand2.Handler = CommandHandler.Create(Of String)( + Sub(aString As String) + Console.WriteLine("Sub command cmd2: {aString}") + End Sub) + rootCommand.AddCommand(subCommand2) +#End Region + +#Region "subCommandComplex" + Dim subCommandComplex As New Command(name:="complex", description:="Sub command complex") From + { + New [Option](Of Integer)("--an-int"), + New [Option](Of String)("--a-string") + } + + subCommandComplex.Handler = CommandHandler.Create( + Sub(complexType As ComplexType) + Console.WriteLine("Sub command complex: {JsonConvert.SerializeObject(complexType)}") + End Sub) + rootCommand.AddCommand(subCommandComplex) +#End Region + +#Region "subCommandInteractive" + Dim subCommandInteractive As New Command(name:="interactive", description:="Sub command interactive") + subCommandInteractive.AddOption(New [Option](Of String)([alias]:="--a-string")) + subCommandInteractive.Handler = CommandHandler.Create(Of String)( + Sub(aString As String) + Console.WriteLine("Sub command interactive (Ctrl-C terminate): {aString}") + Prompt.ColorSchema.Answer = ConsoleColor.DarkRed + Prompt.ColorSchema.[Select] = ConsoleColor.DarkCyan + Console.OutputEncoding = Encoding.UTF8 + + Dim name As String = Prompt.Input(Of String)("名前") + Console.WriteLine(String.Format("こんにちは, {0}", name)) + + Dim age As Integer = Prompt.Input(Of Integer)("年齢") + Console.WriteLine(String.Format("年齢: {0}", age)) + + Dim password As String = Prompt.Password("Type new password") + Console.WriteLine("Password OK") + + Dim answer As Boolean = Prompt.Confirm("Are you ready?") + Console.WriteLine(String.Format("Your answer is {0}", answer)) + + Dim value As EnumMonth = Prompt.[Select](Of EnumMonth)("Select enum value") + Console.WriteLine(String.Format("You selected {0}", value)) + + Dim prefectureList As String() = Nothing + Module1.GetPrefectureList(prefectureList) + Dim prefecture As String = Prompt.[Select]("都道府県", prefectureList, pageSize:=5) + Console.WriteLine(String.Format("都道府県: {0}", prefecture)) + + End Sub) + rootCommand.AddCommand(subCommandInteractive) +#End Region + +#Region "subCommandDelay" + ' 非同期前提なので移植できず。 +#End Region + +#End Region + + ' テストの実行 + Module1.Test(rootCommand) + + ' Parse the incoming args and invoke the handler + rootCommand.Invoke(args) + + End Sub + +#Region "Command" +#Region "RootCommand" + ''' RootCommand + ''' int + ''' bool + ''' FileInfo + ''' FileAccess + Private Sub RootCommand(intOption As Integer, boolOption As Boolean, fileOption As FileInfo, fileAccessOption As FileAccess) + + Dim fileOptionName As String = Nothing + If fileOption IsNot Nothing Then + If fileOption.Name IsNot Nothing Then + fileOptionName = fileOption.Name + End If + End If + + Console.WriteLine(String.Format( + "--int-option is: {0}, " + + "--bool-option is: {1}, " + + "--file-option is: {2}, " + + "--file-access-option is: {3}", + intOption, fileOption, fileOptionName, fileAccessOption.ToString())) + End Sub +#End Region +#End Region + +#Region "TEST" + ''' Test + ''' Command + Private Sub Test(rootCommand As Command) + ' デバッグ実行時だけ実行 + If Not Debugger.IsAttached Then + Return + End If + +#Region "rootCommand" + rootCommand.Invoke("") + ' --int-option + rootCommand.Invoke("--int-option") + rootCommand.Invoke("--int-option 123") + rootCommand.Invoke("--int-option hoge") + ' --bool-option + rootCommand.Invoke("--bool-option") + rootCommand.Invoke("--bool-option False") + rootCommand.Invoke("--bool-option True") + rootCommand.Invoke("--bool-option hoge") + ' --file-option + rootCommand.Invoke("--file-option ../Program.cs") + ' --file-access-option + rootCommand.Invoke("--file-access-option Read") + rootCommand.Invoke("--file-access-option Write") + rootCommand.Invoke("--file-access-option hoge") +#End Region + +#Region "subCommand" + ' subCommand1 + rootCommand.Invoke("cmd1 --an-int 123") + ' subCommand2 + rootCommand.Invoke("cmd2 --a-string hoge") + ' subCommandComplex + rootCommand.Invoke("complex --an-int 123 --a-string hogehoge") + ' subCommandInteractive + rootCommand.Invoke("interactive --a-string hoge") + ' subCommandDelay + rootCommand.Invoke("delay --a-string hogehoge") +#End Region + + End Sub +#End Region + +#Region "SELECT" + ''' EnumMonth + Private Enum EnumMonth As Byte + January = 1 + February + March + April + May + June + July + August + September + October + November + December + End Enum + + ''' GetPrefectureList + ''' string[] + Private Sub GetPrefectureList(ByRef prefectureList As String()) + prefectureList = New String() { + "北海道", "青森県", "岩手県", "宮城県", "秋田県", "山形県", + "福島県", "茨城県", "栃木県", "群馬県", "埼玉県", "千葉県", + "東京都", "神奈川県", "新潟県", "富山県", "石川県", "福井県", + "山梨県", "長野県", "岐阜県", "静岡県", "愛知県", "三重県", + "滋賀県", "京都府", "大阪府", "兵庫県", "奈良県", "和歌山県", + "鳥取県", "島根県", "岡山県", "広島県", "山口県", "徳島県", + "香川県", "愛媛県", "高知県", "福岡県", "佐賀県", "長崎県", + "熊本県", "大分県", "宮崎県", "鹿児島県", "沖縄県"} + End Sub +#End Region + + ''' ComplexType + Public Class ComplexType + ' public ComplexType(int anInt, string aString) + ' { + ' AnInt = anInt; + ' AString = aString; + ' } + Public Property AnInt() As Integer + Get + Return m_AnInt + End Get + Set + m_AnInt = Value + End Set + End Property + Private m_AnInt As Integer + Public Property AString() As String + Get + Return m_AString + End Get + Set + m_AString = Value + End Set + End Property + Private m_AString As String + End Class + +End Module diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb new file mode 100644 index 000000000..88dd01c78 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp new file mode 100644 index 000000000..e62f1a533 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + false + false + 0 + true + 0 + 2 + true + diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb new file mode 100644 index 000000000..0703c6780 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports System.Runtime.InteropServices + +' アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +' アセンブリに関連付けられている情報を変更するには、 +' これらの属性値を変更してください。 + +' アセンブリ属性の値を確認します + + + + + + + + + + +'このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります + + +' アセンブリのバージョン情報は次の 4 つの値で構成されています: +' +' メジャー バージョン +' マイナー バージョン +' ビルド番号 +' Revision +' +' すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます +' 既定値にすることができます: +' + + + diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb new file mode 100644 index 000000000..143354cd3 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Simple_CLI.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set(ByVal value As Global.System.Globalization.CultureInfo) + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb new file mode 100644 index 000000000..15eb17f46 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + +#Region "My.Settings Auto-Save Functionality" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.Simple_CLI.My.MySettings + Get + Return Global.Simple_CLI.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings new file mode 100644 index 000000000..85b890b3c --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj new file mode 100644 index 000000000..96e516611 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj @@ -0,0 +1,138 @@ + + + + + Debug + AnyCPU + {816EC424-CAA7-4877-BEED-D71F5715EF26} + Exe + Simple_CLI.Module1 + Simple_CLI + Simple_CLI + 512 + Console + v4.6.1 + true + true + + + AnyCPU + true + full + true + true + bin\Debug\ + Simple_CLI.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + Simple_CLI.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Sharprompt.2.2.1\lib\netstandard2.0\Sharprompt.dll + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.CommandLine.2.0.0-beta1.21216.1\lib\netstandard2.0\System.CommandLine.dll + + + ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + + + + + + + + + + + + + + + + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root_VS2019/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat b/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat index a33ae808e..259dee55f 100644 --- a/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat +++ b/root_VS2022/programs/CS/4_Build_Framework_ToolCore.bat @@ -31,5 +31,13 @@ call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DaoGen_Tool\DaoGen_ToolCore. pause +rem -------------------------------------------------- +rem Batch build of Deploy ZipPack With HTTP. +rem -------------------------------------------------- +call dotnet restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTPCore.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTPCore.sln" + +pause + rem ------------------------------------------------------- endlocal diff --git a/root_VS2022/programs/CS/5_Build_CLICore_sample.bat b/root_VS2022/programs/CS/5_Build_CLICore_sample.bat new file mode 100644 index 000000000..3b725890a --- /dev/null +++ b/root_VS2022/programs/CS/5_Build_CLICore_sample.bat @@ -0,0 +1,43 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\Simple_CLI\Simple_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of DAG_Login_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\DAG_Login_CLI\DAG_Login_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\DAG_Login_CLI\DAG_Login_CLI.sln" + +pause + +rem -------------------------------------------------- +rem Batch build of LIR _Login_CLI. +rem -------------------------------------------------- +dotnet restore "Samples4NetCore\Legacy\CLI_sample\LIR_Login_CLI\LIR_Login_CLI.sln" +dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\CLI_sample\LIR_Login_CLI\LIR_Login_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2022/programs/CS/5_Build_CLI_sample.bat b/root_VS2022/programs/CS/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root_VS2022/programs/CS/5_Build_CLI_sample.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +..\nuget.exe restore "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 75d9fd5df..63866140e 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -1,4 +1,4 @@ - + @@ -27,11 +27,11 @@ - + diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md b/root_VS2022/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..9597c69bf --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md @@ -0,0 +1,4 @@ +DAG : OAuth 2.0 Device Authorization Grant + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md b/root_VS2022/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..f1fb33853 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md @@ -0,0 +1,4 @@ +LIR : Loopback Interface Redirection of OAuth 2.0 for Native Apps + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/README.md b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/README.md @@ -0,0 +1 @@ +System.CommandLine と Sharprompt を使用したCLIのサンプル / テンプレ \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..f247c2e4a --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple_CLI", "Simple_CLI\Simple_CLI.csproj", "{2F7D1A24-3882-4425-AC49-1E623D19C549}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F7D1A24-3882-4425-AC49-1E623D19C549}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {13A2C6FB-ED4C-48AA-AC89-679921A6D7B2} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config new file mode 100644 index 000000000..9a6820f73 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs new file mode 100644 index 000000000..bcd9704c4 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs @@ -0,0 +1,337 @@ +//********************************************************************************** +//* 単純CLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：単純CLIサンプル アプリ +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Diagnostics; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; + +namespace Simple_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region subCommandComplex + Command subCommandComplex = new Command(name: "complex", description: "Sub command complex") + { + new Option("--an-int"), + new Option("--a-string") + }; + subCommandComplex.Handler = CommandHandler.Create((ComplexType complexType) => + { + Console.WriteLine($"Sub command complex: {JsonConvert.SerializeObject(complexType)}"); + }); + rootCommand.AddCommand(subCommandComplex); + #endregion + + #region subCommandInteractive + Command subCommandInteractive = new Command(name: "interactive", description: "Sub command interactive"); + subCommandInteractive.AddOption(new Option(alias: "--a-string")); + subCommandInteractive.Handler = CommandHandler.Create((string aString) => + { + Console.WriteLine($"Sub command interactive (Ctrl-C terminate): {aString}"); + + Prompt.ColorSchema.Answer = ConsoleColor.DarkRed; + Prompt.ColorSchema.Select = ConsoleColor.DarkCyan; + Console.OutputEncoding = Encoding.UTF8; + + string name = Prompt.Input("名前", validators: new[] { Validators.Required() }); + Console.WriteLine($"こんにちは, {name}"); + + int age = Prompt.Input("年齢"); + Console.WriteLine($"年齢: {age}"); + + string password = Prompt.Password("Type new password"); + Console.WriteLine("Password OK"); + + bool answer = Prompt.Confirm("Are you ready?"); + Console.WriteLine($"Your answer is {answer}"); + + EnumMonth value = Prompt.Select("Select enum value"); + Console.WriteLine($"You selected {value}"); + + Program.GetPrefectureList(out string[] prefectureList); + string prefecture = Prompt.Select("都道府県", prefectureList, pageSize: 5); + Console.WriteLine($"都道府県: {prefecture}"); + }); + rootCommand.AddCommand(subCommandInteractive); + #endregion + + #region subCommandDelay + Command subCommandDelay = new Command(name: "delay", description: "Sub command delay"); + subCommandDelay.AddOption(new Option(alias: "--a-string")); + subCommandDelay.Handler = CommandHandler.Create( + async (string aString, IConsole console, CancellationToken token) => + { + Console.WriteLine($"Sub command delay (Ctrl-C terminate): {aString}"); + + try + { + for (int i = 0; i < 10; i++) + { + Console.WriteLine($"Sub command delay: {i}"); + + await Task.Delay(1000, token); + } + + // 例えば... + //using (var httpClient = new HttpClient()) + //{ + // await httpClient.GetAsync("http://www.example.com", token); + //} + + Console.WriteLine("Sub command delay was completed."); + return 0; + } + catch (OperationCanceledException) + { + // ココのコードは.NET Fx系だとハングする。 + // .NET Core系だとハングしない。 + Console.WriteLine("Sub command delay was aborted."); + return 1; + } + } + ); + rootCommand.AddCommand(subCommandDelay); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandComplex + await rootCommand.InvokeAsync("complex --an-int 123 --a-string hogehoge"); + // subCommandInteractive + await rootCommand.InvokeAsync("interactive --a-string hoge"); + // subCommandDelay + await rootCommand.InvokeAsync("delay --a-string hogehoge"); + #endregion + } + #endregion + + #region SELECT + + /// EnumMonth + private enum EnumMonth : byte + { + January = 1, February, March, April, + May, June, July, August, + September, October, November, December + } + + /// GetPrefectureList + /// string[] + private static void GetPrefectureList(out string[] prefectureList) + { + prefectureList = new[] + { + "北海道", + "青森県", + "岩手県", + "宮城県", + "秋田県", + "山形県", + "福島県", + "茨城県", + "栃木県", + "群馬県", + "埼玉県", + "千葉県", + "東京都", + "神奈川県", + "新潟県", + "富山県", + "石川県", + "福井県", + "山梨県", + "長野県", + "岐阜県", + "静岡県", + "愛知県", + "三重県", + "滋賀県", + "京都府", + "大阪府", + "兵庫県", + "奈良県", + "和歌山県", + "鳥取県", + "島根県", + "岡山県", + "広島県", + "山口県", + "徳島県", + "香川県", + "愛媛県", + "高知県", + "福岡県", + "佐賀県", + "長崎県", + "熊本県", + "大分県", + "宮崎県", + "鹿児島県", + "沖縄県" + }; + } + #endregion + } + + /// ComplexType + public class ComplexType + { + // public ComplexType(int anInt, string aString) + // { + // AnInt = anInt; + // AString = aString; + // } + public int AnInt { get; set; } + public string AString { get; set; } + } +} diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..69118115c --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +// 制御されます。アセンブリに関連付けられている情報を変更するには、 +// これらの属性値を変更します。 +[assembly: AssemblyTitle("Simple_CLI")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Simple_CLI")] +[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントから +// 参照できなくなります。COM からこのアセンブリ内の型にアクセスする必要がある場合は、 +// その型の ComVisible 属性を true に設定します。 +[assembly: ComVisible(false)] + +// このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります +[assembly: Guid("2f7d1a24-3882-4425-ac49-1e623d19c549")] + +// アセンブリのバージョン情報は次の 4 つの値で構成されています: +// +// メジャー バージョン +// マイナー バージョン +// ビルド番号 +// リビジョン +// +// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます +// 既定値にすることができます: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj new file mode 100644 index 000000000..e56f1e9b6 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj @@ -0,0 +1,80 @@ + + + + + Debug + AnyCPU + {2F7D1A24-3882-4425-AC49-1E623D19C549} + Exe + Simple_CLI + Simple_CLI + v4.6.1 + 512 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Sharprompt.2.2.1\lib\netstandard2.0\Sharprompt.dll + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.CommandLine.2.0.0-beta1.21216.1\lib\netstandard2.0\System.CommandLine.dll + + + ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root_VS2022/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs index b2c06e646..456e066f9 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs index 4a4c8db84..878cccf14 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample2.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs index 270d3df17..aa2d9d169 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs @@ -21,8 +21,10 @@ using RerunnableBatch_sample3.Common; using System; +using System.IO; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +48,9 @@ class Program static void Main(string[] args) { // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs index 5ef0d898b..afe9a190d 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs @@ -23,6 +23,7 @@ using System; using System.IO; using System.Collections.Generic; +using System.Reflection; using Touryo.Infrastructure.Business.Util; using Touryo.Infrastructure.Public.Db; @@ -46,7 +47,9 @@ static void Main(string[] args) //////////////////////////////////////////////////////////////////////// // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); // コマンドラインをバラす関数がある。 List valsLst = null; diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln new file mode 100644 index 000000000..3598a767f --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DAG_Login_CLI", "DAG_Login_CLI\DAG_Login_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB325D9D-3010-4CAD-AB0D-9079A9471EF5} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj new file mode 100644 index 000000000..47f72bd5d --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj @@ -0,0 +1,44 @@ + + + + Exe + net6.0 + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll + + + + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs new file mode 100644 index 000000000..1a098d5ba --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs @@ -0,0 +1,290 @@ +//********************************************************************************** +//* DAGログインCLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：DAGログインCLIサンプル アプリ +//* DAG : OAuth 2.0 Device Authorization Grant +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Reflection; +using System.Diagnostics; +using System.Net.Http; + +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Util; +using Touryo.Infrastructure.Public.FastReflection; +using Touryo.Infrastructure.Framework.Authentication; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace DAG_Login_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + // 初期化 + // configの初期化 + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); + // デバイスフロー用 + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region LoginCommand + Command LoginCommand = new Command(name: "login", description: "Sub command login"); + LoginCommand.AddOption(new Option(alias: "--a-string")); + LoginCommand.Handler = CommandHandler.Create(Program.LoginCommand); + rootCommand.AddCommand(LoginCommand); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + + #region LoginCommand + /// LoginCommand + /// aString + private static async Task LoginCommand(string aString) + { + Console.WriteLine($"Sub command login: {aString}"); + + // リクエスト + + // URL + string rootAuthZUri = GetConfigParameter.GetConfigValue("RootAuthZUri"); + string oAuth2TokenEndpoint = GetConfigParameter.GetConfigValue("OAuth2TokenEndpoint"); + string oAuth2UselInfoEndpoint = GetConfigParameter.GetConfigValue("OAuth2UselInfoEndpoint"); + string deviceAuthZAuthorizeEndpoint = GetConfigParameter.GetConfigValue("DeviceAuthZAuthorizeEndpoint"); + + // パラメタ + string client_id = GetConfigParameter.GetConfigValue("ClientId"); + string device_code = ""; + string userCode = ""; + + // URI + Uri tokenEndpointUri = new Uri(rootAuthZUri + oAuth2TokenEndpoint); + Uri uselInfoEndpointUri = new Uri(rootAuthZUri + oAuth2UselInfoEndpoint); + Uri deviceAuthZAuthorizeEndpointUri = new Uri(rootAuthZUri + deviceAuthZAuthorizeEndpoint); + + // DeviceAuthZRequestAsync + // リクエスト + string responseString = await OAuth2AndOIDCClient + .DeviceAuthZRequestAsync(deviceAuthZAuthorizeEndpointUri, client_id); + + // レスポンス + JObject responseJObject = (JObject)JsonConvert.DeserializeObject(responseString); + device_code = (string)responseJObject[OAuth2AndOIDCConst.device_code]; + userCode = (string)responseJObject[OAuth2AndOIDCConst.user_code]; + string verificationUri = rootAuthZUri + (string)responseJObject[OAuth2AndOIDCConst.verification_uri]; + string verificationUriComplete = rootAuthZUri + (string)responseJObject[OAuth2AndOIDCConst.verification_uri_complete]; + + // 結果表示 + //Console.WriteLine("deviceCode: " + deviceCode); + Console.WriteLine("userCode: " + userCode); + Console.WriteLine("verificationUri: " + verificationUri); + Console.WriteLine("verificationUriComplete: " + verificationUriComplete); + + // ポーリング開始 + bool answer = Prompt.Confirm("Are you ready?"); + Console.WriteLine($"Your answer is {answer}"); + + bool continueLoop = true; + ExponentialBackoff exponentialBackoff = new ExponentialBackoff(10, 5); // config化必要？ + + while (continueLoop) + { + Console.WriteLine("... polling ..."); + + // Tokenリクエスト + // GetAccessTokenByDeviceAuthZAsync + string response = await OAuth2AndOIDCClient + .GetAccessTokenByDeviceAuthZAsync(tokenEndpointUri, client_id, device_code); + + JObject temp = (JObject)JsonConvert.DeserializeObject(response); + + if (!temp.ContainsKey(OAuth2AndOIDCConst.error)) + { + // 正常系 + continueLoop = false; + + // UserInfoリクエスト + // GetUserInfoAsync + string userInfo = await OAuth2AndOIDCClient + .GetUserInfoAsync(uselInfoEndpointUri, (string)temp[OAuth2AndOIDCConst.AccessToken]); + + Console.WriteLine("NORMAL_END :"); + Console.WriteLine(userInfo); + } + else + { + // 異常系 + if ((string)temp[OAuth2AndOIDCConst.error] == OAuth2AndOIDCEnum.CibaState.authorization_pending.ToStringByEmit()) + { + // authorization_pending + continueLoop = exponentialBackoff.Sleep(); + } + else + { + // authorization_pending以外 + // 終了 + continueLoop = false; + Console.WriteLine("ABNORMAL_END"); + } + } + } + } + #endregion + + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandLogin + await rootCommand.InvokeAsync("login"); + #endregion + } + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json new file mode 100644 index 000000000..246ca0964 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json @@ -0,0 +1,16 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "RootAuthZUri": "https://localhost:44300/MultiPurposeAuthSite", + "OAuth2TokenEndpoint": "/token", + "OAuth2UselInfoEndpoint": "/userinfo", + "DeviceAuthZAuthorizeEndpoint": "/device_authz", + "ClientId": "ae5a179813234ca290c8de93ef2e31dc" + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..3fdab6ab5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md @@ -0,0 +1 @@ +DAG : OAuth 2.0 Device Authorization Grant \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln new file mode 100644 index 000000000..b858c704f --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LIR_Login_CLI", "LIR_Login_CLI\LIR_Login_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB325D9D-3010-4CAD-AB0D-9079A9471EF5} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj new file mode 100644 index 000000000..151979751 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj @@ -0,0 +1,45 @@ + + + + Exe + net6.0 + + + + + + + + + + + + + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll + + + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll + + + + + + Always + + + Always + + + Always + + + Always + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml new file mode 100644 index 000000000..f2283b409 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs new file mode 100644 index 000000000..8ac3d400a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs @@ -0,0 +1,345 @@ +//********************************************************************************** +//* LIRログインCLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：LIRログインCLIサンプル アプリ +//* LIR：Loopback Interface Redirection of OAuth 2.0 for Native Apps +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Reflection; +using System.Diagnostics; +using System.ComponentModel; +using System.Runtime.InteropServices; +using System.Net; +using System.Net.Http; + +using Touryo.Infrastructure.Public.IO; +using Touryo.Infrastructure.Public.Util; +using Touryo.Infrastructure.Public.FastReflection; +using Touryo.Infrastructure.Public.Security.Pwd; +using Touryo.Infrastructure.Framework.Authentication; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace LIR_Login_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + // 初期化 + string dir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory + .FullName.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); + GetConfigParameter.InitConfiguration(dir + "/appsettings.json"); + // OAuth PKCE用 + OAuth2AndOIDCClient.HttpClient = new HttpClient(); + + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region LoginCommand + Command LoginCommand = new Command(name: "login", description: "Sub command login"); + LoginCommand.AddOption(new Option(alias: "--a-string")); + LoginCommand.Handler = CommandHandler.Create(Program.LoginCommand); + rootCommand.AddCommand(LoginCommand); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + + #region LoginCommand + /// LoginCommand + /// aString + private static async Task LoginCommand(string aString) + { + if (!HttpListener.IsSupported) + { + Console.WriteLine("HttpListener is not supported."); + return; + } + + Console.WriteLine($"Sub command login: {aString}"); + + // リクエスト + + // URL + string rootAuthZUri = GetConfigParameter.GetConfigValue("RootAuthZUri"); + string oAuth2AuthorizeEndpoint = GetConfigParameter.GetConfigValue("OAuth2AuthorizeEndpoint"); + string oAuth2TokenEndpoint = GetConfigParameter.GetConfigValue("OAuth2TokenEndpoint"); + string oAuth2UselInfoEndpoint = GetConfigParameter.GetConfigValue("OAuth2UselInfoEndpoint"); + + // パラメタ + string client_id = GetConfigParameter.GetConfigValue("ClientId"); + string redirect_uri = "http://localhost:12345/"; + string state = GetPassword.Generate(10, 0); + string code_verifier = GetPassword.Base64UrlSecret(50); + string code_challenge = OAuth2AndOIDCClient.PKCE_S256_CodeChallengeMethod(code_verifier); + string target = rootAuthZUri + oAuth2AuthorizeEndpoint + string.Format( + "?client_id={0}&response_type={1}&scope={2}&state={3}&code_challenge={4}&code_challenge_method={5}", + client_id, + OAuth2AndOIDCConst.AuthorizationCodeResponseType, + OAuth2AndOIDCConst.email_verified, + state, code_challenge, + OAuth2AndOIDCConst.PKCE_S256); + + // URI + Uri tokenEndpointUri = new Uri(rootAuthZUri + oAuth2TokenEndpoint); + Uri uselInfoEndpointUri = new Uri(rootAuthZUri + oAuth2UselInfoEndpoint); + //Uri authorizeEndpointUri = new Uri(target); + + #region 認可リクエスト・レスポンス + HttpListener listener = null; + HttpListenerRequest listenerRequest = null; + HttpListenerResponse listenerResponse = null; + Stream output = null; + try + { + #region レスポンスの準備 + // リスナーを起動して受信 + listener = new HttpListener(); + listener.Prefixes.Add(redirect_uri); + listener.Start(); + Console.WriteLine("Listening..."); + #endregion + + #region 認可リクエスト。 + try + { + // ブラウザを起動して送信 + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + //Windowsのとき + target = target.Replace("&", "^&"); + Process.Start( + new ProcessStartInfo("cmd", $"/c start {target}") { CreateNoWindow = true }); + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + // Linuxのとき + Process.Start("xdg-open", target); + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + // Macのとき + Process.Start("open", target); + } + else + { + throw new Exception("Unknown OS platform."); + } + } + catch (Win32Exception noBrowser) + { + + Console.WriteLine(noBrowser.Message); + return; + } + catch (System.Exception other) + { + Console.WriteLine(other.Message); + return; + } + + // 受信と返信 + HttpListenerContext context = listener.GetContext(); + listenerRequest = context.Request; + listenerResponse = context.Response; + + byte[] buffer = System.Text.Encoding.UTF8.GetBytes( + "Accepted the authorization response."); + + // 返信 + listenerResponse.ContentLength64 = buffer.Length; + output = listenerResponse.OutputStream; + output.Write(buffer, 0, buffer.Length); + #endregion + } + finally + { + // 後処理 + output.Close(); + listener.Stop(); + } + #endregion + + string code = listenerRequest.QueryString["code"]; + + // Tokenリクエスト + // GetAccessTokenByDeviceAuthZAsync + string response = await OAuth2AndOIDCClient + .GetAccessTokenByCodeAsync( + tokenEndpointUri, client_id, "", + redirect_uri, code, code_verifier); + + JObject temp = (JObject)JsonConvert.DeserializeObject(response); + + if (!temp.ContainsKey(OAuth2AndOIDCConst.error)) + { + // 正常系 + + // UserInfoリクエスト + // GetUserInfoAsync + string userInfo = await OAuth2AndOIDCClient + .GetUserInfoAsync(uselInfoEndpointUri, (string)temp[OAuth2AndOIDCConst.AccessToken]); + + Console.WriteLine("NORMAL_END :"); + Console.WriteLine(userInfo); + } + else + { + // 異常系 + Console.WriteLine("ABNORMAL_END"); + } + } + #endregion + + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandLogin + await rootCommand.InvokeAsync("login"); + #endregion + } + #endregion + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml new file mode 100644 index 000000000..6baf634bc --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml new file mode 100644 index 000000000..476cea7c5 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json new file mode 100644 index 000000000..8bc58abcf --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json @@ -0,0 +1,17 @@ +{ + "connectionStrings": { + "ConnectionString_SQL": "Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;", + "ConnectionString_ODBC": "Dsn=odbc_test1", + "ConnectionString_ODP": "User Id=SCOTT;Password=tiger;Data Source=localhost/XE;", + "ConnectionString_MCN": "Server=localhost;Database=test;User Id=root;Password=seigi@123", + "ConnectionString_NPS": "HOST=localhost;DATABASE=postgres;USER ID=postgres;PASSWORD=seigi@123;" + }, + "appSettings": { + "RootAuthZUri": "https://localhost:44300/MultiPurposeAuthSite", + "OAuth2AuthorizeEndpoint": "/authorize", + "OAuth2TokenEndpoint": "/token", + "OAuth2UselInfoEndpoint": "/userinfo", + "DeviceAuthZAuthorizeEndpoint": "/device_authz", + "ClientId": "ae5a179813234ca290c8de93ef2e31dc" + } +} \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..92cb873e9 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md @@ -0,0 +1 @@ +LIR : Loopback Interface Redirection of OAuth 2.0 for Native Apps \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md @@ -0,0 +1 @@ +System.CommandLine と Sharprompt を使用したCLIのサンプル / テンプレ \ No newline at end of file diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..49bad92fe --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple_CLI", "Simple_CLI\Simple_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB325D9D-3010-4CAD-AB0D-9079A9471EF5} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs new file mode 100644 index 000000000..077896f3f --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs @@ -0,0 +1,337 @@ +//********************************************************************************** +//* 単純CLIサンプル アプリ +//********************************************************************************** + +// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：単純CLIサンプル アプリ +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +//********************************************************************************** + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using System.IO; +using System.Threading; +using System.Diagnostics; + +using System.CommandLine; +using System.CommandLine.Invocation; + +using Sharprompt; + +using Newtonsoft; +using Newtonsoft.Json; + +namespace Simple_CLI +{ + /// Program + public class Program + { + /// + /// 'async main' は C# 7.1 以上の言語バージョンが必要（→ VS 2019）。 + /// + /// string[] + /// int + static async Task Main(string[] args) + { + #region rootCommand + // Create a root command with some options + Command rootCommand = new RootCommand + { + // alias、default value、description + new Option( + alias: "--int-option", + getDefaultValue: () => 42, + description: "An option whose argument is parsed as an int"), + new Option( + alias: "--bool-option", + description: "An option whose argument is parsed as a bool"), + new Option( + alias: "--file-option", + description: "An option whose argument is parsed as a FileInfo"), + new Option( + alias: "--file-access-option", + getDefaultValue: () => FileAccess.Read, + description: "An option whose argument is parsed as a FileAccess") + }; + + rootCommand.Description = "My sample app"; + + // Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Program.RootCommand); + #endregion + + #region subCommand + + #region subCommand1 + Command subCommand1 = new Command(name: "cmd1", description: "Sub command cmd1"); + subCommand1.AddOption(new Option(alias: "--an-int")); + subCommand1.Handler = CommandHandler.Create( + (int anInt) => + { + Console.WriteLine($"Sub command cmd1: {anInt}"); + } + ); + rootCommand.AddCommand(subCommand1); + #endregion + + #region subCommand2 + Command subCommand2 = new Command(name: "cmd2", description: "Sub command cmd2"); + subCommand2.AddOption(new Option(alias: "--a-string")); + subCommand2.Handler = CommandHandler.Create( + (string aString) => + { + Console.WriteLine($"Sub command cmd2: {aString}"); + } + ); + rootCommand.AddCommand(subCommand2); + #endregion + + #region subCommandComplex + Command subCommandComplex = new Command(name: "complex", description: "Sub command complex") + { + new Option("--an-int"), + new Option("--a-string") + }; + subCommandComplex.Handler = CommandHandler.Create((ComplexType complexType) => + { + Console.WriteLine($"Sub command complex: {JsonConvert.SerializeObject(complexType)}"); + }); + rootCommand.AddCommand(subCommandComplex); + #endregion + + #region subCommandInteractive + Command subCommandInteractive = new Command(name: "interactive", description: "Sub command interactive"); + subCommandInteractive.AddOption(new Option(alias: "--a-string")); + subCommandInteractive.Handler = CommandHandler.Create((string aString) => + { + Console.WriteLine($"Sub command interactive (Ctrl-C terminate): {aString}"); + + Prompt.ColorSchema.Answer = ConsoleColor.DarkRed; + Prompt.ColorSchema.Select = ConsoleColor.DarkCyan; + Console.OutputEncoding = Encoding.UTF8; + + string name = Prompt.Input("名前", validators: new[] { Validators.Required() }); + Console.WriteLine($"こんにちは, {name}"); + + int age = Prompt.Input("年齢"); + Console.WriteLine($"年齢: {age}"); + + string password = Prompt.Password("Type new password"); + Console.WriteLine("Password OK"); + + bool answer = Prompt.Confirm("Are you ready?"); + Console.WriteLine($"Your answer is {answer}"); + + EnumMonth value = Prompt.Select("Select enum value"); + Console.WriteLine($"You selected {value}"); + + Program.GetPrefectureList(out string[] prefectureList); + string prefecture = Prompt.Select("都道府県", prefectureList, pageSize: 5); + Console.WriteLine($"都道府県: {prefecture}"); + }); + rootCommand.AddCommand(subCommandInteractive); + #endregion + + #region subCommandDelay + Command subCommandDelay = new Command(name: "delay", description: "Sub command delay"); + subCommandDelay.AddOption(new Option(alias: "--a-string")); + subCommandDelay.Handler = CommandHandler.Create( + async (string aString, IConsole console, CancellationToken token) => + { + Console.WriteLine($"Sub command delay(Ctrl-C terminate): {aString}"); + + try + { + for (int i = 0; i < 10; i++) + { + Console.WriteLine($"Sub command delay: {i}"); + + await Task.Delay(1000, token); + } + + // 例えば... + //using (var httpClient = new HttpClient()) + //{ + // await httpClient.GetAsync("http://www.example.com", token); + //} + + Console.WriteLine("Sub command delay was completed."); + return 0; + } + catch (OperationCanceledException) + { + // ココのコードは.NET Fx系だとハングする。 + // .NET Core系だとハングしない。 + Console.WriteLine("Sub command delay was aborted."); + return 1; + } + } + ); + rootCommand.AddCommand(subCommandDelay); + #endregion + + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + #region RootCommand + /// RootCommand + /// int + /// bool + /// FileInfo + /// FileAccess + private static void RootCommand( + int intOption, bool boolOption, FileInfo fileOption, FileAccess fileAccessOption) + { + Console.WriteLine( + $"--int-option is: {intOption}, " + + $"--bool-option is: {boolOption}, " + + $"--file-option is: {fileOption?.Name ?? "null"}, " + + $"--file-access-option is: {fileAccessOption.ToString()}"); + } + #endregion + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + #region rootCommand + await rootCommand.InvokeAsync(""); + // --int-option + await rootCommand.InvokeAsync("--int-option"); + await rootCommand.InvokeAsync("--int-option 123"); + await rootCommand.InvokeAsync("--int-option hoge"); + // --bool-option + await rootCommand.InvokeAsync("--bool-option"); + await rootCommand.InvokeAsync("--bool-option False"); + await rootCommand.InvokeAsync("--bool-option True"); + await rootCommand.InvokeAsync("--bool-option hoge"); + // --file-option + await rootCommand.InvokeAsync("--file-option ../Program.cs"); + // --file-access-option + await rootCommand.InvokeAsync("--file-access-option Read"); + await rootCommand.InvokeAsync("--file-access-option Write"); + await rootCommand.InvokeAsync("--file-access-option hoge"); + #endregion + + #region subCommand + // subCommand1 + await rootCommand.InvokeAsync("cmd1 --an-int 123"); + // subCommand2 + await rootCommand.InvokeAsync("cmd2 --a-string hoge"); + // subCommandComplex + await rootCommand.InvokeAsync("complex --an-int 123 --a-string hogehoge"); + // subCommandInteractive + await rootCommand.InvokeAsync("interactive --a-string hoge"); + // subCommandDelay + await rootCommand.InvokeAsync("delay --a-string hogehoge"); + #endregion + } + #endregion + + #region SELECT + + /// EnumMonth + private enum EnumMonth : byte + { + January = 1, February, March, April, + May, June, July, August, + September, October, November, December + } + + /// GetPrefectureList + /// string[] + private static void GetPrefectureList(out string[] prefectureList) + { + prefectureList = new[] + { + "北海道", + "青森県", + "岩手県", + "宮城県", + "秋田県", + "山形県", + "福島県", + "茨城県", + "栃木県", + "群馬県", + "埼玉県", + "千葉県", + "東京都", + "神奈川県", + "新潟県", + "富山県", + "石川県", + "福井県", + "山梨県", + "長野県", + "岐阜県", + "静岡県", + "愛知県", + "三重県", + "滋賀県", + "京都府", + "大阪府", + "兵庫県", + "奈良県", + "和歌山県", + "鳥取県", + "島根県", + "岡山県", + "広島県", + "山口県", + "徳島県", + "香川県", + "愛媛県", + "高知県", + "福岡県", + "佐賀県", + "長崎県", + "熊本県", + "大分県", + "宮崎県", + "鹿児島県", + "沖縄県" + }; + } + #endregion + } + + /// ComplexType + public class ComplexType + { + // public ComplexType(int anInt, string aString) + // { + // AnInt = anInt; + // AString = aString; + // } + public int AnInt { get; set; } + public string AString { get; set; } + } +} diff --git a/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj new file mode 100644 index 000000000..e90362af0 --- /dev/null +++ b/root_VS2022/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj @@ -0,0 +1,14 @@ + + + + Exe + net6.0 + + + + + + + + + diff --git a/root_VS2022/programs/VB/5_Build_CLI_sample.bat b/root_VS2022/programs/VB/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root_VS2022/programs/VB/5_Build_CLI_sample.bat @@ -0,0 +1,27 @@ +setlocal + +@rem -------------------------------------------------- +@rem Turn off the echo function. +@rem -------------------------------------------------- +@echo off + +@rem -------------------------------------------------- +@rem Get the path to the executable file. +@rem -------------------------------------------------- +set CURRENT_DIR="%~dp0" + +@rem -------------------------------------------------- +@rem Execution of the common processing. +@rem -------------------------------------------------- +call %CURRENT_DIR%z_Common.bat + +rem -------------------------------------------------- +rem Batch build of Simple_CLI. +rem -------------------------------------------------- +..\nuget.exe restore "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" +%BUILDFILEPATH% %COMMANDLINE% "Samples\CLI_sample\Simple_CLI\Simple_CLI.sln" + +pause + +rem ------------------------------------------------------- +endlocal diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md b/root_VS2022/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..9597c69bf --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md @@ -0,0 +1,4 @@ +DAG : OAuth 2.0 Device Authorization Grant + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md b/root_VS2022/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..f1fb33853 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md @@ -0,0 +1,4 @@ +LIR : Loopback Interface Redirection of OAuth 2.0 for Native Apps + +System.CommandLineのbetaが解除され、Ctrl-Cで +CancellationTokenがハングする問題が修正されたら.NET5版から移植する。 \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/README.md b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/README.md @@ -0,0 +1 @@ +System.CommandLine と Sharprompt を使用したCLIのサンプル / テンプレ \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..6ab9deef1 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Simple_CLI", "Simple_CLI\Simple_CLI.vbproj", "{816EC424-CAA7-4877-BEED-D71F5715EF26}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {816EC424-CAA7-4877-BEED-D71F5715EF26}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {51A58542-DF10-4EE0-82DD-152DD07363E2} + EndGlobalSection +EndGlobal diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config new file mode 100644 index 000000000..9a6820f73 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb new file mode 100644 index 000000000..a1f1bf2a7 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb @@ -0,0 +1,272 @@ + +' テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 + +'********************************************************************************** +'* クラス名 ：Program +'* クラス日本語名 ：単純CLIサンプル アプリ +'* +'* 作成日時 ：－ +'* 作成者 ：開発基盤部会 +'* 更新履歴 ： +'* +'* 日時 更新者 内容 +'* ---------- ---------------- ------------------------------------------------- +'* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ +'********************************************************************************** + +Imports System +Imports System.Collections.Generic +Imports System.Linq +Imports System.Text +Imports System.Threading.Tasks + +Imports System.IO +Imports System.Threading +Imports System.Diagnostics + +Imports System.CommandLine +Imports System.CommandLine.Invocation + +Imports Sharprompt + +Imports Newtonsoft +Imports Newtonsoft.Json +Module Module1 + + ''' + ''' VBで非同期化できる？ + ''' Function Main(args As String()) As Task(Of Integer) + ''' + ''' string[] + Sub Main(args As String()) + +#Region "rootCommand" + ' Create a root command with some options + ' alias、default value、description + Dim rootCommand As Command = New RootCommand() From { + New [Option](Of Integer)([alias]:="--int-option", getDefaultValue:=Function() 42, description:="An option whose argument is parsed as an int"), + New [Option](Of Boolean)([alias]:="--bool-option", description:="An option whose argument is parsed as a bool"), + New [Option](Of FileInfo)([alias]:="--file-option", description:="An option whose argument is parsed as a FileInfo"), + New [Option](Of FileAccess)([alias]:="--file-access-option", getDefaultValue:=Function() FileAccess.Read, description:="An option whose argument is parsed as a FileAccess") + } + + rootCommand.Description = "My sample app" + + ' Note that the parameters of the handler method are matched according to the names of the options + rootCommand.Handler = CommandHandler.Create(Of Integer, Boolean, FileInfo, FileAccess)(AddressOf Module1.RootCommand) +#End Region + +#Region "subCommand" + +#Region "subCommand1" + Dim subCommand1 As New Command(name:="cmd1", description:="Sub command cmd1") + subCommand1.AddOption(New [Option](Of Integer)([alias]:="--an-int")) + subCommand1.Handler = CommandHandler.Create(Of Integer)( + Sub(anInt As Integer) + Console.WriteLine("Sub command cmd1: {anInt}") + End Sub) + rootCommand.AddCommand(subCommand1) +#End Region + +#Region "subCommand2" + Dim subCommand2 As New Command(name:="cmd2", description:="Sub command cmd2") + subCommand2.AddOption(New [Option](Of String)([alias]:="--a-string")) + subCommand2.Handler = CommandHandler.Create(Of String)( + Sub(aString As String) + Console.WriteLine("Sub command cmd2: {aString}") + End Sub) + rootCommand.AddCommand(subCommand2) +#End Region + +#Region "subCommandComplex" + Dim subCommandComplex As New Command(name:="complex", description:="Sub command complex") From + { + New [Option](Of Integer)("--an-int"), + New [Option](Of String)("--a-string") + } + + subCommandComplex.Handler = CommandHandler.Create( + Sub(complexType As ComplexType) + Console.WriteLine("Sub command complex: {JsonConvert.SerializeObject(complexType)}") + End Sub) + rootCommand.AddCommand(subCommandComplex) +#End Region + +#Region "subCommandInteractive" + Dim subCommandInteractive As New Command(name:="interactive", description:="Sub command interactive") + subCommandInteractive.AddOption(New [Option](Of String)([alias]:="--a-string")) + subCommandInteractive.Handler = CommandHandler.Create(Of String)( + Sub(aString As String) + Console.WriteLine("Sub command interactive (Ctrl-C terminate): {aString}") + Prompt.ColorSchema.Answer = ConsoleColor.DarkRed + Prompt.ColorSchema.[Select] = ConsoleColor.DarkCyan + Console.OutputEncoding = Encoding.UTF8 + + Dim name As String = Prompt.Input(Of String)("名前") + Console.WriteLine(String.Format("こんにちは, {0}", name)) + + Dim age As Integer = Prompt.Input(Of Integer)("年齢") + Console.WriteLine(String.Format("年齢: {0}", age)) + + Dim password As String = Prompt.Password("Type new password") + Console.WriteLine("Password OK") + + Dim answer As Boolean = Prompt.Confirm("Are you ready?") + Console.WriteLine(String.Format("Your answer is {0}", answer)) + + Dim value As EnumMonth = Prompt.[Select](Of EnumMonth)("Select enum value") + Console.WriteLine(String.Format("You selected {0}", value)) + + Dim prefectureList As String() = Nothing + Module1.GetPrefectureList(prefectureList) + Dim prefecture As String = Prompt.[Select]("都道府県", prefectureList, pageSize:=5) + Console.WriteLine(String.Format("都道府県: {0}", prefecture)) + + End Sub) + rootCommand.AddCommand(subCommandInteractive) +#End Region + +#Region "subCommandDelay" + ' 非同期前提なので移植できず。 +#End Region + +#End Region + + ' テストの実行 + Module1.Test(rootCommand) + + ' Parse the incoming args and invoke the handler + rootCommand.Invoke(args) + + End Sub + +#Region "Command" +#Region "RootCommand" + ''' RootCommand + ''' int + ''' bool + ''' FileInfo + ''' FileAccess + Private Sub RootCommand(intOption As Integer, boolOption As Boolean, fileOption As FileInfo, fileAccessOption As FileAccess) + + Dim fileOptionName As String = Nothing + If fileOption IsNot Nothing Then + If fileOption.Name IsNot Nothing Then + fileOptionName = fileOption.Name + End If + End If + + Console.WriteLine(String.Format( + "--int-option is: {0}, " + + "--bool-option is: {1}, " + + "--file-option is: {2}, " + + "--file-access-option is: {3}", + intOption, fileOption, fileOptionName, fileAccessOption.ToString())) + End Sub +#End Region +#End Region + +#Region "TEST" + ''' Test + ''' Command + Private Sub Test(rootCommand As Command) + ' デバッグ実行時だけ実行 + If Not Debugger.IsAttached Then + Return + End If + +#Region "rootCommand" + rootCommand.Invoke("") + ' --int-option + rootCommand.Invoke("--int-option") + rootCommand.Invoke("--int-option 123") + rootCommand.Invoke("--int-option hoge") + ' --bool-option + rootCommand.Invoke("--bool-option") + rootCommand.Invoke("--bool-option False") + rootCommand.Invoke("--bool-option True") + rootCommand.Invoke("--bool-option hoge") + ' --file-option + rootCommand.Invoke("--file-option ../Program.cs") + ' --file-access-option + rootCommand.Invoke("--file-access-option Read") + rootCommand.Invoke("--file-access-option Write") + rootCommand.Invoke("--file-access-option hoge") +#End Region + +#Region "subCommand" + ' subCommand1 + rootCommand.Invoke("cmd1 --an-int 123") + ' subCommand2 + rootCommand.Invoke("cmd2 --a-string hoge") + ' subCommandComplex + rootCommand.Invoke("complex --an-int 123 --a-string hogehoge") + ' subCommandInteractive + rootCommand.Invoke("interactive --a-string hoge") + ' subCommandDelay + rootCommand.Invoke("delay --a-string hogehoge") +#End Region + + End Sub +#End Region + +#Region "SELECT" + ''' EnumMonth + Private Enum EnumMonth As Byte + January = 1 + February + March + April + May + June + July + August + September + October + November + December + End Enum + + ''' GetPrefectureList + ''' string[] + Private Sub GetPrefectureList(ByRef prefectureList As String()) + prefectureList = New String() { + "北海道", "青森県", "岩手県", "宮城県", "秋田県", "山形県", + "福島県", "茨城県", "栃木県", "群馬県", "埼玉県", "千葉県", + "東京都", "神奈川県", "新潟県", "富山県", "石川県", "福井県", + "山梨県", "長野県", "岐阜県", "静岡県", "愛知県", "三重県", + "滋賀県", "京都府", "大阪府", "兵庫県", "奈良県", "和歌山県", + "鳥取県", "島根県", "岡山県", "広島県", "山口県", "徳島県", + "香川県", "愛媛県", "高知県", "福岡県", "佐賀県", "長崎県", + "熊本県", "大分県", "宮崎県", "鹿児島県", "沖縄県"} + End Sub +#End Region + + ''' ComplexType + Public Class ComplexType + ' public ComplexType(int anInt, string aString) + ' { + ' AnInt = anInt; + ' AString = aString; + ' } + Public Property AnInt() As Integer + Get + Return m_AnInt + End Get + Set + m_AnInt = Value + End Set + End Property + Private m_AnInt As Integer + Public Property AString() As String + Get + Return m_AString + End Get + Set + m_AString = Value + End Set + End Property + Private m_AString As String + End Class + +End Module diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb new file mode 100644 index 000000000..88dd01c78 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp new file mode 100644 index 000000000..e62f1a533 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + false + false + 0 + true + 0 + 2 + true + diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb new file mode 100644 index 000000000..0703c6780 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports System.Runtime.InteropServices + +' アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +' アセンブリに関連付けられている情報を変更するには、 +' これらの属性値を変更してください。 + +' アセンブリ属性の値を確認します + + + + + + + + + + +'このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります + + +' アセンブリのバージョン情報は次の 4 つの値で構成されています: +' +' メジャー バージョン +' マイナー バージョン +' ビルド番号 +' Revision +' +' すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます +' 既定値にすることができます: +' + + + diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb new file mode 100644 index 000000000..143354cd3 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Simple_CLI.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set(ByVal value As Global.System.Globalization.CultureInfo) + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb new file mode 100644 index 000000000..15eb17f46 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + +#Region "My.Settings Auto-Save Functionality" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.Simple_CLI.My.MySettings + Get + Return Global.Simple_CLI.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings new file mode 100644 index 000000000..85b890b3c --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj new file mode 100644 index 000000000..96e516611 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj @@ -0,0 +1,138 @@ + + + + + Debug + AnyCPU + {816EC424-CAA7-4877-BEED-D71F5715EF26} + Exe + Simple_CLI.Module1 + Simple_CLI + Simple_CLI + 512 + Console + v4.6.1 + true + true + + + AnyCPU + true + full + true + true + bin\Debug\ + Simple_CLI.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + Simple_CLI.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Sharprompt.2.2.1\lib\netstandard2.0\Sharprompt.dll + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.CommandLine.2.0.0-beta1.21216.1\lib\netstandard2.0\System.CommandLine.dll + + + ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + + + + + + + + + + + + + + + + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root_VS2022/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file From 4543b2edb5f0e071e9f339b38a0c5e58d61c0e03 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Mon, 4 Apr 2022 16:01:58 +0900 Subject: [PATCH 27/34] fixed #108 --- .../Backend/MVC_Sample/MVC_Sample.sln | 4 ++-- .../MVC_Sample/MVC_Sample/MVC_Sample.csproj | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln index e390def6b..bf85358c0 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29209.62 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{A50D383C-5135-445D-924C-E3B851F13CBE}" EndProject diff --git a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj index b8fe67a73..6f0d3fef3 100644 --- a/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj +++ b/root_VS2022/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true @@ -17,22 +17,22 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll From 627910d9ee71493d3c1c1f7bbc6d87ceb22eb6fd Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Mon, 4 Apr 2022 17:08:24 +0900 Subject: [PATCH 28/34] fixed #107 --- .../Infrastructure/Business/Business_net47.csproj | 10 +++++----- .../Business/Business_netcore20.csproj | 10 +++++----- .../RichClient/Business.RichClient_net47.csproj | 6 +++--- .../Business/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/packages.config | 10 +++++----- .../RichClient/CustomControl.RichClient_net47.csproj | 6 +++--- .../CustomControl/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/Business_net47.vbproj | 12 ++++++------ .../RichClient/Business.RichClient_net47.vbproj | 6 +++--- .../Business/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/packages.config | 12 ++++++------ .../RichClient/CustomControl.RichClient_net47.vbproj | 6 +++--- .../CustomControl/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/Business_net48.csproj | 12 ++++++------ .../Business/Business_netcore50.csproj | 10 +++++----- .../RichClient/Business.RichClient_net48.csproj | 6 +++--- .../RichClient/Business.RichClient_netcore50.csproj | 2 +- .../Business/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/packages.config | 12 ++++++------ .../CustomControl/CustomControl_net48.csproj | 2 +- .../RichClient/CustomControl.RichClient_net48.csproj | 6 +++--- .../CustomControl.RichClient_netcore50.csproj | 2 +- .../CustomControl/RichClient/packages.config | 6 +++--- .../Infrastructure/CustomControl/packages.config | 2 +- .../Infrastructure/Business/Business_net48.vbproj | 12 ++++++------ .../RichClient/Business.RichClient_net48.vbproj | 6 +++--- .../Business/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/packages.config | 12 ++++++------ .../CustomControl/CustomControl_net48.vbproj | 2 +- .../RichClient/CustomControl.RichClient_net48.vbproj | 6 +++--- .../CustomControl/RichClient/packages.config | 6 +++--- .../Infrastructure/CustomControl/packages.config | 2 +- .../Infrastructure/Business/Business_net48.csproj | 12 ++++++------ .../Business/Business_netcore60.csproj | 10 +++++----- .../RichClient/Business.RichClient_net48.csproj | 6 +++--- .../RichClient/Business.RichClient_netcore60.csproj | 2 +- .../Business/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/packages.config | 12 ++++++------ .../CustomControl/CustomControl_net48.csproj | 2 +- .../RichClient/CustomControl.RichClient_net48.csproj | 6 +++--- .../CustomControl.RichClient_netcore60.csproj | 2 +- .../CustomControl/RichClient/packages.config | 6 +++--- .../Infrastructure/CustomControl/packages.config | 2 +- .../Infrastructure/Business/Business_net48.vbproj | 12 ++++++------ .../RichClient/Business.RichClient_net48.vbproj | 6 +++--- .../Business/RichClient/packages.config | 6 +++--- .../Infrastructure/Business/packages.config | 12 ++++++------ .../CustomControl/CustomControl_net48.vbproj | 2 +- .../RichClient/CustomControl.RichClient_net48.vbproj | 6 +++--- .../CustomControl/RichClient/packages.config | 6 +++--- .../Infrastructure/CustomControl/packages.config | 2 +- 51 files changed, 169 insertions(+), 169 deletions(-) diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj index a217e017f..6e52dbe85 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_net47.csproj @@ -102,23 +102,23 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net47\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0\lib\net47\OpenTouryo.DamManagedOdp.dll True - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net47\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0\lib\net47\OpenTouryo.DamMySQL.dll True - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net47\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0\lib\net47\OpenTouryo.DamPstGrS.dll True - ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net47\OpenTouryo.Framework.dll True - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net47\OpenTouryo.Public.dll True diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj index 476414d33..a90dc137d 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/Business_netcore20.csproj @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj index b1ae794e7..51e320327 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.csproj @@ -76,13 +76,13 @@ ..\..\Build_net47\OpenTouryo.DamPstGrS.dll - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net47\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net47\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net47\OpenTouryo.Public.dll 3.0 diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index cdc28b5cb..8be44d96d 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config index e8618401b..74fec9756 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj index 32036155d..2b0b653af 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.csproj @@ -64,13 +64,13 @@ - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net47\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net47\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net47\OpenTouryo.Public.dll diff --git a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index cdc28b5cb..8be44d96d 100644 --- a/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2017/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj index c9b83c0e2..d640cc935 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/Business_net47.vbproj @@ -92,22 +92,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net47\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0\lib\net47\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net47\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0\lib\net47\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net47\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0\lib\net47\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net47\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net47\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net47\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0\lib\net47\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj index cbec58253..f1936099d 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net47.vbproj @@ -72,13 +72,13 @@ ..\..\Build_net47\OpenTouryo.DamPstGrS.dll - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net47\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net47\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net47\OpenTouryo.Public.dll ..\..\Build_net47\Oracle.ManagedDataAccess.dll diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index cdc28b5cb..8be44d96d 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config index e5817337e..02fd65492 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj index e931d11d7..64e9e0b3a 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net47.vbproj @@ -60,13 +60,13 @@ - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net47\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net47\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net47\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net47\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net47\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net47\OpenTouryo.Public.dll diff --git a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index cdc28b5cb..8be44d96d 100644 --- a/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2017/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj index 96a7963e0..c3f617b20 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj @@ -99,22 +99,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0\lib\net48\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0\lib\net48\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0\lib\net48\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj index ad780c4e3..ed16987ab 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/Business_netcore50.csproj @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj index 64504fa8f..dcafe1b09 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj @@ -76,13 +76,13 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll 3.0 diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj index 0ce199f2b..aac243e38 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore50.csproj @@ -58,7 +58,7 @@ - + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index ff5d353fd..cfac65448 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config index 7df73e2c9..98aa7468b 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj index 45d328095..74e94804d 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj @@ -72,7 +72,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj index 636a6cca6..d98816bdf 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj @@ -54,13 +54,13 @@ - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj index 1e4a1fdb3..21670ebb0 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore50.csproj @@ -33,7 +33,7 @@ - + diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index ff5d353fd..cfac65448 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config index c40537f25..8d8febd3d 100644 --- a/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2019/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj index cab746d93..a2faa744a 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj @@ -92,22 +92,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0\lib\net48\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0\lib\net48\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0\lib\net48\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj index 2fd190ed3..dbe083133 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj @@ -72,13 +72,13 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll ..\..\Build_net48\Oracle.ManagedDataAccess.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index d416cdef7..22dd552ab 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config index 2c9ef3938..e76e71a2f 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj index 638a20eff..b34474125 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj @@ -65,7 +65,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj index 68cbf03a4..17154ed2b 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj @@ -60,13 +60,13 @@ - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index ff5d353fd..cfac65448 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config index c40537f25..8d8febd3d 100644 --- a/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2019/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj index 96a7963e0..c3f617b20 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_net48.csproj @@ -99,22 +99,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0\lib\net48\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0\lib\net48\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0\lib\net48\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj index 770a4d2cc..ad343b6ec 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj index 64504fa8f..dcafe1b09 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.csproj @@ -76,13 +76,13 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll 3.0 diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj index 1ea9e6852..2fa272801 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj @@ -58,7 +58,7 @@ - + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config index ff5d353fd..cfac65448 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config index 7df73e2c9..98aa7468b 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj index 45d328095..74e94804d 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/CustomControl_net48.csproj @@ -72,7 +72,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj index 636a6cca6..d98816bdf 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.csproj @@ -54,13 +54,13 @@ - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj index 72538b313..ca39d892e 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj @@ -33,7 +33,7 @@ - + diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index ff5d353fd..cfac65448 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config index c40537f25..8d8febd3d 100644 --- a/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2022/programs/CS/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj index cab746d93..a2faa744a 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/Business_net48.vbproj @@ -92,22 +92,22 @@ ..\packages\Npgsql.4.0.3\lib\net451\Npgsql.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0-preview2\lib\net48\OpenTouryo.DamManagedOdp.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamManagedOdp.3.0.0\lib\net48\OpenTouryo.DamManagedOdp.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0-preview2\lib\net48\OpenTouryo.DamMySQL.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamMySQL.3.0.0\lib\net48\OpenTouryo.DamMySQL.dll - ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0-preview2\lib\net48\OpenTouryo.DamPstGrS.dll + ..\packages\Touryo.Infrastructure.Public.Db.DamPstGrS.3.0.0\lib\net48\OpenTouryo.DamPstGrS.dll - ..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll - ..\packages\Touryo.Infrastructure.Public.Security.3.0.0-preview2\lib\net48\OpenTouryo.Public.Security.dll + ..\packages\Touryo.Infrastructure.Public.Security.3.0.0\lib\net48\OpenTouryo.Public.Security.dll ..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj index 2fd190ed3..dbe083133 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_net48.vbproj @@ -72,13 +72,13 @@ ..\..\Build_net48\OpenTouryo.DamPstGrS.dll - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll ..\..\Build_net48\Oracle.ManagedDataAccess.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config index d416cdef7..22dd552ab 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config index 2c9ef3938..e76e71a2f 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -20,10 +20,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj index 638a20eff..b34474125 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/CustomControl_net48.vbproj @@ -65,7 +65,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj index 68cbf03a4..17154ed2b 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_net48.vbproj @@ -60,13 +60,13 @@ - ..\..\packages\Touryo.Infrastructure.Framework.3.0.0-preview2\lib\net48\OpenTouryo.Framework.dll + ..\..\packages\Touryo.Infrastructure.Framework.3.0.0\lib\net48\OpenTouryo.Framework.dll - ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0-preview2\lib\net48\OpenTouryo.Framework.RichClient.dll + ..\..\packages\Touryo.Infrastructure.Framework.RichClient.3.0.0\lib\net48\OpenTouryo.Framework.RichClient.dll - ..\..\packages\Touryo.Infrastructure.Public.3.0.0-preview2\lib\net48\OpenTouryo.Public.dll + ..\..\packages\Touryo.Infrastructure.Public.3.0.0\lib\net48\OpenTouryo.Public.dll diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config index ff5d353fd..cfac65448 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/RichClient/packages.config @@ -9,7 +9,7 @@ - - - + + + \ No newline at end of file diff --git a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config index c40537f25..8d8febd3d 100644 --- a/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config +++ b/root_VS2022/programs/VB/Frameworks/Infrastructure/CustomControl/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file From d0927a3f35ef24e12a668432abcc54c12fd3de1a Mon Sep 17 00:00:00 2001 From: daisuke nishino Date: Mon, 4 Apr 2022 18:38:19 +0900 Subject: [PATCH 29/34] Update Readme.ja.md --- root_VS2017/Readme.ja.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/root_VS2017/Readme.ja.md b/root_VS2017/Readme.ja.md index f2a91e2cd..a2014d573 100644 --- a/root_VS2017/Readme.ja.md +++ b/root_VS2017/Readme.ja.md @@ -156,50 +156,63 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま 10 +5_Build_CLI_sample.bat +.NET Frameworkベースのサンプルアプリ (CLI) をビルドする。 +○*4 + + +11 +5_Build_CLICore_sample.bat +.NET Coreベースのサンプルアプリ (CLI) をビルドする。 +○*3, *4 +－ + + +12 5_Build_2CS_sample.bat .NET Frameworkベースのサンプルアプリ (2 層 C/S) をビルドする。 ○*4 -11 +13 6_Build_WSSrv_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 ○*4 -12 +14 7_Build_Framework_WS.bat .NET Frameworkベースのフレームワーク (サービスインタフェース部分) をビルドする。  ○*4 -13 +15 8_Build_WSClnt_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービスクライアント) をビルドする。 ○*4 -14 +16 10_Build_WebApp_sample.bat サンプルWebアプリ (ASP.NET) をビルドする。  ○*4 -15 +17 10_Build_WebAppCore_sample.bat サンプルWebアプリ (ASP.NET Core) をビルドする。  ○*3, *4 － -16 +18 z_Common.bat 共通設定 (MSBuild 用) ○ ○ -17 +19 z_Common2.bat 共通設定 (Visual Studio 用)  ○ From 38147fcdb054f4d355ca4fa5f15be5e8592c3f75 Mon Sep 17 00:00:00 2001 From: daisuke nishino Date: Mon, 4 Apr 2022 18:40:37 +0900 Subject: [PATCH 30/34] Update README.md --- root_VS2017/README.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/root_VS2017/README.md b/root_VS2017/README.md index 54d1975e6..93dce2078 100644 --- a/root_VS2017/README.md +++ b/root_VS2017/README.md @@ -159,50 +159,63 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. 10 +5_Build_CLI_sample.bat +Build the .NET Framework-based sample application. (CLI application) +○*4 + + +11 +5_Build_CLICore_sample.bat +Build the .NET Core-based sample application. (CLI application) +○*3, *4 +－ + + +12 5_Build_2CS_sample.bat Build the .NET Framework-based sample application. (Two-tier client server application) ○*4 -11 +13 6_Build_WSSrv_sample.bat Build the .NET Framework-based sample application. (Web services (Server-side logic)) ○*4 -12 +14 7_Build_Framework_WS.bat Build the .NET Framework-based framework. (Service interface) ○*4 -13 +15 8_Build_WSClnt_sample.bat Build the .NET Framework-based sample application. (Web service client)  ○*4 -14 +16 10_Build_WebApp_sample.bat Build the sample web application. (ASP.NET) ○*4 -15 +17 10_Build_WebAppCore_sample.bat Build the sample web application. (ASP.NET Core) ○*3, *4 － -16 +18 z_Common.bat Common settings (for MSBuild) ○ ○ -17 +19 z_Common2.bat Common settings (for Visual Studio) ○ From 34edf9789eb3db43c5d88aa570c05dffdc262d66 Mon Sep 17 00:00:00 2001 From: daisuke nishino Date: Mon, 4 Apr 2022 19:29:53 +0900 Subject: [PATCH 31/34] Update Readme.ja.md --- root_VS2019/Readme.ja.md | 43 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/root_VS2019/Readme.ja.md b/root_VS2019/Readme.ja.md index c66547346..739d92f86 100644 --- a/root_VS2019/Readme.ja.md +++ b/root_VS2019/Readme.ja.md @@ -129,15 +129,15 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま 6 -3_Build_Business_netcore30.bat -.NET Core 3.0 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +3_Build_Business_netcore50.bat +.NET 5 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 ○*3 － 7 -3_Build_BusinessRichClient_netcore30.bat -.NET Core 3.0 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +3_Build_BusinessRichClient_netcore50.bat +.NET 5 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 ○*2, *3 － @@ -170,78 +170,91 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま 12 +5_Build_CLI_sample.bat +.NET Frameworkベースのサンプルアプリ (CLI) をビルドする。 +○*4 + + +13 +5_Build_CLICore_sample.bat +.NET Coreベースのサンプルアプリ (CLI) をビルドする。 +○*3, *4 +－ + + +14 5_Build_2CS_sample.bat .NET Frameworkベースのサンプルアプリ (2 層 C/S) をビルドする。 ○*4 -13 +15 5_Build_2CSCore_sample.bat .NET Coreベースのサンプルアプリ (2 層 C/S) をビルドする。 ○*3, *4 － -14 +16 6_Build_WSSrv_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 ○*4 -15 +17 6_Build_WSSrvCore_sample.bat .NET Coreベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 ○*3, *4 － -16 +18 7_Build_Framework_WS.bat .NET Frameworkベースのフレームワーク (サービスインタフェース部分) をビルドする。  ○*4 -17 +19 7_Build_Framework_WSCore.bat .NET Coreベースのフレームワーク (サービスインタフェース部分) をビルドする。  ○*3, *4 － -18 +20 8_Build_WSClnt_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービスクライアント) をビルドする。 ○*4 -19 +21 8_Build_WSClntCore_sample.bat .NET Coreベースのサンプルアプリ (Web サービスクライアント) をビルドする。 ○*3, *4 － -20 +22 10_Build_WebApp_sample.bat サンプルWebアプリ (ASP.NET) をビルドする。  ○*4 -21 +23 10_Build_WebAppCore_sample.bat サンプルWebアプリ (ASP.NET Core) をビルドする。  ○*3, *4 － -22 +24 z_Common.bat 共通設定 (MSBuild 用) ○ ○ -23 +25 z_Common2.bat 共通設定 (Visual Studio 用)  ○ From 2259a67d33aea312c0a63403eb66f69b08ff8cf6 Mon Sep 17 00:00:00 2001 From: daisuke nishino Date: Mon, 4 Apr 2022 19:57:23 +0900 Subject: [PATCH 32/34] Update README.md --- root_VS2019/README.md | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/root_VS2019/README.md b/root_VS2019/README.md index 056e92649..50b36920e 100644 --- a/root_VS2019/README.md +++ b/root_VS2019/README.md @@ -132,15 +132,15 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. 6 -3_Build_Business_netcore30.bat -Build a framework (base class 2, library part) of Business namespace that targets .NET Core 3.0. +3_Build_Business_netcore50.bat +Build a framework (base class 2, library part) of Business namespace that targets .NET 5. ○*3 － 7 -3_Build_BusinessRichClient_netcore30.bat -Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Core 3.0. +3_Build_BusinessRichClient_netcore50.bat +Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET 5. ○*2, *3 － @@ -173,78 +173,91 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. 12 +5_Build_CLI_sample.bat +Build the .NET Framework-based sample application. (CLI application) +○*4 + + +13 +5_Build_CLICore_sample.bat +Build the .NET Core-based sample application. (CLI application) +○*3, *4 +－ + + +14 5_Build_2CS_sample.bat Build the .NET Framework-based sample application. (Two-tier client server application) ○*4 -13 +15 5_Build_2CSCore_sample.bat Build the .NET Core-based sample application. (Two-tier client server application) ○*3, *4 － -14 +16 6_Build_WSSrv_sample.bat Build the .NET Framework-based sample application. (Web services (Server-side logic)) ○*4 -15 +17 6_Build_WSSrvCore_sample.bat Build the .NET Core-based sample application. (Web services (Server-side logic)) ○*3, *4 － -16 +18 7_Build_Framework_WS.bat Build the .NET Framework-based framework. (Service interface) ○*4 -17 +19 7_Build_Framework_WSCore.bat Build the .NET Core-based framework. (Service interface) ○*3, *4 － -18 +20 8_Build_WSClnt_sample.bat Build the .NET Framework-based sample application. (Web service client)  ○*4 -19 +21 8_Build_WSClntCore_sample.bat Build the .NET Core-based sample application. (Web service client)  ○*3, *4 － -20 +22 10_Build_WebApp_sample.bat Build the sample web application. (ASP.NET) ○*4 -21 +23 10_Build_WebAppCore_sample.bat Build the sample web application. (ASP.NET Core) ○*3, *4 － -22 +24 z_Common.bat Common settings (for MSBuild) ○ ○ -23 +25 z_Common2.bat Common settings (for Visual Studio) ○ From 667cb2fb914e425b3dda48a404a3b21b385bb4ed Mon Sep 17 00:00:00 2001 From: daisuke nishino Date: Mon, 4 Apr 2022 20:04:10 +0900 Subject: [PATCH 33/34] Update README.md --- root_VS2022/README.md | 55 ++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/root_VS2022/README.md b/root_VS2022/README.md index 056e92649..1b052063b 100644 --- a/root_VS2022/README.md +++ b/root_VS2022/README.md @@ -1,16 +1,16 @@ -# Open Touryo Template Base for Visual Studio 2019 +# Open Touryo Template Base for Visual Studio 2022 *Open Touryo Template Base* is the *foundation* of the development infrastructure (project template) of the programs using Open Touryo. Click [here](Readme.ja.md) for Japanese version of this file. ## Running sample application tasks -You can run the sample application bundled with Open Touryo Template Base for Visual Studio 2019 according to the following steps. +You can run the sample application bundled with Open Touryo Template Base for Visual Studio 2022 according to the following steps. Notation *Optional*: Open Touryo supports the following DBMSs and data providers. But the data providers, having the notation *optional*, are not included in the programs of Open Touryo. When using the DBMSs and data providers having the notation *optional*, download the data provider manually, and modify [the data access project of Open Touryo, that is DamXXX.csproj](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/develop/root/programs/CS/Frameworks/Infrastructure/Public/Db), to refer the data provider. ### Install prerequisites -Install Visual Studio 2019 beforehand. +Install Visual Studio 2022 beforehand. In addition, Open Touryo template base supports the following DBMS by default. If necessary, install the DBMS to use. - SQL Server @@ -22,8 +22,8 @@ In addition, Open Touryo template base supports the following DBMS by default. I - PostgreSQL ### Deploy Open Touryo Template Base -Copy *root_VS2019* folder to just under C drive, and rename *root_VS2019* folder to *root*. -If not copying *root_VS2019* folder to just under C drive, the build may fail for the Windows maximum path length limitation. +Copy *root_VS2022* folder to just under C drive, and rename *root_VS2022* folder to *root*. +If not copying *root_VS2022* folder to just under C drive, the build may fail for the Windows maximum path length limitation. ### Obtain and deploy data providers The correspondence between the DBMSs and the data providers is as follows. @@ -132,15 +132,15 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. 6 -3_Build_Business_netcore30.bat -Build a framework (base class 2, library part) of Business namespace that targets .NET Core 3.0. +3_Build_Business_netcore60.bat +Build a framework (base class 2, library part) of Business namespace that targets .NET 6. ○*3 － 7 -3_Build_BusinessRichClient_netcore30.bat -Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Core 3.0. +3_Build_BusinessRichClient_netcore60.bat +Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET 6. ○*2, *3 － @@ -173,78 +173,91 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. 12 +5_Build_CLI_sample.bat +Build the .NET Framework-based sample application. (CLI application) +○*4 + + +13 +5_Build_CLICore_sample.bat +Build the .NET Core-based sample application. (CLI application) +○*3, *4 +－ + + +14 5_Build_2CS_sample.bat Build the .NET Framework-based sample application. (Two-tier client server application) ○*4 -13 +15 5_Build_2CSCore_sample.bat Build the .NET Core-based sample application. (Two-tier client server application) ○*3, *4 － -14 +16 6_Build_WSSrv_sample.bat Build the .NET Framework-based sample application. (Web services (Server-side logic)) ○*4 -15 +17 6_Build_WSSrvCore_sample.bat Build the .NET Core-based sample application. (Web services (Server-side logic)) ○*3, *4 － -16 +18 7_Build_Framework_WS.bat Build the .NET Framework-based framework. (Service interface) ○*4 -17 +19 7_Build_Framework_WSCore.bat Build the .NET Core-based framework. (Service interface) ○*3, *4 － -18 +20 8_Build_WSClnt_sample.bat Build the .NET Framework-based sample application. (Web service client)  ○*4 -19 +21 8_Build_WSClntCore_sample.bat Build the .NET Core-based sample application. (Web service client)  ○*3, *4 － -20 +22 10_Build_WebApp_sample.bat Build the sample web application. (ASP.NET) ○*4 -21 +23 10_Build_WebAppCore_sample.bat Build the sample web application. (ASP.NET Core) ○*3, *4 － -22 +24 z_Common.bat Common settings (for MSBuild) ○ ○ -23 +25 z_Common2.bat Common settings (for Visual Studio) ○ @@ -260,7 +273,7 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. - If necessary, revise the environment variable *BUILDFILEPATH* in z_Common.bat according to the build environment. -- The libraries which are used by Open Touryo Template Base for Visual Studio 2019 are downloaded by NuGet. NuGet libraries might not be downloaded normally under proxy environment. So, when using proxy environment, create environment variable *http_proxy* as follows: +- The libraries which are used by Open Touryo Template Base for Visual Studio 2022 are downloaded by NuGet. NuGet libraries might not be downloaded normally under proxy environment. So, when using proxy environment, create environment variable *http_proxy* as follows: - Open *C:\root\programs\CS\z_Common.bat* and *C:\root\programs\VB\z_Common.bat* in an editor. - By default, the code which creates environment variable *http_proxy* is commented. So, uncomment this code by removing '@rem'. From ba9b870e1b341edce69328039f89aac3507d7e94 Mon Sep 17 00:00:00 2001 From: daisuke nishino Date: Mon, 4 Apr 2022 20:10:47 +0900 Subject: [PATCH 34/34] Update Readme.ja.md --- root_VS2022/Readme.ja.md | 53 +++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/root_VS2022/Readme.ja.md b/root_VS2022/Readme.ja.md index c66547346..40c89b151 100644 --- a/root_VS2022/Readme.ja.md +++ b/root_VS2022/Readme.ja.md @@ -1,16 +1,16 @@ -# Open 棟梁テンプレート・ベース (Visual Studio 2019 用) +# Open 棟梁テンプレート・ベース (Visual Studio 2022 用) 「Open 棟梁テンプレート・ベース」とは、Open 棟梁を使用したシステムの開発基盤 (プロジェクトテンプレート) を作るための元になるものです。 このファイルの英語版は[こちら](README.md)から。 ## サンプルの実行手順 -Open 棟梁テンプレート・ベース (Visual Studio 2019 用) に同梱されるサンプルアプリケーションの実行手順は以下のとおりです。 +Open 棟梁テンプレート・ベース (Visual Studio 2022 用) に同梱されるサンプルアプリケーションの実行手順は以下のとおりです。 **Optional 表記:** 以下、optional 表記のある DBMS とデータプロバイダは、Open 棟梁でサポートされていますが、Open 棟梁のプログラムには含まれていません。そのため、optional 表記のある DBMS とデータプロバイダを使う場合、必要に応じてデータプロバイダを手動でダウンロードし、[Open 棟梁のデータアクセス用のプロジェクト (DamXXX.csproj)](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/develop/root/programs/CS/Frameworks/Infrastructure/Public/Db) から、当該データプロバイダに参照設定を張り直してください。 ### 前提ツールのインストール -あらかじめ、Visual Studio 2019 をインストールしておいてください。 +あらかじめ、Visual Studio 2022 をインストールしておいてください。 また、Open 棟梁テンプレート・ベースは、既定で以下の DBMS をサポートしています。必要に応じて使用する DBMS をインストールしておいてください。 - SQL Server @@ -22,7 +22,7 @@ Open 棟梁テンプレート・ベース (Visual Studio 2019 用) に同梱さ - PostgreSQL ### Open 棟梁テンプレート・ベースの配置 -「root_VS2019」フォルダを、C ドライブ直下にコピーして「root」にリネームしてください。 +「root_VS2022」フォルダを、C ドライブ直下にコピーして「root」にリネームしてください。 C ドライブ直下以外にコピーすると、Windows のファイルパスの最大文字長の制限により、ビルドに失敗することがあります。 ### データプロバイダの取得と配置 @@ -129,15 +129,15 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま 6 -3_Build_Business_netcore30.bat -.NET Core 3.0 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +3_Build_Business_netcore60.bat +.NET 6 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 ○*3 － 7 -3_Build_BusinessRichClient_netcore30.bat -.NET Core 3.0 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +3_Build_BusinessRichClient_netcore60.bat +.NET 6 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 ○*2, *3 － @@ -170,78 +170,91 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま 12 +5_Build_CLI_sample.bat +.NET Frameworkベースのサンプルアプリ (CLI) をビルドする。 +○*4 + + +13 +5_Build_CLICore_sample.bat +.NET Coreベースのサンプルアプリ (CLI) をビルドする。 +○*3, *4 +－ + + +14 5_Build_2CS_sample.bat .NET Frameworkベースのサンプルアプリ (2 層 C/S) をビルドする。 ○*4 -13 +15 5_Build_2CSCore_sample.bat .NET Coreベースのサンプルアプリ (2 層 C/S) をビルドする。 ○*3, *4 － -14 +16 6_Build_WSSrv_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 ○*4 -15 +17 6_Build_WSSrvCore_sample.bat .NET Coreベースのサンプルアプリ (Web サービス (サーバー側ロジック)) をビルドする。 ○*3, *4 － -16 +18 7_Build_Framework_WS.bat .NET Frameworkベースのフレームワーク (サービスインタフェース部分) をビルドする。  ○*4 -17 +19 7_Build_Framework_WSCore.bat .NET Coreベースのフレームワーク (サービスインタフェース部分) をビルドする。  ○*3, *4 － -18 +20 8_Build_WSClnt_sample.bat .NET Frameworkベースのサンプルアプリ (Web サービスクライアント) をビルドする。 ○*4 -19 +21 8_Build_WSClntCore_sample.bat .NET Coreベースのサンプルアプリ (Web サービスクライアント) をビルドする。 ○*3, *4 － -20 +22 10_Build_WebApp_sample.bat サンプルWebアプリ (ASP.NET) をビルドする。  ○*4 -21 +23 10_Build_WebAppCore_sample.bat サンプルWebアプリ (ASP.NET Core) をビルドする。  ○*3, *4 － -22 +24 z_Common.bat 共通設定 (MSBuild 用) ○ ○ -23 +25 z_Common2.bat 共通設定 (Visual Studio 用)  ○ @@ -257,7 +270,7 @@ Open 棟梁のテンプレート・ベースには、2つの部分がありま - 必要であれば、環境に合わせて、z_Common.bat 内の BUILDFILEPATH を書き換えてください。 -- Open 棟梁 Visual Studio 2019 テンプレート・ベースが利用するライブラリは、NuGet 経由でダウンロードします。このため、プロキシ環境では、正常に NuGet ライブラリがダウンロードできないことがあります。プロキシ環境をお使いの場合は、以下のように http_proxy 環境変数を定義してください。 +- Open 棟梁 Visual Studio 2022 テンプレート・ベースが利用するライブラリは、NuGet 経由でダウンロードします。このため、プロキシ環境では、正常に NuGet ライブラリがダウンロードできないことがあります。プロキシ環境をお使いの場合は、以下のように http_proxy 環境変数を定義してください。 - C:\root\programs\CS\z_Common.bat および C:\root\programs\VB\z_Common.bat を、テキストエディタで開きます。 - 既定では、http_proxy 環境変数の定義部分はコメントアウトされていますので、"@rem" を削除して、このコメントを解除します。 - http_proxy 環境変数に、お使いのプロキシ情報を設定してください。