diff --git a/README.md b/README.md index 13141c13d..f2144d91e 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,24 @@ # OpenTouryo -*Open Touryo* is an application framework for .NET Framework which was developed using the accumulated know-how with a longstanding application development results. +*Open Touryo* is an application framework for .NET which was developed using the accumulated know-how with a longstanding application development results. Click [here](Readme.ja.md) for Japanese version of this file. ## Develop/Run-time environment The programs in this repository are developed in the following IDE/targetFramework: -- IDE (Integrated Development Environment) - - Visual Studio 2015 - - Visual Studio 2017 - - Visual Studio 2019 +- IDE (Integrated Development Environment) + Visual Studio 2022 - targetFramework (Run-time environment) - .NET Framework 4.5.2 (net452) - .NET Framework 4.6 (net46) - .NET Framework 4.7 (net47) - .NET Framework 4.8 (net48) + - .NET Standard 2.0 (netstandard2.0) + - .NET Standard 2.1 (netstandard2.1) - .NET Core 2.0 (netcoreapp2.0) - .NET Core 3.0 (netcoreapp3.0) - .NET 5.0 (net5.0) - - .NET Standard 2.0 (netstandard2.0) - - .NET Standard 2.1 (netstandard2.1) + - .NET 6.0 (net6.0) The name of projects and solutions include the targetFramework. For example, the projects and solutions for net47(.NET Framework 4.7) are named {identifier}_net47.{ext}. diff --git a/Readme.ja.md b/Readme.ja.md index e45c7f300..5bda9539f 100644 --- a/Readme.ja.md +++ b/Readme.ja.md @@ -6,21 +6,19 @@ ## 開発 / 動作環境 このリポジトリのプログラムは、以下のIDE/targetFramework を前提に開発しています。 -- IDE（統合開発環境） - - Visual Studio 2015 - - Visual Studio 2017 - - Visual Studio 2019 +- IDE（統合開発環境） + Visual Studio 2022 - targetFramework（実行環境） - .NET Framework 4.5.2 (net452) - .NET Framework 4.6 (net46) - .NET Framework 4.7 (net47) - .NET Framework 4.8 (net48) + - .NET Standard 2.0 (netstandard2.0) + - .NET Standard 2.1 (netstandard2.1) - .NET Core 2.0 (netcoreapp2.0) - .NET Core 3.0 (netcoreapp3.0) - .NET 5.0 (net5.0) - - .NET Standard 2.0 (netstandard2.0) - - .NET Standard 2.1 (netstandard2.1) - + - .NET 6.0 (net6.0) プロジェクトやソリューションの名前には、targetFrameworkが含まれます。 たとえば、net47(.NET Framework 4.7) を対象としたプロジェクト・ソリューションは、"{identifier}_net47.{ext}" と命名しています。 diff --git a/root/README.md b/root/README.md index 7e338aaf9..fa33cc129 100644 --- a/root/README.md +++ b/root/README.md @@ -188,6 +188,20 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. － +10 +2_Build_NuGet_nettcore50.bat +Build the framework (Base class 1 and library part) to make NuGet package that targets .NET 5. +○*1, *3 +－ + + +10 +2_Build_NuGet_nettcore60.bat +Build the framework (Base class 1 and library part) to make NuGet package that targets .NET 6. +○*1, *3 +－ + + 11 3_Build_Business_net45.bat Build a framework (base class 2, library part) of Business namespace that targets .NET Framework 4.5.2. @@ -250,6 +264,20 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. － +20 +3_Build_Business_netcore50.bat +Build a framework (base class 2, library part) of Business namespace that targets .NET 5. +○*3 +－ + + +20 +3_Build_Business_netcore60.bat +Build a framework (base class 2, library part) of Business namespace that targets .NET 6. +○*3 +－ + + 21 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. @@ -257,6 +285,20 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together. － +21 +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 +－ + + +21 +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 +－ + + 22 4_Build_CopyAssemblies.bat Copy the primary output of the above build to the reference folder. diff --git a/root/Readme.ja.md b/root/Readme.ja.md index 4caa4e8c5..ac55b6e03 100644 --- a/root/Readme.ja.md +++ b/root/Readme.ja.md @@ -179,6 +179,20 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu － +10 +2_Build_NuGet_nettcore50.bat +.NET 5 をターゲットとする NuGet パッケージの作成用に、フレームワーク (ベースクラス１, ライブラリ部分) をビルドする。 +○*1, *3 +－ + + +10 +2_Build_NuGet_nettcore60.bat +.NET 6 をターゲットとする NuGet パッケージの作成用に、フレームワーク (ベースクラス１, ライブラリ部分) をビルドする。 +○*1, *3 +－ + + 11 3_Build_Business_net45.bat .NET Framework 4.5.2 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 @@ -241,6 +255,20 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu － +20 +3_Build_Business_netcore50.bat +.NET 5 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +○*3 +－ + + +20 +3_Build_Business_netcore60.bat +.NET 6 をターゲットとする Business名前空間のフレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +○*3 +－ + + 21 3_Build_BusinessRichClient_netcore30.bat .NET Core 3.0 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 @@ -248,6 +276,20 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu － +21 +3_Build_BusinessRichClient_netcore50.bat +.NET 5 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +○*2, *3 +－ + + +21 +3_Build_BusinessRichClient_netcore60.bat +.NET 6 をターゲットとする Business名前空間のリッチクライアント用フレームワーク (ベースクラス２, ライブラリ部分) をビルドする。 +○*2, *3 +－ + + 22 4_Build_CopyAssemblies.bat 上記ビルドのプライマリ出力を参照先フォルダにコピーする。 diff --git a/root/files/resource/Log/Log4NetConfigTemplate.xml b/root/files/resource/Log/Log4NetConfigTemplate.xml index dfba2f446..31ded325d 100644 --- a/root/files/resource/Log/Log4NetConfigTemplate.xml +++ b/root/files/resource/Log/Log4NetConfigTemplate.xml @@ -3,144 +3,144 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/files/resource/Log/SampleLogConf.xml b/root/files/resource/Log/SampleLogConf.xml index 6b444eb91..f68b9bdd9 100644 --- a/root/files/resource/Log/SampleLogConf.xml +++ b/root/files/resource/Log/SampleLogConf.xml @@ -3,137 +3,137 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/files/resource/Log/SampleLogConf2CS.xml b/root/files/resource/Log/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/files/resource/Log/SampleLogConf2CS.xml +++ b/root/files/resource/Log/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/files/resource/Log/SampleLogConfMobile.xml b/root/files/resource/Log/SampleLogConfMobile.xml deleted file mode 100644 index 634177ae3..000000000 --- a/root/files/resource/Log/SampleLogConfMobile.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root/files/resource/Log/SampleLogConfWebService.xml b/root/files/resource/Log/SampleLogConfWebService.xml index cf358928a..ba9669807 100644 --- a/root/files/resource/Log/SampleLogConfWebService.xml +++ b/root/files/resource/Log/SampleLogConfWebService.xml @@ -3,163 +3,163 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + ※ FileAppender、RollingFileAppenderは、ネットワーク上のフォルダ共有やネットワークドライブにへの出力も可能 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/programs/CS/0_ExecAllBat.bat b/root/programs/CS/0_ExecAllBat.bat index 61fc1dc26..58bf207e6 100644 --- a/root/programs/CS/0_ExecAllBat.bat +++ b/root/programs/CS/0_ExecAllBat.bat @@ -12,6 +12,7 @@ echo | call 2_Build_NuGet_netstd20.bat echo | call 2_Build_NuGet_netstd21.bat echo | call 2_Build_NuGet_nettcore30.bat echo | call 2_Build_NuGet_nettcore50.bat +echo | call 2_Build_NuGet_nettcore60.bat @echo on timeout 5 @@ -23,12 +24,14 @@ echo | call 3_Build_Business_net48.bat echo | call 3_Build_Business_netcore20.bat echo | call 3_Build_Business_netcore30.bat echo | call 3_Build_Business_netcore50.bat +echo | call 3_Build_Business_netcore60.bat echo | call 3_Build_BusinessRichClient_net45.bat echo | call 3_Build_BusinessRichClient_net46.bat echo | call 3_Build_BusinessRichClient_net47.bat echo | call 3_Build_BusinessRichClient_net48.bat echo | call 3_Build_BusinessRichClient_netcore30.bat echo | call 3_Build_BusinessRichClient_netcore50.bat +echo | call 3_Build_BusinessRichClient_netcore60.bat echo | call 4_Build_CopyAssemblies.bat @@ -44,6 +47,9 @@ echo | call 5_Build_2CSCore_sample.bat echo | call 5_Build_Bat_sample.bat echo | call 5_Build_BatCore_sample.bat +echo | call 5_Build_CLI_sample.bat +echo | call 5_Build_CLICore_sample.bat + echo | call 6_Build_WSSrv_sample.bat echo | call 6_Build_WSSrvCore_sample.bat diff --git a/root/programs/CS/0_Release4Nuget.bat b/root/programs/CS/0_Release4Nuget.bat index 7b6f3932f..d4503b553 100644 --- a/root/programs/CS/0_Release4Nuget.bat +++ b/root/programs/CS/0_Release4Nuget.bat @@ -12,6 +12,7 @@ echo | call 2_Build_NuGet_netstd20.bat echo | call 2_Build_NuGet_netstd21.bat echo | call 2_Build_NuGet_nettcore30.bat echo | call 2_Build_NuGet_nettcore50.bat +echo | call 2_Build_NuGet_nettcore60.bat echo | call 4_Build_CopyAssemblies.bat diff --git a/root/programs/CS/1_DeleteDir.bat b/root/programs/CS/1_DeleteDir.bat index 30e06eed3..a438a0a26 100644 --- a/root/programs/CS/1_DeleteDir.bat +++ b/root/programs/CS/1_DeleteDir.bat @@ -19,7 +19,8 @@ for %%a in ( %w2% ) do ( pause -set DIRECTORIES=Build, Build_net45, Build_net46, Build_net47, Build_net48, Build_netstd20, Build_netstd21, Build_netcore20, Build_netcore30, Build_netcore50 +set DIRECTORIES=Build, Build_net45, Build_net46, Build_net47, Build_net48, Build_netstd20, Build_netstd21, Build_netcore20, Build_netcore30, Build_netcore50, Build_netcore60 + @echo -------------------------------------------------- @echo Delete the %DIRECTORIES% folders. @echo -------------------------------------------------- diff --git a/root/programs/CS/2_Build_NuGet_nettcore60.bat b/root/programs/CS/2_Build_NuGet_nettcore60.bat new file mode 100644 index 000000000..00389d74c --- /dev/null +++ b/root/programs/CS/2_Build_NuGet_nettcore60.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\Nuget_RichClient_netcore60.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore60.sln" + +pause + +rem ------------------------------------------------------- +endlocal \ No newline at end of file diff --git a/root/programs/CS/3_Build_BusinessRichClient_netcore60.bat b/root/programs/CS/3_Build_BusinessRichClient_netcore60.bat new file mode 100644 index 000000000..e78e55430 --- /dev/null +++ b/root/programs/CS/3_Build_BusinessRichClient_netcore60.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_netcore60.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore60.sln" + +pause + +rem ------------------------------------------------------- +endlocal \ No newline at end of file diff --git a/root/programs/CS/3_Build_Business_netcore60.bat b/root/programs/CS/3_Build_Business_netcore60.bat new file mode 100644 index 000000000..25e09e4fc --- /dev/null +++ b/root/programs/CS/3_Build_Business_netcore60.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_netcore60.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore60.sln" + +pause + +rem ------------------------------------------------------- +endlocal \ No newline at end of file diff --git a/root/programs/CS/4_Build_CopyAssemblies.bat b/root/programs/CS/4_Build_CopyAssemblies.bat index abe40769b..9f09a5792 100644 --- a/root/programs/CS/4_Build_CopyAssemblies.bat +++ b/root/programs/CS/4_Build_CopyAssemblies.bat @@ -6,5 +6,5 @@ @rem -------------------------------------------------- @rem Copy for build local repository. @rem -------------------------------------------------- -xcopy /E /Y "Frameworks\Infrastructure\Build_net46" "Frameworks\Infrastructure\Build\" +xcopy /E /Y "Frameworks\Infrastructure\Build_net48" "Frameworks\Infrastructure\Build\" diff --git a/root/programs/CS/4_Build_Framework_Tool.bat b/root/programs/CS/4_Build_Framework_Tool.bat index b3c918266..d36b9f64c 100644 --- a/root/programs/CS/4_Build_Framework_Tool.bat +++ b/root/programs/CS/4_Build_Framework_Tool.bat @@ -37,5 +37,13 @@ rem -------------------------------------------------- pause +rem -------------------------------------------------- +rem Batch build of Deploy DistributeFile_Tool. +rem -------------------------------------------------- +..\nuget.exe restore "Frameworks\Tools\DistributeFile_Tool\DistributeFile_Tool.sln" +%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DistributeFile_Tool\DistributeFile_Tool.sln" + +pause + rem ------------------------------------------------------- endlocal diff --git a/root/programs/CS/4_Build_Framework_ToolCore.bat b/root/programs/CS/4_Build_Framework_ToolCore.bat index 259dee55f..ed9bd847c 100644 --- a/root/programs/CS/4_Build_Framework_ToolCore.bat +++ b/root/programs/CS/4_Build_Framework_ToolCore.bat @@ -39,5 +39,13 @@ call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\Deploy pause +rem -------------------------------------------------- +rem Batch build of Deploy DistributeFile_Tool. +rem -------------------------------------------------- +call dotnet restore "Frameworks\Tools\DistributeFile_Tool\DistributeFile_ToolCore.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Tools\DistributeFile_Tool\DistributeFile_ToolCore.sln" + +pause + rem ------------------------------------------------------- endlocal diff --git a/root/programs/CS/5_Build_CLICore_sample.bat b/root/programs/CS/5_Build_CLICore_sample.bat new file mode 100644 index 000000000..3b725890a --- /dev/null +++ b/root/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/programs/CS/5_Build_CLI_sample.bat b/root/programs/CS/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root/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/programs/CS/6_Build_WSSrvCore_sample.bat b/root/programs/CS/6_Build_WSSrvCore_sample.bat index 03c8065ca..7209899e7 100644 --- a/root/programs/CS/6_Build_WSSrvCore_sample.bat +++ b/root/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/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj b/root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj new file mode 100644 index 000000000..d67e1e103 --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore60.csproj @@ -0,0 +1,96 @@ + + + + net6.0 + Touryo.Infrastructure.Business + OpenTouryo.Business + true + + + + TRACE;DEBUG;NETCOREAPP + ..\Build_netcore60\ + ..\Build_netcore60\net6.0\OpenTouryo.Business.xml + full + true + 1701;1702;NU1701 + + + + TRACE;NETCOREAPP + ..\Build_netcore60\ + ..\Build_netcore60\net6.0\OpenTouryo.Business.xml + portable + true + 1701;1702;NU1701 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\Build_netstd21\netstandard2.1\OpenTouryo.DamManagedOdp.dll + + + ..\Build_netstd21\netstandard2.1\OpenTouryo.DamMySQL.dll + + + ..\Build_netstd21\netstandard2.1\OpenTouryo.DamPstGrS.dll + + + ..\Build_netstd21\netstandard2.1\OpenTouryo.Framework.dll + + + ..\Build_netstd21\netstandard2.1\OpenTouryo.Public.dll + + + ..\Build_netstd21\netstandard2.1\OpenTouryo.Public.Security.dll + + + + diff --git a/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs b/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs index 820d85912..ed7d9b8fe 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseController.cs +++ b/root/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/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs b/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs index 0c8799a1f..44d864dce 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.cs +++ b/root/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/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs b/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs index 69c71e9a1..a35534586 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business/Presentation/MyBaseMVControllerCore.cs +++ b/root/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/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj b/root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj new file mode 100644 index 000000000..e221d88fc --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore60.csproj @@ -0,0 +1,62 @@ + + + + Library + net6.0-windows + true + true + OpenTouryo.Business.RichClient + Touryo.Infrastructure.Business.RichClient + + + + TRACE;NETCOREAPP + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.xml + full + true + 1701;1702;NU1701 + + + + TRACE;NETCOREAPP + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.xml + portable + true + 1701;1702;NU1701 + + + + + + + + + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\Build_netcore60\net6.0\OpenTouryo.Business.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.DamManagedOdp.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.DamMySQL.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.DamPstGrS.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.Framework.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.Public.dll + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net47.sln b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net47.sln index f97aae8c4..0a104035e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net47.sln +++ b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net47.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net47.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient_net47", "Business\RichClient\Business.RichClient_net47.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net47.csproj", "{85861BE7-A77E-46BE-9FFE-330654571C32}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl.RichClient_net47", "CustomControl\RichClient\CustomControl.RichClient_net47.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 = {C0FECE7E-6DC7-4738-8EBD-EE4A690E0624} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln index abd91f8a8..ff0ed2971 100644 --- a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln +++ b/root/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.30717.126 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 @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D353944E-6FF1-446C-9A30-421A28715741} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore60.sln b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore60.sln new file mode 100644 index 000000000..06ab39dc4 --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore60.sln @@ -0,0 +1,31 @@ + +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}") = "Business.RichClient_netcore60", "Business\RichClient\Business.RichClient_netcore60.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +EndProject +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 + 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/programs/CS/Frameworks/Infrastructure/Business_net47.sln b/root/programs/CS/Frameworks/Infrastructure/Business_net47.sln index 371418627..7da7559d0 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business_net47.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Business_net47.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "Business\Business_net47.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business_net47", "Business\Business_net47.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl", "CustomControl\CustomControl_net47.csproj", "{2C6108F5-DEB1-4821-8CE0-E80619A06E03}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomControl_net47", "CustomControl\CustomControl_net47.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 = {A8FA79C7-AF6F-4F3B-88F7-C7BA400D85FD} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln b/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln index 33ab4ee35..6581e075e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln +++ b/root/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.30717.126 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 @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A80B17E4-C049-4784-8834-27B152C4BAB4} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Frameworks/Infrastructure/Business_netcore30.sln b/root/programs/CS/Frameworks/Infrastructure/Business_netcore30.sln index cbaae0287..db53c3821 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business_netcore30.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Business_netcore30.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2015 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30717.126 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business", "Business\Business_netcore30.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business_netcore30", "Business\Business_netcore30.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln b/root/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln index 25230eb02..391e8cc91 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Business_netcore50.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2015 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30717.126 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_netcore50", "Business\Business_netcore50.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/Business_netcore60.sln b/root/programs/CS/Frameworks/Infrastructure/Business_netcore60.sln new file mode 100644 index 000000000..361adea6c --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/Business_netcore60.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}") = "Business_netcore60", "Business\Business_netcore60.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/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj new file mode 100644 index 000000000..0ad239360 --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore60.csproj @@ -0,0 +1,50 @@ + + + + Library + net6.0-windows + true + true + OpenTouryo.CustomControl.RichClient + Touryo.Infrastructure.CustomControl.RichClient + + + + TRACE;NETCOREAPP + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.CustomControl.RichClient.xml + full + true + 1701;1702;NU1701 + + + + TRACE;NETCOREAPP + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.CustomControl.RichClient.xml + portable + true + 1701;1702;NU1701 + + + + + + + + + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.Framework.dll + + + ..\..\Build_netstd21\netstandard2.1\OpenTouryo.Public.dll + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwkSetStore.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwkSetStore.cs index 03ababfa3..0166bc506 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwkSetStore.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwkSetStore.cs @@ -30,6 +30,7 @@ //* 2018/08/16 西野 大介 新規作成 //* 2018/11/28 西野 大介 jkuチェック対応の追加 //* 2020/06/20 西野 大介 jku無しでもjwks_uriを使うように変更 +//* 2021/06/20 西野 大介 ConstructorでTypeInitializationExceptionが発生 //********************************************************************************** using System; @@ -67,29 +68,36 @@ public class JwkSetStore /// constructor public JwkSetStore() { - if (string.IsNullOrEmpty(OAuth2AndOIDCParams.JwkSetUri)) - { - this._jwkSet = new JwkSet(); - } - else + try { - // _jwkSet 更新 - this._jwkSet = JsonConvert.DeserializeObject( - OAuth2AndOIDCClient.GetJwkSetAsync( - new Uri(OAuth2AndOIDCParams.JwkSetUri)).Result); - - // _dateTime 更新 - this._dateTime = DateTime.Now; - - if (this._jwkSet.keys.Count == 0) + if (string.IsNullOrEmpty(OAuth2AndOIDCParams.JwkSetUri)) { - Debug.WriteLine("JwkSet was abnormally initarized with an empty state in JwkSetStore constructor."); + this._jwkSet = new JwkSet(); } else { - Debug.WriteLine("JwkSet was initarized normally in JwkSetStore constructor."); + // _jwkSet 更新 + this._jwkSet = JsonConvert.DeserializeObject( + OAuth2AndOIDCClient.GetJwkSetAsync( + new Uri(OAuth2AndOIDCParams.JwkSetUri)).Result); + + // _dateTime 更新 + this._dateTime = DateTime.Now; + + if (this._jwkSet.keys.Count == 0) + { + Debug.WriteLine("JwkSet was abnormally initarized with an empty state in JwkSetStore constructor."); + } + else + { + Debug.WriteLine("JwkSet was initarized normally in JwkSetStore constructor."); + } } } + catch (Exception ex) + { + Debug.WriteLine("JwkSetStore constructor: " + ex.ToString()); + } } #endregion @@ -105,6 +113,7 @@ public static JwkSetStore GetInstance() #endregion + #region Get / Set /// GetJwkObject /// string /// JwkObject @@ -210,5 +219,6 @@ public JObject GetJwkObject(string kid) // JwkSetからJwkを返す。 return JwkSet.GetJwkObject(this._jwkSet, kid); } + #endregion } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd20.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd20.csproj index 80ef5e3ef..8a24501ff 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd20.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd20.csproj @@ -4,7 +4,7 @@ netstandard2.0 Touryo.Infrastructure.Framework OpenTouryo.Framework - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd21.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd21.csproj index 9e1cbae46..d33455549 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd21.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netstd21.csproj @@ -4,7 +4,7 @@ netstandard2.1 Touryo.Infrastructure.Framework OpenTouryo.Framework - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Properties/AssemblyInfo.cs index af1282930..d58ba6c76 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Properties/AssemblyInfo.cs @@ -62,4 +62,4 @@ // // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly: AssemblyVersion("2.7.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore30.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore30.csproj index 92ddf5c85..8aa95ca58 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore30.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore30.csproj @@ -9,7 +9,7 @@ Touryo.Infrastructure.Framework.RichClient OpenTouryo.Framework.RichClient - 2.7.0.0 + 3.0.0.0 diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore50.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore50.csproj index e1b710492..21fa561a3 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore50.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore50.csproj @@ -9,7 +9,7 @@ Touryo.Infrastructure.Framework.RichClient OpenTouryo.Framework.RichClient - 2.7.0.0 + 3.0.0.0 diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore60.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore60.csproj new file mode 100644 index 000000000..46b13d100 --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore60.csproj @@ -0,0 +1,44 @@ + + + + Library + net6.0-windows + true + true + + + Touryo.Infrastructure.Framework.RichClient + OpenTouryo.Framework.RichClient + 3.0.0.0 + + + + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.xml + full + true + TRACE;NETCOREAPP + + + + ..\..\Build_netcore60\ + ..\..\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.xml + portable + true + TRACE;NETCOREAPP + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Properties/AssemblyInfo.cs index 3ca401c92..010376904 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Properties/AssemblyInfo.cs @@ -63,4 +63,4 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs index 62669afb1..d49679385 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs @@ -60,6 +60,15 @@ //* 2018/08/04 西野 大介 regionディレクティブのインデントの問題を修正 //* 2018/08/04 西野 大介 HttpClientにpropsの設定値を反映する。 //* 2019/10/01 西野 大介 .NET Standard対応：ASP.NET WebAPI (JSON-RPC)の復元 +//* 2021/05/18 西野 大介 ASP.NET WebAPI（JSON）の例外処理の問題を修正 +//* 2021/05/18 西野 大介 SOAP、WebAPIのCookieコンテナ対応 +//* 2021/05/21 西野 大介 HTTPClientのサーバーサイド実行を可能にするが、 +//* ・HTTPClientは内部で都度生成せず、 +//* ・serviceName毎にプールする。 +//* 以下が制約として追加される。 +//* ・マルチスレッド・クライアントから利用不可。 +//* ・Critical Section内で利用する。 +//* ・Concurrent Collectionでプールを作成する。 //********************************************************************************** using System; @@ -159,22 +168,6 @@ public class CallController /// コンテキスト情報 private object _context; - /// コンストラクタ - /// コンテキスト情報 - /// 自由に利用できる。 - public CallController(object context) - { - // コンテキスト情報 - this._context = context; - -#if NETSTD -#else - // EndPointConfigName（の既定値 - this.WCF_HTTP_EndPointConfigName = FxLiteral.WCF_HTTP_ENDPOINT_CONFIGNAME; - this.WCF_TCPIP_EndPointConfigName = FxLiteral.WCF_TCPIP_ENDPOINT_CONFIGNAME; -#endif - } - /// コンテキスト情報 /// 自由に利用できる。 public object Context @@ -185,29 +178,19 @@ public object Context #endregion - #region Web参照と関連プロパティ - -#if NETSTD -#else - #region ASP.NET WebサービスのWeb参照 - - /// ASP.NET WebサービスのWeb参照 - private Reference WR; - - #region プロパティ直接公開 - - - /// Web参照のCookieContainer + #region CookieContainer + /// CookieContainer public CookieContainer CookieContainer { - set { this.WR.CookieContainer = value; } - get { return this.WR.CookieContainer; } + set; + get; } - #endregion - #endregion + #region Web参照と関連プロパティ +#if NETSTD +#else #region WCF HTTP WebサービスのWeb参照 /// WCF HTTP WebサービスのWeb参照 @@ -223,10 +206,6 @@ public string WCF_HTTP_EndPointConfigName get; } - #endregion - - #region WCF_HTTP_BindingConfiguration - /// To get/set Binding Configuration of WCF HTTP public string WCF_HTTP_BindingConfiguration { @@ -258,6 +237,21 @@ public string WCF_TCPIP_EndPointConfigName #endregion #endif + #region ASPNETWebAPI → HttpClient + +#if NETSTD + /// HttpClientHandlerのDictionary + private Dictionary _handlerCD = new Dictionary(); +#else + /// WebRequestHandlerのDictionary + private Dictionary _handlerCD = new Dictionary(); +#endif + + /// HttpClientのDictionary + private Dictionary _httpClientCD = new Dictionary(); + + #endregion + #region プロキシのURL /// プロキシのURL @@ -272,7 +266,7 @@ public string ProxyUrl #endregion - #region クライアント認証のセキュリティ資格情報 + #region セキュリティ資格情報 /// クライアント認証情報（WAS） private NetworkCredential _nwcWAS; @@ -300,7 +294,26 @@ public NetworkCredential NetworkCredentialToProxy #endregion - #region インボーク + #region Constructor + + /// コンストラクタ + /// コンテキスト情報 + /// 自由に利用できる。 + public CallController(object context) + { + // コンテキスト情報 + this._context = context; +#if NETSTD +#else + // EndPointConfigName（の既定値 + this.WCF_HTTP_EndPointConfigName = FxLiteral.WCF_HTTP_ENDPOINT_CONFIGNAME; + this.WCF_TCPIP_EndPointConfigName = FxLiteral.WCF_TCPIP_ENDPOINT_CONFIGNAME; +#endif + } + + #endregion + + #region Invoke #region 非同期バージョン @@ -339,8 +352,6 @@ public object Invoke(string serviceName, object parameterValue) #endregion - #endregion - // 名前解決（プロトコル タイプ） CallController.PRT_NS.NameResolutionProtocolType(serviceName, out protocol); @@ -459,16 +470,16 @@ public object Invoke(string serviceName, object parameterValue) #region WS-I Basic Profile v1.1、IIS ＋ ASP.NET // 都度newしても接続はプールされているので、オーバーヘッドは少ない。 - WR = new Reference(); + Reference reference = new Reference(); #region URL、タイムアウト // URL - WR.Url = url; + reference.Url = url; // タイムアウト if (0 <= timeout) { - WR.Timeout = timeout * 1000; + reference.Timeout = timeout * 1000; } #endregion @@ -476,23 +487,22 @@ public object Invoke(string serviceName, object parameterValue) #region その他（固定） // 実行アカウントでのWindows認証の有効・無効（Default：false）。 - WR.UseDefaultCredentials = true; // 有効 + reference.UseDefaultCredentials = true; // 有効 // 事前認証の有効・無効（Default：false）。 - WR.PreAuthenticate = false; // 無効 + reference.PreAuthenticate = false; // 無効 // → 認証後の要求でも「WWW-authenticate HTTP」ヘッダーを // ・ 送信する場合　：true // ・ それ以外の場合：false // Webサービスを要求するときに使用されるEncoding（Default：UTF-8）。 - WR.RequestEncoding = Encoding.GetEncoding(CustomEncode.UTF_8); // #36-この行 - // → サービスIFの仕様として「UTF-8」前提で考える。 + reference.RequestEncoding = Encoding.GetEncoding(CustomEncode.UTF_8); // #36-この行IFの仕様として「UTF-8」前提で考える。 - // Cookieの有効・無効（Default：null） - WR.CookieContainer = null;　// 無効 + // Cookieの有効化（Default：null） + reference.CookieContainer = this.CookieContainer; // Redirectを受け付けるか、受け付けないか（Default：false） - WR.AllowAutoRedirect = false; // 受け付けない + reference.AllowAutoRedirect = false; // 受け付けない // SOAP プロトコルのバージョン（Default：Soap11） // WR.SoapProtocolVersion // 変更しない; @@ -513,7 +523,7 @@ public object Invoke(string serviceName, object parameterValue) NetworkCredential nwcWAS = this.CreateCredentials(props); if (nwcWAS != null) { - WR.Credentials = nwcWAS; + reference.Credentials = nwcWAS; } #endregion @@ -523,7 +533,7 @@ public object Invoke(string serviceName, object parameterValue) WebProxy proxy = this.CreateProxy(props); if (proxy != null) { - WR.Proxy = proxy; + reference.Proxy = proxy; } #endregion @@ -535,7 +545,7 @@ public object Invoke(string serviceName, object parameterValue) X509Certificate2 x509 = this.CreateX509Certificate(props); if (x509 != null) { - WR.ClientCertificates.Add(x509); + reference.ClientCertificates.Add(x509); } #endregion @@ -561,7 +571,7 @@ public object Invoke(string serviceName, object parameterValue) if (Boolean.TryParse(props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION], out compress)) { // 書式正常 - WR.EnableDecompression = compress; + reference.EnableDecompression = compress; } else { @@ -593,7 +603,7 @@ public object Invoke(string serviceName, object parameterValue) else { // XML定義：あり - WR.UserAgent = props[FxLiteral.TRANSMISSION_HTTP_PROP_USER_AGENT]; // #34-この行 + reference.UserAgent = props[FxLiteral.TRANSMISSION_HTTP_PROP_USER_AGENT]; // #34-この行 } } @@ -614,7 +624,7 @@ public object Invoke(string serviceName, object parameterValue) else { // XML定義：あり - WR.ConnectionGroupName = props[FxLiteral.TRANSMISSION_HTTP_PROP_CONNECTION_GROUP_NAME]; + reference.ConnectionGroupName = props[FxLiteral.TRANSMISSION_HTTP_PROP_CONNECTION_GROUP_NAME]; } } @@ -623,7 +633,7 @@ public object Invoke(string serviceName, object parameterValue) #endregion // 同期呼び出しで実行 - ret = WR.DotNETOnlineWS( + ret = reference.DotNETOnlineWS( serviceName, ref contextObject, parameterValueObject, out returnValueObject); // #x-この行 @@ -767,15 +777,16 @@ public object Invoke(string serviceName, object parameterValue) // 例外処理 WSErrorInfo wsErrorInfo = (WSErrorInfo)BinarySerialize.BytesToObject(ret); - if (wsErrorInfo.ErrorType == FxEnum.ErrorType.BusinessApplicationException) // #18-このコードブロック - { - // 業務例外 - throw new BusinessApplicationException( - wsErrorInfo.ErrorMessageID, - wsErrorInfo.ErrorMessage, - wsErrorInfo.ErrorInformation); - } - else if (wsErrorInfo.ErrorType == FxEnum.ErrorType.BusinessSystemException) + //if (wsErrorInfo.ErrorType == FxEnum.ErrorType.BusinessApplicationException) // #18-このコードブロック + //{ + // // 業務例外 + // throw new BusinessApplicationException( + // wsErrorInfo.ErrorMessageID, + // wsErrorInfo.ErrorMessage, + // wsErrorInfo.ErrorInformation); + //} + //else + if (wsErrorInfo.ErrorType == FxEnum.ErrorType.BusinessSystemException) { // システム例外 throw new BusinessSystemException( @@ -789,6 +800,11 @@ public object Invoke(string serviceName, object parameterValue) wsErrorInfo.ErrorMessageID, wsErrorInfo.ErrorMessage); } + else if (wsErrorInfo.ErrorType == FxEnum.ErrorType.ElseException) + { + // その他、一般的な例外 + throw new Exception(wsErrorInfo.ErrorMessage); + } } #endregion @@ -818,6 +834,9 @@ public object Invoke(string serviceName, object parameterValue) } } + #endregion + + #region ASPNETWebAPI /// /// ASP.NET WebAPI (JSON-RPC) /// .NETCoreでも利用するため共通化 @@ -834,84 +853,133 @@ public object Invoke(string serviceName, object parameterValue) string serviceName, string url, int timeout, Dictionary props, byte[] contextObject, byte[] parameterValueObject, out byte[] returnValueObject) { + #region Handler + // Equivalent to WebRequestHandler in .net Core · Issue #26223 · dotnet/corefx // https://github.com/dotnet/corefx/issues/26223 - // 通信用の変数 + #region Handlerの変数宣言 #if NETSTD #region HttpClientHandler - HttpClientHandler handler = new HttpClientHandler(); + HttpClientHandler handler = null; #endregion #else #region WebRequestHandler - WebRequestHandler handler = new WebRequestHandler(); + WebRequestHandler handler = null; #endregion #endif + #endregion - #region WASのクライアント認証のセキュリティ資格情報 for WCF + #region DictionaryをCheckし... - NetworkCredential nwcWAS = this.CreateCredentials(props); - if (nwcWAS != null) + if (!this._handlerCD.ContainsKey(serviceName)) { - handler.Credentials = nwcWAS; - } + #region new ...Handler(); +#if NETSTD + #region HttpClientHandler + handler = new HttpClientHandler(); + #endregion +#else + #region WebRequestHandler + handler = new WebRequestHandler(); + #endregion +#endif + #endregion - #endregion + #region CookieContainerの設定 + if (this.CookieContainer != null) + handler.CookieContainer = this.CookieContainer; + #endregion - #region プロキシ経由の要求を行うためのプロキシ情報 + #region WASのクライアント認証のセキュリティ資格情報 for WCF - WebProxy proxy = this.CreateProxy(props); - if (proxy != null) - { - handler.Proxy = proxy; - } + NetworkCredential nwcWAS = this.CreateCredentials(props); + if (nwcWAS != null) + { + handler.Credentials = nwcWAS; + } - #endregion + #endregion - #region HTTP圧縮の有効・無効（Default：false） + #region プロキシ経由の要求を行うためのプロキシ情報 - if (!props.ContainsKey(FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION))// Dic化でnullチェック変更 - { - // XML定義：キーが無い - } - else - { - if (string.IsNullOrEmpty(props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION])) + WebProxy proxy = this.CreateProxy(props); + if (proxy != null) { - // XML定義：null or 空文字列 + handler.Proxy = proxy; } - else - { - // XML定義：あり - bool compress; + #endregion + + #region HTTP圧縮の有効・無効（Default：false） - if (Boolean.TryParse(props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION], out compress)) + if (!props.ContainsKey(FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION))// Dic化でnullチェック変更 + { + // XML定義：キーが無い + } + else + { + if (string.IsNullOrEmpty(props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION])) { - // 書式正常 - if (compress) - { - handler.AutomaticDecompression = - DecompressionMethods.GZip | DecompressionMethods.Deflate; - } + // XML定義：null or 空文字列 } else { - // パラメータ・エラー（書式不正） - throw new FrameworkException( - FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH2[0], - String.Format(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH2[1], - FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION - + "=" + props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION])); + // XML定義：あり + + bool compress; + + if (Boolean.TryParse(props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION], out compress)) + { + // 書式正常 + if (compress) + { + handler.AutomaticDecompression = + DecompressionMethods.GZip | DecompressionMethods.Deflate; + } + } + else + { + // パラメータ・エラー（書式不正） + throw new FrameworkException( + FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH2[0], + String.Format(FrameworkExceptionMessage.ERROR_IN_WRITING_OF_FX_SWITCH2[1], + FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION + + "=" + props[FxLiteral.TRANSMISSION_HTTP_PROP_ENABLEDE_COMPRESSION])); + } } } + + #endregion + + this._handlerCD[serviceName] = handler; + } + else + { + handler = this._handlerCD[serviceName]; } + + #endregion #endregion #region HttpClient - HttpClient client = new HttpClient(handler); + HttpClient client = null; + + #region DictionaryをCheckし... + if (!this._httpClientCD.ContainsKey(serviceName)) + { + client = new HttpClient(handler); //, disposeHandler: xxx); + // HttpClientFactoryはdisposeHandlerをfalseにして、 + // handlerをプールするらしいが、handler構築するには、 + // HttpClientBuilderなどを使う必要があるとか。 + } + else + { + client = this._httpClientCD[serviceName]; + } + #endregion HttpRequestMessage httpRequestMessage = null; HttpResponseMessage httpResponseMessage = null; @@ -929,11 +997,12 @@ public object Invoke(string serviceName, object parameterValue) Encoding.UTF8, "application/json"), }; - // タイムアウト指定、有り + #region タイムアウト if (0 <= timeout) { client.Timeout = TimeSpan.FromSeconds(timeout); } + #endregion #region クライアント証明書、エージェント ヘッダ、接続グループ.etc @@ -979,11 +1048,6 @@ public object Invoke(string serviceName, object parameterValue) #endregion - // HttpRequestMessage (Headers) - //httpRequestMessage.Headers.Add("Authorization", authHeader); - //httpRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("OAuth", authHeader); - //httpRequestMessage.Headers.ExpectContinue = false; - #endregion // 同期呼び出しで実行 @@ -997,6 +1061,7 @@ public object Invoke(string serviceName, object parameterValue) return ret; } + #endregion #region ヘルパー diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net45.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net45.sln index 8443a13ed..681d4b1d9 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net45.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net45.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.RichClient", "Framework\RichClient\Framework.RichClient_net45.csproj", "{3468B633-2CFE-4A1E-870F-396961E49A9E}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net46.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net46.sln index 54e8837ff..71e6ab042 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net46.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net46.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.RichClient", "Framework\RichClient\Framework.RichClient_net46.csproj", "{3468B633-2CFE-4A1E-870F-396961E49A9E}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore60.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore60.sln new file mode 100644 index 000000000..b71bf7ec2 --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore60.sln @@ -0,0 +1,37 @@ + +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}") = "Framework.RichClient_netcore60", "Framework\RichClient\Framework.RichClient_netcore60.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Public_netstd21", "Public\Public_netstd21.csproj", "{B7B97B7C-B8A2-44CC-AB00-107D634A45E7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework_netstd21", "Framework\Framework_netstd21.csproj", "{D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}" +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 + {B7B97B7C-B8A2-44CC-AB00-107D634A45E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7B97B7C-B8A2-44CC-AB00-107D634A45E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7B97B7C-B8A2-44CC-AB00-107D634A45E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7B97B7C-B8A2-44CC-AB00-107D634A45E7}.Release|Any CPU.Build.0 = Release|Any CPU + {D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}.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/programs/CS/Frameworks/Infrastructure/Nuget_net45.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_net45.sln index 1d5f46aeb..27e7e84f4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_net45.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_net45.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Public", "Public\Public_net45.csproj", "{81CC573A-0DF9-49E5-AF10-A50F9B194DA5}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_net46.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_net46.sln index e1f20b927..1ab1d013c 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_net46.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_net46.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Public", "Public\Public_net46.csproj", "{81CC573A-0DF9-49E5-AF10-A50F9B194DA5}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd20.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd20.csproj index 59e6e60f0..45fa0d9c4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd20.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd20.csproj @@ -3,7 +3,7 @@ netstandard2.0 OpenTouryo.DamManagedOdp Touryo.Infrastructure.Public.Db - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd21.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd21.csproj index 5e5c74368..74ec29a60 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd21.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd21.csproj @@ -3,7 +3,7 @@ netstandard2.1 OpenTouryo.DamManagedOdp Touryo.Infrastructure.Public.Db - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/Properties/AssemblyInfo.cs index c1bbdc31b..90adb995a 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/Properties/AssemblyInfo.cs @@ -62,4 +62,4 @@ // // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly: AssemblyVersion("2.7.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd20.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd20.csproj index 8c39b5589..135b1b0d9 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd20.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd20.csproj @@ -3,7 +3,7 @@ netstandard2.0 OpenTouryo.DamMySQL Touryo.Infrastructure.Public.Db - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd21.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd21.csproj index 2c73193ab..687425842 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd21.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd21.csproj @@ -3,7 +3,7 @@ netstandard2.1 OpenTouryo.DamMySQL Touryo.Infrastructure.Public.Db - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/Properties/AssemblyInfo.cs index 755d6694e..406e470f4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/Properties/AssemblyInfo.cs @@ -62,4 +62,4 @@ // // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly: AssemblyVersion("2.7.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.0.0")] \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd20.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd20.csproj index 3d84b77d4..4751b01c4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd20.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd20.csproj @@ -3,7 +3,7 @@ netstandard2.0 OpenTouryo.DamPstGrS Touryo.Infrastructure.Public.Db - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd21.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd21.csproj index cd2c676b4..d7fb616e6 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd21.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netstd21.csproj @@ -3,7 +3,7 @@ netstandard2.1 OpenTouryo.DamPstGrS Touryo.Infrastructure.Public.Db - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/Properties/AssemblyInfo.cs index db0280a01..d83cf3a25 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/Properties/AssemblyInfo.cs @@ -62,4 +62,4 @@ // // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly: AssemblyVersion("2.7.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.0.0")] \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Properties/AssemblyInfo.cs index cca2954e0..f728b20bc 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Properties/AssemblyInfo.cs @@ -62,4 +62,4 @@ // // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly: AssemblyVersion("2.7.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.0.0")] \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd20.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd20.csproj index d11cd12c1..132dc3c10 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd20.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd20.csproj @@ -4,7 +4,7 @@ netstandard2.0 OpenTouryo.Public Touryo.Infrastructure.Public - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd21.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd21.csproj index 3669aeaaf..fed7336af 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd21.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Public_netstd21.csproj @@ -4,7 +4,7 @@ netstandard2.1 OpenTouryo.Public Touryo.Infrastructure.Public - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Properties/AssemblyInfo.cs index 28600e2e5..0f116f94d 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Properties/AssemblyInfo.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Properties/AssemblyInfo.cs @@ -62,4 +62,4 @@ // // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly: AssemblyVersion("2.7.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.0.0")] \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd20.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd20.csproj index 6100528cd..129c41e99 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd20.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd20.csproj @@ -4,7 +4,7 @@ netstandard2.0 OpenTouryo.Public.Security Touryo.Infrastructure.Public.Security - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd21.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd21.csproj index b4a513ce5..9b87bbcbe 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd21.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netstd21.csproj @@ -4,7 +4,7 @@ netstandard2.1 OpenTouryo.Public.Security Touryo.Infrastructure.Public.Security - 2.7.0.0 + 3.0.0.0 Hitachi Solutions diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj index 92993312f..37f9d7efd 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj @@ -14,7 +14,7 @@ Properties ASPNETWebService ASPNETWebService - v4.6 + v4.8 true @@ -26,6 +26,7 @@ true True + true @@ -74,7 +75,6 @@ - @@ -85,7 +85,6 @@ ..\packages\Microsoft.AspNet.Cors.5.2.6\lib\net45\System.Web.Cors.dll - @@ -129,7 +128,6 @@ ..\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 diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs index 1b71fcf72..1ade4c420 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.cs +++ b/root/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 class FxController : ApiController } 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 = "－"; @@ -333,7 +339,10 @@ public class FxController : ApiController errorToString = ex.ToString(); - throw; // SoapExceptionになって伝播 + //throw; // SoapExceptionになって伝播しない + + // エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo); } finally { @@ -362,7 +371,14 @@ public class FxController : ApiController returnDic.Add("Return", CustomEncode.ToBase64String(ret)); returnDic.Add("ContextObject", CustomEncode.ToBase64String(contextObject)); - returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)); + if (returnValueObject != null) + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)); + } + else + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(BinarySerialize.ObjectToBytes(""))); + } return returnDic; } diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 797ebe6bd..848862967 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -1,4 +1,4 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - - - - - - - + + + + + + + - + @@ -215,74 +223,74 @@ - + - - + + - - + + - + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln index 3075dcd3b..26de6e55b 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore.sln +++ b/root/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/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj index f05ed04fe..dd279d138 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj +++ b/root/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/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs index 4b71d23c4..f8392cf96 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/FxController.cs @@ -31,6 +31,7 @@ //* ---------- ---------------- ------------------------------------------------- //* 2017/08/18 西野 大介 新規作成 //* 2019/11/18 西野 大介 .NET Core化 +//* 2021/05/18 西野 大介 ASP.NET WebAPI（JSON）の例外処理の問題を修正 //********************************************************************************** using System; @@ -323,6 +324,11 @@ public class FxController : ControllerBase } 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 class FxController : ControllerBase errorToString = ex.ToString(); - throw; // SoapExceptionになって伝播 + //throw; // SoapExceptionになって伝播しない + + // エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo); } finally { @@ -359,7 +368,14 @@ public class FxController : ControllerBase returnDic.Add("Return", CustomEncode.ToBase64String(ret)); returnDic.Add("ContextObject", CustomEncode.ToBase64String(contextObject)); - returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)); + if (returnValueObject != null) + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)); + } + else + { + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(BinarySerialize.ObjectToBytes(""))); + } return returnDic; } diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json index c4fddfd02..3a7af5d27 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json +++ b/root/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", @@ -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/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 5a573f741..ebc35a5a5 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -4,67 +4,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -72,11 +72,11 @@ - + - + @@ -84,9 +84,9 @@ - - + + - \ No newline at end of file + diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj index 352fd5ff8..4c2ab97fc 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.csproj @@ -10,7 +10,7 @@ Properties WCFService WCFService - v4.6 + v4.8 512 diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SampleLogConf.xml b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SampleLogConf.xml index c741055c1..9871550bd 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SampleLogConf.xml +++ b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SampleLogConf.xml @@ -1,178 +1,178 @@  - - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SampleLogConf.xml b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SampleLogConf.xml index c741055c1..9871550bd 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SampleLogConf.xml +++ b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SampleLogConf.xml @@ -1,178 +1,178 @@  - - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/appsettings.json b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/appsettings.json index 2051b82d7..b0a68e29e 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/appsettings.json +++ b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/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/programs/CS/Frameworks/Tests/TestCode/SampleLogConf.xml b/root/programs/CS/Frameworks/Tests/TestCode/SampleLogConf.xml index b4f4c57ef..9871550bd 100644 --- a/root/programs/CS/Frameworks/Tests/TestCode/SampleLogConf.xml +++ b/root/programs/CS/Frameworks/Tests/TestCode/SampleLogConf.xml @@ -7,33 +7,34 @@ - + - + @@ -141,12 +142,12 @@ --> - + @@ -224,10 +224,10 @@ - - + + - + diff --git a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json index 92e55d6d8..af4c4a6e3 100644 --- a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json +++ b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/appsettings.json @@ -5,15 +5,15 @@ // ★入力項目（初期化） // 接続文字列 - "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", "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/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj index 4192c8725..d8ab70778 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj +++ b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj @@ -23,7 +23,7 @@ 3.5 - v4.6 + v4.8 true diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln index 80bace3af..b1d0d316d 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {52D312DC-E37A-4F2A-AF7F-AECDC645D53F} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj index 2a624db99..0ecd0ef7e 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj +++ b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net6.0-windows true @@ -43,19 +43,19 @@ - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Business.RichClient.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Business.RichClient.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Framework.RichClient.dll - ..\..\Infrastructure\Build_netcore50\net5.0-windows\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_netcore60\net6.0-windows\OpenTouryo.Public.dll diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln index 929d9752d..459dbdeae 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln +++ b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30320.27 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployZipPackWithHTTPCore", "DeployZipPackWithHTTPCore.csproj", "{B988A3B4-7296-4491-878B-7C3C2A330A1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployZipPackWithHTTPCore", "DeployZipPackWithHTTPCore.csproj", "{B988A3B4-7296-4491-878B-7C3C2A330A1F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml index 54a4dd7f2..b443b2c36 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml +++ b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml @@ -3,82 +3,82 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - + + + + + + + diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs index 82c2b5bb8..c95192591 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs +++ b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.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 DeployZipPackWithHTTP.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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resource { @@ -33,7 +33,7 @@ internal class Resource { } /// - /// 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 { @@ -47,8 +47,8 @@ internal class Resource { } /// - /// 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 { @@ -61,7 +61,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /HELP Show me the HELP.. + /// /HELP Show me the HELP. に類似しているローカライズされた文字列を検索します。 /// internal static string A0001 { get { @@ -70,7 +70,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /CUI I will start in CUI CUI.. + /// /CUI I will start in CUI CUI. に類似しているローカライズされた文字列を検索します。 /// internal static string A0002 { get { @@ -79,7 +79,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Below, valid options argument only when CUI. + /// Below, valid options argument only when CUI に類似しているローカライズされた文字列を検索します。 /// internal static string A0003 { get { @@ -88,7 +88,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to / Force update to erase the FORCE history file.. + /// / Force update to erase the FORCE history file. に類似しているローカライズされた文字列を検索します。 /// internal static string A0004 { get { @@ -97,7 +97,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /QUIET (Hide the message) that you can run in quiet mode .. + /// /QUIET (Hide the message) that you can run in quiet mode . に類似しているローカライズされた文字列を検索します。 /// internal static string A0005 { get { @@ -106,7 +106,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /SILENT (Hide message, the progress) that will run in silent mode.. + /// /SILENT (Hide message, the progress) that will run in silent mode. に類似しているローカライズされた文字列を検索します。 /// internal static string A0006 { get { @@ -115,7 +115,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /NB Ignore start instruction assembly even if they are specified in the manifest file.. + /// /NB Ignore start instruction assembly even if they are specified in the manifest file. に類似しているローカライズされた文字列を検索します。 /// internal static string A0007 { get { @@ -124,7 +124,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /WWWURL I Specifies the URL to the manifest file of \ "http://xxxx \" WWW server.. + /// /WWWURL I Specifies the URL to the manifest file of \ "http://xxxx \" WWW server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0008 { get { @@ -133,7 +133,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /WWWUID xxxx WWW Specifies the user ID when accessing the server.. + /// /WWWUID xxxx WWW Specifies the user ID when accessing the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0009 { get { @@ -142,7 +142,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /WWWPWD xxxx WWW Specifies the password used to access the server.. + /// /WWWPWD xxxx WWW Specifies the password used to access the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0010 { get { @@ -151,7 +151,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /WWWDomain xxxx WWW You specify the domain when accessing to the server.. + /// /WWWDomain xxxx WWW You specify the domain when accessing to the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0011 { get { @@ -160,7 +160,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /ProxyURL \"http://yyyy\" Proxy I specify the URL to the server.. + /// /ProxyURL \"http://yyyy\" Proxy I specify the URL to the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0012 { get { @@ -169,7 +169,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to If it is not specified, and then apply the IE setting.. + /// If it is not specified, and then apply the IE setting. に類似しているローカライズされた文字列を検索します。 /// internal static string A0013 { get { @@ -178,7 +178,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to It does not use a proxy [none] is specified.. + /// It does not use a proxy [none] is specified. に類似しているローカライズされた文字列を検索します。 /// internal static string A0014 { get { @@ -187,7 +187,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /ProxyUID yyyy Proxy Specifies the user ID when accessing the server.. + /// /ProxyUID yyyy Proxy Specifies the user ID when accessing the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0015 { get { @@ -196,7 +196,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /ProxyPWD yyyy Proxy Specifies the password used to access the server.. + /// /ProxyPWD yyyy Proxy Specifies the password used to access the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0016 { get { @@ -205,7 +205,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /ProxyDomain yyyy Proxy You specify the domain when accessing to the server.. + /// /ProxyDomain yyyy Proxy You specify the domain when accessing to the server. に類似しているローカライズされた文字列を検索します。 /// internal static string A0017 { get { @@ -214,7 +214,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to /UnIns \"http://xxxx\" WWW Specify the URL to the manifest file on the server (uninstall).. + /// /UnIns \"http://xxxx\" WWW Specify the URL to the manifest file on the server (uninstall). に類似しているローカライズされた文字列を検索します。 /// internal static string A0018 { get { @@ -223,7 +223,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to An error has occurred.. + /// An error has occurred. に類似しているローカライズされた文字列を検索します。 /// internal static string E0001 { get { @@ -232,7 +232,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Delete Exception:. + /// Delete Exception: に類似しているローカライズされた文字列を検索します。 /// internal static string E0002 { get { @@ -241,7 +241,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Error. + /// Error に類似しているローカライズされた文字列を検索します。 /// internal static string Error0001 { get { @@ -250,7 +250,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Summary (compression). + /// Summary (compression) に類似しているローカライズされた文字列を検索します。 /// internal static string Error0002 { get { @@ -259,7 +259,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Summary (De). + /// Summary (De) に類似しているローカライズされた文字列を検索します。 /// internal static string Error0003 { get { @@ -268,7 +268,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to ZIP file |*.Zip. + /// ZIP file |*.Zip に類似しているローカライズされた文字列を検索します。 /// internal static string EXT0001 { get { @@ -277,7 +277,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Production start of {0}. + /// Production start of {0} に類似しているローカライズされた文字列を検索します。 /// internal static string I0001 { get { @@ -286,7 +286,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Write start of {0}. + /// Write start of {0} に類似しているローカライズされた文字列を検索します。 /// internal static string I0002 { get { @@ -295,7 +295,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to I wrote {0} / {1} bytes. + /// I wrote {0} / {1} bytes に類似しているローカライズされた文字列を検索します。 /// internal static string I0003 { get { @@ -304,7 +304,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Write end of {0}. + /// Write end of {0} に類似しているローカライズされた文字列を検索します。 /// internal static string I0004 { get { @@ -313,7 +313,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Writing of entry for {1} (s) has (have) completed {0} or in. + /// Writing of entry for {1} (s) has (have) completed {0} or in に類似しているローカライズされた文字列を検索します。 /// internal static string I0005 { get { @@ -322,7 +322,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Creation end of {0}. + /// Creation end of {0} に類似しているローカライズされた文字列を検索します。 /// internal static string I0006 { get { @@ -331,7 +331,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Message. + /// Message に類似しているローカライズされた文字列を検索します。 /// internal static string M0001 { get { @@ -340,7 +340,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to <Message>. + /// <Message> に類似しているローカライズされた文字列を検索します。 /// internal static string M0002 { get { @@ -349,7 +349,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to <Stack trace>. + /// <Stack trace> に類似しているローカライズされた文字列を検索します。 /// internal static string M0003 { get { @@ -358,7 +358,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to <Internal exception>. + /// <Internal exception> に類似しているローカライズされた文字列を検索します。 /// internal static string M0004 { get { @@ -367,7 +367,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Message. + /// Message に類似しているローカライズされた文字列を検索します。 /// internal static string M0005 { get { @@ -376,7 +376,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to CUI start. + /// CUI start に類似しているローカライズされた文字列を検索します。 /// internal static string M0006 { get { @@ -385,7 +385,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to GUI boot. + /// GUI boot に類似しているローカライズされた文字列を検索します。 /// internal static string M0007 { get { @@ -394,7 +394,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Delete Exception:. + /// Delete Exception: に類似しているローカライズされた文字列を検索します。 /// internal static string M0008 { get { @@ -403,7 +403,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to 'Already exists.. + /// 'Already exists. に類似しているローカライズされた文字列を検索します。 /// internal static string M0009 { get { @@ -412,7 +412,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to You do not do anything with 'no' overwrite with 'yes' stop 'Cancel'. + /// You do not do anything with 'no' overwrite with 'yes' stop 'Cancel' に類似しているローカライズされた文字列を検索します。 /// internal static string M0010 { get { @@ -421,7 +421,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Overwrite Confirmation. + /// Overwrite Confirmation に類似しているローカライズされた文字列を検索します。 /// internal static string M0011 { get { @@ -430,7 +430,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Current directory. + /// Current directory に類似しているローカライズされた文字列を検索します。 /// internal static string M0012 { get { @@ -439,7 +439,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Start-up conditions. + /// Start-up conditions に類似しているローカライズされた文字列を検索します。 /// internal static string M0013 { get { @@ -448,7 +448,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Value. + /// Value に類似しているローカライズされた文字列を検索します。 /// internal static string M0014 { get { @@ -457,7 +457,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Command value. + /// Command value に類似しているローカライズされた文字列を検索します。 /// internal static string M0015 { get { @@ -466,7 +466,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Successful completion. + /// Successful completion に類似しているローカライズされた文字列を検索します。 /// internal static string S0001 { get { @@ -475,7 +475,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Abnormal termination. + /// Abnormal termination に類似しているローカライズされた文字列を検索します。 /// internal static string S0002 { get { @@ -484,7 +484,7 @@ internal class Resource { } /// - /// Looks up a localized string similar to Compression. + /// Compression に類似しているローカライズされた文字列を検索します。 /// internal static string T0001 { get { diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config index 8861ae81c..64b989c0c 100644 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config +++ b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config @@ -3,24 +3,24 @@ - + - + - + - - + + - + - - + + - \ No newline at end of file + diff --git a/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/App.config b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/App.config new file mode 100644 index 000000000..4dc78b535 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_Tool.csproj b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_Tool.csproj new file mode 100644 index 000000000..ebdb27bd2 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_Tool.csproj @@ -0,0 +1,81 @@ + + + + + Debug + AnyCPU + {2F7D1A24-3882-4425-AC49-1E623D19C549} + Exe + DistributeFile_Tool + OpenTouryo.DistributeFile_Tool + v4.8 + 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/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_Tool.sln b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_Tool.sln new file mode 100644 index 000000000..44402eb1d --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_Tool.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributeFile_Tool", "DistributeFile_Tool.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/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_ToolCore.csproj b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_ToolCore.csproj new file mode 100644 index 000000000..d9751d986 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_ToolCore.csproj @@ -0,0 +1,33 @@ + + + + Exe + net6.0 + DistributeFile_Tool + OpenTouryo.DistributeFile_Tool + + + + TRACE;NETCOREAPP + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_ToolCore.sln b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_ToolCore.sln new file mode 100644 index 000000000..58290f377 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/DistributeFile_ToolCore.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}") = "DistributeFile_ToolCore", "DistributeFile_ToolCore.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/programs/CS/Frameworks/Tools/DistributeFile_Tool/Program.cs b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/Program.cs new file mode 100644 index 000000000..05dc495e9 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/Program.cs @@ -0,0 +1,205 @@ +//********************************************************************************** +//* クラス名 ：Program +//* クラス日本語名 ：修正ファイルの配布ツール +//* +//* 作成日時 ：－ +//* 作成者 ：開発基盤部会 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 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: "--src-file", + description: "Copy source file."), + new Option( + alias: "--dst-root-directory", + description: "Copy destination root directory."), + new Option( + alias: "--excluded-directory-list", + getDefaultValue: () => "bin;obj;.git;.svn;.vs;packages;node_modules;temp", + description: "Semicolon delimited excluded directory list."), + }; + + 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< FileInfo, DirectoryInfo, string> (Program.RootCommand); + #endregion + + // テストの実行 + await Program.Test(rootCommand); + + // Parse the incoming args and invoke the handler + return rootCommand.InvokeAsync(args).Result; + } + + #region Command + + /// StringBuilder + static StringBuilder sb4Log = null; + + /// RootCommand + /// FileInfo + /// DirectoryInfo + /// string + private static void RootCommand( + FileInfo srcFile, DirectoryInfo dstRootDirectory, string excludedDirectoryList) + { + // 引数確認 + Console.WriteLine( + $"--src-file is: {srcFile?.Name ?? "null"}, " + + $"--dst-root-directory is: {dstRootDirectory?.Name?? "null"}, " + + $"--excluded-directory-list is: {excludedDirectoryList}, "); + + // 実行準備 + Program.sb4Log = new StringBuilder(); + string[] _excludedDirectoryList = excludedDirectoryList.Split(';'); + + // 再帰実行 + Console.CursorVisible = false; + Program.WalkDirectoryTree(srcFile, dstRootDirectory, _excludedDirectoryList); + Console.CursorVisible = true; + + // 終了処理 + Console.WriteLine(""); + Console.WriteLine(""); + Console.WriteLine("- Result Log -"); + Console.WriteLine(Program.sb4Log.ToString()); + Console.ReadKey(); // デバッグ用 + } + + /// ShowProgress + /// string + static void ShowProgress(string str) + { + int prePos = Console.CursorLeft;//現在カーソル位置を取得 + Console.SetCursorPosition(0, Console.CursorTop); + Console.Write(str.PadRight(prePos));//前のカーソル位置まで空白埋めする + + //（進行が見えるように）処理を5ミリ秒間休止 + Thread.Sleep(5); + } + + /// WalkDirectoryTree + /// FileInfo + /// DirectoryInfo + /// string[] + static void WalkDirectoryTree( + FileInfo srcFile, DirectoryInfo currentDirectory, string[] excludedDirectoryList) + { + FileInfo[] files = null; + DirectoryInfo[] subDirs = null; + + if (currentDirectory == null) + { + return; + } + else + { + // 進行状況を表示 + Program.ShowProgress(currentDirectory.Name); + } + + // First, process all the files directly under this folder + // 最初に、このフォルダ直下のすべてのファイルを処理する。 + files = currentDirectory.GetFiles("*.*"); + foreach (FileInfo fi in files) + { + // 進行状況を表示 + Program.ShowProgress(fi.Name); + + if (fi.Name.ToLower() == srcFile.Name.ToLower()) + { + // 置き換え + try + { + // 正常 + srcFile.CopyTo(fi.FullName, true); + // ログ + sb4Log.AppendLine(fi.FullName); + } + catch (Exception e) + { + // 異常 + // ログ + sb4Log.AppendLine(e.Message); + } + } + } + + subDirs = currentDirectory.GetDirectories(); + foreach (DirectoryInfo di in subDirs) + { + // チェック + bool skip = false; + foreach (string exDL in excludedDirectoryList) + { + if (di.Name.ToLower() == exDL.ToLower()) + { + // スキップ + skip = true; + } + } + + // 再帰 + if (!skip) + { + if(di != null) + Program.WalkDirectoryTree(srcFile, di, excludedDirectoryList); + } + } + } + #endregion + + #region TEST + /// Test + /// Command + /// Task + private static async Task Test(Command rootCommand) + { + // デバッグ実行時だけ実行 + if (!Debugger.IsAttached) return; + + await rootCommand.InvokeAsync("--src-file OpenTouryo.DistributeFile_Tool.exe --dst-root-directory ."); + } + #endregion + } +} diff --git a/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..1dd25b6e7 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +// 制御されます。アセンブリに関連付けられている情報を変更するには、 +// これらの属性値を変更します。 +[assembly: AssemblyTitle("OpenTouryo.DistributeFile_Tool")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("OpenTouryo.DistributeFile_Tool")] +[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/programs/CS/Frameworks/Tools/DistributeFile_Tool/README.md b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/README.md new file mode 100644 index 000000000..91bc2f31c --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/README.md @@ -0,0 +1 @@ +同名ファイルの配布ツール（開発フォルダから、各テンプレート・フォルダに配布する的な使い方。 \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/packages.config b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root/programs/CS/Frameworks/Tools/DistributeFile_Tool/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec b/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec index 717ba5a25..3baae3512 100644 --- a/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec +++ b/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Public.Db.DamManagedOdp OpenTouryo.DamManagedOdp - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 @@ -17,27 +17,27 @@ OpenTouryo Open棟梁 - + - + - + - + - + - + diff --git a/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec b/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec index 3aefba085..82fa28c4b 100644 --- a/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec +++ b/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Public.Db.DamMySQL OpenTouryo.DamMySQL - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 @@ -17,31 +17,31 @@ OpenTouryo Open棟梁 - + - + - + - + - + - + diff --git a/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec b/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec index f51620cba..7e46f346e 100644 --- a/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec +++ b/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Public.Db.DamPstGrS OpenTouryo.DamPstGrS - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 @@ -17,39 +17,39 @@ OpenTouryo Open棟梁 - + - + - + - + - + - + diff --git a/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec b/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec index 2f94ce25d..a3357be56 100644 --- a/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec +++ b/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Framework.RichClient OpenTouryo.Framework.RichClient - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 @@ -17,28 +17,32 @@ OpenTouryo Open棟梁 - - + + - - + + - - + + - - + + - - + + - - + + + + + + @@ -68,6 +72,10 @@ + + + + diff --git a/root/programs/CS/NuGet/Symbol_Framework.nuspec b/root/programs/CS/NuGet/Symbol_Framework.nuspec index 308786471..aadaa155d 100644 --- a/root/programs/CS/NuGet/Symbol_Framework.nuspec +++ b/root/programs/CS/NuGet/Symbol_Framework.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Framework OpenTouryo.Framework - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 @@ -17,7 +17,7 @@ OpenTouryo Open棟梁 - + @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/root/programs/CS/NuGet/Symbol_Public.Security.nuspec b/root/programs/CS/NuGet/Symbol_Public.Security.nuspec index fe50acf35..0e8ba11b8 100644 --- a/root/programs/CS/NuGet/Symbol_Public.Security.nuspec +++ b/root/programs/CS/NuGet/Symbol_Public.Security.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Public.Security OpenTouryo.Public.Security - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 @@ -17,31 +17,31 @@ OpenTouryo Open棟梁 - + - + - + - + - + @@ -50,7 +50,7 @@ - + diff --git a/root/programs/CS/NuGet/Symbol_Public.nuspec b/root/programs/CS/NuGet/Symbol_Public.nuspec index fc8dc2622..dfad125c5 100644 --- a/root/programs/CS/NuGet/Symbol_Public.nuspec +++ b/root/programs/CS/NuGet/Symbol_Public.nuspec @@ -3,7 +3,7 @@ Touryo.Infrastructure.Public OpenTouryo.Public - 2.7.0 + 3.0.0 OSS Consortium .net subcommittee daisukenishino77 Apache-2.0 diff --git a/root/programs/CS/NuGet/_NuGetPack.bat b/root/programs/CS/NuGet/_NuGetPack.bat index b0943094f..6427584bd 100644 --- a/root/programs/CS/NuGet/_NuGetPack.bat +++ b/root/programs/CS/NuGet/_NuGetPack.bat @@ -10,6 +10,8 @@ xcopy /E /Y "..\Frameworks\Infrastructure\Build_netstd21\netstandard2.1" "in\net xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore30\netcoreapp3.0" "in\netcoreapp3.0" xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore50\net5.0" "in\net5.0" xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows" "in\net5.0-windows" +xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore60\net6.0" "in\net6.0" +xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows" "in\net6.0-windows" "..\..\nuget.exe" pack Symbol_Public.nuspec -OutputDirectory "out\sp" -Symbols -SymbolPackageFormat snupkg "..\..\nuget.exe" pack Symbol_Public.Security.nuspec -OutputDirectory "out\sp" -Symbols -SymbolPackageFormat snupkg diff --git "a/root/programs/CS/NuGet/in/net6.0-windows/net6.0-windows\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" "b/root/programs/CS/NuGet/in/net6.0-windows/net6.0-windows\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" new file mode 100644 index 000000000..e69de29bb diff --git "a/root/programs/CS/NuGet/in/net6.0/net6.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" "b/root/programs/CS/NuGet/in/net6.0/net6.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" new file mode 100644 index 000000000..e69de29bb diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj index 453f1fafa..b71d5bc74 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index 87b8b2c9b..ce5af50d8 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root/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 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}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3B51B5D1-10B7-4FE9-8D6A-6F227513DBCB} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config index 2e1564550..d06f7b114 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + @@ -64,10 +64,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj index 7c24c90fe..e111047ee 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index d1b5dca28..3d0d196d7 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root/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 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 @@ -29,6 +29,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {21578BB7-F7BC-4381-A942-9F751F69FAD6} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config index 3a82195b4..b47ddd346 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + @@ -74,10 +74,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index d7d27694f..d3712f43a 100644 --- a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root/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 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}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" EndProject @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5F31C63F-D1AB-4F5C-BE3B-CEE6460E5177} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj b/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj index 8acfb0fc2..9373d4e88 100644 --- a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj +++ b/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj @@ -10,7 +10,7 @@ Properties WindowsFormsApplication WindowsFormsApplication - v4.6 + v4.8 512 diff --git a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj b/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj index accb99fc2..5181ecb37 100644 --- a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj b/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj index 5ecbb823e..98d29fc1e 100644 --- a/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj +++ b/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj @@ -10,7 +10,7 @@ Properties CustCtrl_sample CustCtrl_sample - v4.6 + v4.8 512 diff --git a/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 5f1c05a97..3b6daeb12 100644 --- a/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root/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 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}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E8A20C02-1EC7-4EC1-8EB5-A1905B23AF46} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj index e3f456541..99d33c088 100644 --- a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index 161cf10e5..877bdc218 100644 --- a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root/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 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}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" EndProject @@ -19,6 +19,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9D8314EF-566B-4DCF-94B3-17E42F0627FE} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs index c63bb41ed..31c5fce98 100644 --- a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.Designer.cs +++ b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/Properties/Resources.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 GenDaoAndBatUpd_sample.Properties { /// - /// 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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ internal class Resources { } /// - /// 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 { @@ -47,8 +47,8 @@ internal class Resources { } /// - /// 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 { @@ -61,7 +61,7 @@ internal class Resources { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// internal static System.Drawing.Bitmap Diagram { get { diff --git a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index bc4d130f6..9a3a8a15e 100644 --- a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + @@ -46,10 +46,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj index db18a5aea..003283728 100644 --- a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 463f94c69..eb5761e1f 100644 --- a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root/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 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 @@ -29,6 +29,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {036AFF1D-0527-4DEA-8622-5CA6F27D0EE1} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config index 77bb0678e..1c1ff96e5 100644 --- a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + @@ -39,10 +39,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj index e88ba291c..7c074ec2c 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 674484c03..a2ccd78f2 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9218F2C-6838-4732-8781-368C4D6571AE} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config index 1ecc40783..3775ebc70 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + @@ -65,10 +65,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj index b6b73ce6c..fad23d929 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index fcfa7adec..2b6012eb1 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {79854448-2086-4E05-86A7-88B58D686DE6} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 424c150c2..46d7b9807 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + @@ -65,10 +65,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj index 699cb5f82..47ae48a99 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 389db2e21..5a997d542 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {810214F8-57F4-4A80-B13B-AAC547CA89EA} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 4e8a58e89..7349048f8 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + @@ -65,10 +65,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj index 3c3fa0ab3..59e0be3c1 100644 --- a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index effa44db0..00a9e2658 100644 --- a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6CAF0726-7971-4F3E-8DE8-DD42AF2BD736} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config index f87867ac7..61768546e 100644 --- a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + @@ -65,10 +65,10 @@ - - + + - + diff --git a/root/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md b/root/programs/CS/Samples/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..9597c69bf --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md b/root/programs/CS/Samples/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..f1fb33853 --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/README.md b/root/programs/CS/Samples/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln b/root/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..f247c2e4a --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config b/root/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config new file mode 100644 index 000000000..9a6820f73 --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs b/root/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Program.cs new file mode 100644 index 000000000..bcd9704c4 --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs b/root/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..69118115c --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj new file mode 100644 index 000000000..e56f1e9b6 --- /dev/null +++ b/root/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/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config b/root/programs/CS/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root/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/programs/CS/Samples/WS_sample/ASPNETWebService/README.md b/root/programs/CS/Samples/WS_sample/ASPNETWebService/README.md new file mode 100644 index 000000000..00c5ea578 --- /dev/null +++ b/root/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/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj index 22371632c..d9aafd9b0 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 18d0e984f..a19dfd063 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root/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 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 @@ -45,4 +45,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8C83C969-EEA4-42A9-984F-07D87415F94F} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index a3b4f1db5..09f470d15 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + @@ -86,20 +86,20 @@ - + - - + + - - + + - - + + @@ -107,19 +107,19 @@ - + - + - - + + - + diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj index 33dcd210c..62eb6f72c 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index 01c2ce261..6329ecb55 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root/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 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}" EndProject @@ -29,6 +29,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2B346B3C-93CF-481D-B732-421247A47125} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config index 6734fd9de..7f9024809 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config @@ -1,4 +1,4 @@ - + @@ -25,7 +25,7 @@ - + @@ -42,9 +42,9 @@ - - + + - + diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj index c4798e14e..b553a8f3d 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.csproj @@ -11,13 +11,13 @@ WSClientWinCone_sample WSClientWinCone_sample true - 7A5F68587972EC9A9F4493D3C883F9A865E8C3E1 + 3EF7975C53AD5C0AE4FF5B806D20C1C7A1A0372F Internet true true false WSClientWinCone_sample_TemporaryKey.pfx - v4.6 + v4.8 2.0 diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln index 6d1640ae4..d44dc78cc 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln +++ b/root/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 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 @@ -71,6 +71,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {1D44D01A-16BA-43A2-8C23-4650034C88D0} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config index 826dc22ff..59193266a 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/app.config @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ - - - - - + + + + + - + @@ -24,15 +24,15 @@ - + - - + + @@ -42,40 +42,40 @@ - + - - - + + + - + - + - - + + - - + + - - + + @@ -83,19 +83,19 @@ - + - + - - + + - + diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj index c90e195aa..907e9f0ef 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 61c361e35..255f507fa 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root/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 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 @@ -71,6 +71,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5A32BF48-E092-44E5-AC5E-37695C033134} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index ff7de67d9..703450edc 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -1,4 +1,4 @@ - + @@ -11,13 +11,13 @@ - - - - - + + + + + - + @@ -25,10 +25,10 @@ - - - - + + + + @@ -47,71 +47,71 @@ - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + @@ -119,19 +119,19 @@ - + - + - - + + - \ No newline at end of file + diff --git a/root/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj b/root/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj index 711f76a1a..292014c47 100644 --- a/root/programs/CS/Samples/WS_sample/WSIFType_sample/WSIFType_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj b/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj index bfe14b822..1a5330ea5 100644 --- a/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index f4715985f..542e4066e 100644 --- a/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root/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 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 @@ -41,6 +41,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E6F8023B-95B5-4E50-BDD1-19D492211B47} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index 31fc8f071..2e8524904 100644 --- a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {88F3382F-FB44-41C0-94D6-210E7FA94790} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root/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/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj index a410adb9c..243e2e7fb 100644 --- a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj +++ b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.csproj @@ -14,7 +14,7 @@ Properties MVC_Sample MVC_Sample - v4.6 + v4.8 false true @@ -27,6 +27,7 @@ true 3.0 + true @@ -105,6 +106,8 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll @@ -134,19 +137,18 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - diff --git a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index c5a15b167..a2bec2c0d 100644 --- a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -1,4 +1,4 @@ - + - + - + - + - + - + - + - + - + - + + - + - + - - - - - - - + + + + + + + - + - + - + - + - + - - + + + + + + + - + + + + + + + - + + + + + + + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln index 9d1d86749..87c64d82a 100644 --- a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {84A77EC5-32F6-416B-9E7B-753F846494E8} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root/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/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config index cf84579c4..422c81417 100644 --- a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config +++ b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Web.config @@ -1,4 +1,4 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - - - - - - - + + + + + - - - - - + + - - - - - - - - - - - - + + + + - - - - - - - - - + + + + - - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj index d24d58efc..030d0b22f 100644 --- a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj +++ b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.csproj @@ -14,7 +14,7 @@ Properties WebForms_Sample WebForms_Sample - v4.6 + v4.8 true 44333 @@ -26,6 +26,7 @@ true 3.0 + true @@ -121,25 +122,25 @@ ..\packages\Microsoft.AspNet.ScriptManager.WebForms.5.0.0\lib\net45\Microsoft.ScriptManager.WebForms.dll True + + + + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll True diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln index cfc04c9f5..bf85358c0 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln +++ b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln @@ -1,9 +1,9 @@  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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{A50D383C-5135-445D-924C-E3B851F13CBE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{A50D383C-5135-445D-924C-E3B851F13CBE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Controllers/Crud2Controller.cs new file mode 100644 index 000000000..07fcb6a6f --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj index 68141f0b9..adbceb116 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj +++ b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 true @@ -10,6 +10,7 @@ + @@ -17,22 +18,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 diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs index a83f23ead..ed128c91a 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Startup.cs +++ b/root/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(); diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/Index.cshtml new file mode 100644 index 000000000..6cfae25bc --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_ChartView.cshtml new file mode 100644 index 000000000..a94e07247 --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Views/Crud2/_MessageView.cshtml new file mode 100644 index 000000000..81b2a5671 --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json index 633e0e40b..c68bb3c15 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/appsettings.json +++ b/root/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", @@ -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/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/wwwroot/css/touryo/Style.css +++ b/root/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/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj index 1f1813a94..9c86568a0 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj +++ b/root/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 @@ -52,7 +52,4 @@ Always - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index a58a56287..4b38596b5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root/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 = {042D9C6D-8D8A-4A5E-89D4-274F3A02DE37} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json index df0f1a607..11f861805 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/appsettings.json +++ b/root/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用 @@ -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/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj index 1e42c74f5..bf30e91f5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj +++ b/root/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 diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index 37733c8b7..8f757b3d8 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root/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 = {16589D88-D4B8-4BF4-9F99-ECEAEAD62EC0} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json index b8e4882b0..dab0064a6 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/appsettings.json +++ b/root/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用 @@ -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/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index ada5d61b8..fb8a485ed 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root/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 = {44DB2E7E-C22D-4FC4-A784-8964A2A059E5} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj index c71d2afb1..539731498 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj index 71a55e513..97ee87a85 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj index 96798ed52..0a8c3b2d0 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 071185357..d2acd42bf 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root/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 = {B73FC2DE-1303-4B9F-9CE8-7E5DBF51AB60} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj index 72e888eb4..4125b43b2 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj +++ b/root/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 @@ -205,7 +205,4 @@ Always - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index c828a4cef..a7b4fad6e 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root/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 = {4D56765A-6A68-4CD9-B917-FFAD25FCB375} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json index 75817e64f..368cc20d4 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/appsettings.json +++ b/root/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 @@ -33,7 +33,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - //"SqlTextFilePath": ".\\Dao", + //"SqlTextFilePath": "./Dao", "SqlTextFilePath": "GenDaoAndBatUpd_sample.Dao" // アプリケーションの使用するパラメータ - end } diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj index e07de8b3c..69090c03a 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj +++ b/root/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 @@ -265,7 +265,4 @@ Always - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 983f7b036..ea10f0268 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root/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 = {56AE5913-535A-4A37-8DED-0A953F379617} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json index 689fe465f..26a898d0a 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/appsettings.json +++ b/root/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 @@ -26,7 +26,7 @@ // アプリケーションの使用するパラメータ - start // SQLファイルファイル（フォルダ）へのパス - "SqlTextFilePath": ".\\Dao", + "SqlTextFilePath": "./Dao", // アプリケーションの使用するパラメータ - end } } \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs index b2c06e646..456e066f9 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/Program.cs +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj index 800a5b3ef..801bead03 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 0dd7bf783..2b00681ee 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,9 +1,9 @@  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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json index 8cb408d65..6acfed80c 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/appsettings.json +++ b/root/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", @@ -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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs index 4a4c8db84..878cccf14 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/Program.cs +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj index 800a5b3ef..801bead03 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index 014704acf..a5427471c 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,9 +1,9 @@  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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json index 8cb408d65..6acfed80c 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/appsettings.json +++ b/root/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", @@ -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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs index 270d3df17..aa2d9d169 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/Program.cs +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj index 800a5b3ef..801bead03 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 0c2b94fd1..e87c96a4d 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,9 +1,9 @@  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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json index 8cb408d65..6acfed80c 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/appsettings.json +++ b/root/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", @@ -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/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs index 5ef0d898b..afe9a190d 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/Program.cs +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj index adf810757..6520677f5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 735280bb9..87bed367e 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root/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 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}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{4E1E7400-A012-49E2-8D28-A361F0E1BEE2}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json index 86ed07765..748953abb 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/appsettings.json +++ b/root/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", @@ -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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln new file mode 100644 index 000000000..3598a767f --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj b/root/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/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/Program.cs b/root/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/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/appsettings.json b/root/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/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..3fdab6ab5 --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln new file mode 100644 index 000000000..b858c704f --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj b/root/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/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/MSGDefinition.xml @@ -0,0 +1,23 @@ + + + + +]> + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/Program.cs b/root/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/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SPDefinition.xml @@ -0,0 +1,15 @@ + + + + +]> + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/SampleLogConf2CS.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/appsettings.json b/root/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/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..92cb873e9 --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..49bad92fe --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Program.cs new file mode 100644 index 000000000..077896f3f --- /dev/null +++ b/root/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/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj new file mode 100644 index 000000000..e90362af0 --- /dev/null +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj @@ -0,0 +1,14 @@ + + + + Exe + net6.0 + + + + + + + + + diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj index 608fa701e..195fcd798 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj +++ b/root/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 @@ -82,7 +82,4 @@ Always - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index ca5facab9..f1630e204 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root/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 = {F39D98F3-8539-4D46-9501-AD17A4978939} + EndGlobalSection EndGlobal diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json index 335da6f14..dcee014fb 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/appsettings.json +++ b/root/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 }, @@ -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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj index 0087c5e1a..0e597bb16 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj +++ b/root/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 @@ -51,7 +51,4 @@ Always - - - diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index 01c2ce261..d8f01fa77 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root/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 = {6CA41AA7-506E-4FEC-A53E-7A29ECB34695} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root/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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj index cfb7c58ad..1ab562bc5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj +++ b/root/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 @@ -84,7 +84,4 @@ Always - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 71fa00c42..6ef1a9af8 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root/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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json index 0e4d3fb02..7e3d73853 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/appsettings.json +++ b/root/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 @@ -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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj index 3c921ecd7..45e58925e 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj index fb5520bfa..bdcd61e9d 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj +++ b/root/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/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln index 2cd564b8b..2bb926b19 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root/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/programs/CS/z_Common.bat b/root/programs/CS/z_Common.bat index 316b1b414..fa944d38b 100644 --- a/root/programs/CS/z_Common.bat +++ b/root/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/programs/CS/z_Common2.bat b/root/programs/CS/z_Common2.bat index 5c83cd5f1..a7c6d4661 100644 --- a/root/programs/CS/z_Common2.bat +++ b/root/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/programs/VB/5_Build_CLI_sample.bat b/root/programs/VB/5_Build_CLI_sample.bat new file mode 100644 index 000000000..76ec3394b --- /dev/null +++ b/root/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/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb b/root/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb index 287385179..8a06fed8d 100644 --- a/root/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseController.vb +++ b/root/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/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb b/root/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb index 7ce382720..5d177d4c1 100644 --- a/root/programs/VB/Frameworks/Infrastructure/Business/Presentation/MyBaseMVController.vb +++ b/root/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/programs/VB/Frameworks/Infrastructure/Business/packages.config b/root/programs/VB/Frameworks/Infrastructure/Business/packages.config index baadb696d..146e9779b 100644 --- a/root/programs/VB/Frameworks/Infrastructure/Business/packages.config +++ b/root/programs/VB/Frameworks/Infrastructure/Business/packages.config @@ -1,12 +1,12 @@  - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net47.sln b/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net47.sln index 997fb7a0f..7b96302d9 100644 --- a/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net47.sln +++ b/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net47.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business.RichClient", "Business\RichClient\Business.RichClient_net47.vbproj", "{7649D699-681D-4BE0-9A36-24B0815ABCEF}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business.RichClient_net47", "Business\RichClient\Business.RichClient_net47.vbproj", "{7649D699-681D-4BE0-9A36-24B0815ABCEF}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl.RichClient", "CustomControl\RichClient\CustomControl.RichClient_net47.vbproj", "{76C5D665-A592-4A35-85D9-B75590E026AA}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl.RichClient_net47", "CustomControl\RichClient\CustomControl.RichClient_net47.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 = {E366CD67-5961-4B90-AB04-97E23BB08659} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln b/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln index dc0b6413c..e42ea8841 100644 --- a/root/programs/VB/Frameworks/Infrastructure/BusinessRichClient_net48.sln +++ b/root/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.30717.126 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 @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B5EDA025-E2E8-4F4D-A49C-14D2AADA91DD} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/VB/Frameworks/Infrastructure/Business_net47.sln b/root/programs/VB/Frameworks/Infrastructure/Business_net47.sln index 2c0c57fdc..82f687c12 100644 --- a/root/programs/VB/Frameworks/Infrastructure/Business_net47.sln +++ b/root/programs/VB/Frameworks/Infrastructure/Business_net47.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1209 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business", "Business\Business_net47.vbproj", "{BCB5C7D0-FBE4-43E2-8BED-096700A6A187}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Business_net47", "Business\Business_net47.vbproj", "{BCB5C7D0-FBE4-43E2-8BED-096700A6A187}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl", "CustomControl\CustomControl_net47.vbproj", "{64EDF4AB-8739-4027-976B-18BB731DAF76}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CustomControl_net47", "CustomControl\CustomControl_net47.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 = {F11E7AB1-870E-4BAF-84BA-DB729622493B} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/VB/Frameworks/Infrastructure/Business_net48.sln b/root/programs/VB/Frameworks/Infrastructure/Business_net48.sln index 913b1fcc8..44420de97 100644 --- a/root/programs/VB/Frameworks/Infrastructure/Business_net48.sln +++ b/root/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.30717.126 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 @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3800CEB5-07D9-440D-8B5C-FFE0771455A8} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj index 8d17ad312..4cb258a22 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj +++ b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/ASPNETWebService.vbproj @@ -15,7 +15,7 @@ ASPNETWebService - v4.6 + v4.8 true @@ -26,6 +26,7 @@ True + true @@ -85,8 +86,8 @@ ..\packages\Microsoft.AspNet.Cors.5.2.6\lib\net45\System.Web.Cors.dll - + ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll @@ -128,7 +129,6 @@ ..\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 @@ -136,6 +136,7 @@ ..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -199,6 +200,7 @@ True Application.myapp + True Microsoft.VisualBasic.Web.MyExtension diff --git a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb index c44226e89..9edfef1d2 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb +++ b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Controllers/FxController.vb @@ -30,6 +30,7 @@ '* 日時 更新者 内容 '* ---------- ---------------- ------------------------------------------------- '* 2017/08/18 西野 大介 新規作成 +'* 2021/05/18 西野 大介 ASP.NET WebAPI（JSON）の例外処理の問題を修正 '********************************************************************************** Imports System.Web.Http @@ -302,6 +303,11 @@ Namespace ASPNETWebService.Controllers ' エラー情報を戻す。 ret = BinarySerialize.ObjectToBytes(wsErrorInfo) Catch ex As Exception + ' エラー情報を設定する。 + wsErrorInfo.ErrorType = FxEnum.ErrorType.ElseException + 'wsErrorInfo.ErrorMessageID = fxEx.messageID; + wsErrorInfo.ErrorMessage = ex.Message + ' ログ出力用の情報を保存 errorType = FxEnum.ErrorType.ElseException.ToString() ' 2009/09/15-この行 @@ -310,8 +316,10 @@ Namespace ASPNETWebService.Controllers errorToString = ex.ToString() - ' SoapExceptionになって伝播 - Throw + 'throw; // SoapExceptionになって伝播しない + + ' エラー情報を戻す。 + ret = BinarySerialize.ObjectToBytes(wsErrorInfo) Finally '/ Sessionステートレス 'Session.Clear(); @@ -333,7 +341,11 @@ Namespace ASPNETWebService.Controllers returnDic.Add("Return", CustomEncode.ToBase64String(ret)) returnDic.Add("ContextObject", CustomEncode.ToBase64String(contextObject)) - returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)) + If returnValueObject IsNot Nothing Then + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(returnValueObject)) + Else + returnDic.Add("ReturnValueObject", CustomEncode.ToBase64String(BinarySerialize.ObjectToBytes(""))) + End If Return returnDic End Function diff --git a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb index fcb56b673..6b10a4b27 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Resources.Designer.vb +++ b/root/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/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb index 2337ac84f..6531b2d7b 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/My Project/Settings.Designer.vb +++ b/root/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/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config index 797ebe6bd..848862967 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config +++ b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService/Web.config @@ -1,4 +1,4 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - - - - - - - + + + + + + + - + @@ -215,74 +223,74 @@ - + - - + + - - + + - + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config index 8f11d58d9..bdaeede92 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config +++ b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config @@ -4,66 +4,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -71,11 +71,11 @@ - + - + @@ -83,9 +83,9 @@ - - + + - \ No newline at end of file + diff --git a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj index d79eae231..e17bab872 100644 --- a/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj +++ b/root/programs/VB/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.vbproj @@ -16,7 +16,7 @@ 512 true Console - v4.6 + v4.8 @@ -90,6 +90,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index 5bda2b70c..5747b660d 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {08D6631A-FECD-465D-B1A4-3773834A6781} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj b/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj index de20d3149..337061749 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.vbproj +++ b/root/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 diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config b/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config index bf1ddced5..dc8e33d14 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config +++ b/root/programs/VB/Samples/2CS_sample/2CSClientWPF_sample/app.config @@ -5,7 +5,7 @@ - + @@ -54,4 +54,4 @@ - + diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index e936ba371..edb87e973 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {42F3F391-ADC3-4B90-B58E-48E0B7346F5B} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj index 8f78e57be..c06a48dc5 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj +++ b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.vbproj @@ -11,7 +11,7 @@ _2CSClientWin_sample 2CSClientWin_sample WindowsFormsWithCustomSubMain - v4.6 + v4.8 @@ -113,6 +113,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb index 88dd01c78..8effad9c4 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config index 5acb4fc35..71b3cd102 100644 --- a/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config +++ b/root/programs/VB/Samples/2CS_sample/2CSClientWin_sample/app.config @@ -5,7 +5,7 @@ - + @@ -70,4 +70,4 @@ - + diff --git a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index 892963dbf..256a8c864 100644 --- a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root/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 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 @@ -25,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7E846297-F225-4201-9117-2DA00E2FAF29} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb index 2b68f1871..017f8cd82 100644 --- a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + 'メモ:このファイルは自動生成されました。直接変更しないでください。変更したり、 + ' ビルド エラーが発生した場合は、プロジェクト デザイナー へ移動し (プロジェクト + ' プロパティに移動するか、またはソリューション エクスプローラーのマイ プロジェクト + ' ノード上でダブルクリック)、アプリケーション タブ上で変更を行います。 ' Partial Friend Class MyApplication diff --git a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj index cf79c9cb4..f22ddd623 100644 --- a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj +++ b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.vbproj @@ -12,7 +12,7 @@ WindowsFormsApplication 512 WindowsForms - v4.6 + v4.8 On Binary Off @@ -93,6 +93,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj index 280d0b601..7e1ea0189 100644 --- a/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj +++ b/root/programs/VB/Samples/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.vbproj @@ -8,7 +8,7 @@ WinExe WpfApplication WpfApplication - v4.6 + v4.8 Custom On Binary diff --git a/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 70451a471..880f5dee1 100644 --- a/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {384F91E4-5E70-45FC-94E8-9DFA76C9AA58} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj b/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj index 2929ef9cd..370c9324b 100644 --- a/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.vbproj +++ b/root/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 @@ -93,6 +93,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb index 18ff2a614..cc2516049 100644 --- a/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/2CS_sample/CustCtrl_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + 'メモ:このファイルは自動生成されました。直接変更しないでください。変更したり、 + ' ビルド エラーが発生した場合は、プロジェクト デザイナー へ移動し (プロジェクト + ' プロパティに移動するか、またはソリューション エクスプローラーのマイ プロジェクト + ' ノード上でダブルクリック)、アプリケーション タブ上で変更を行います。 ' Partial Friend Class MyApplication diff --git a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index 5132ed4a5..b36045efd 100644 --- a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root/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 14 -VisualStudioVersion = 14.0.23107.0 +# 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {64062F27-5143-460E-8B94-C235029694E1} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.vbproj b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.vbproj index d07d78898..3664edb53 100644 --- a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.vbproj +++ b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.vbproj @@ -11,7 +11,7 @@ GenDaoAndBatUpd_sample GenDaoAndBatUpd_sample WindowsForms - v4.6 + v4.8 2.0 @@ -110,6 +110,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb index 196f365f0..b0394f7bd 100644 --- a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + 'メモ:このファイルは自動生成されました。直接変更しないでください。変更したり、 + ' ビルド エラーが発生した場合は、プロジェクト デザイナー へ移動し (プロジェクト + ' プロパティに移動するか、またはソリューション エクスプローラーのマイ プロジェクト + ' ノード上でダブルクリック)、アプリケーション タブ上で変更を行います。 ' Partial Friend Class MyApplication diff --git a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config index 4267704f1..2f92a6ebc 100644 --- a/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config +++ b/root/programs/VB/Samples/2CS_sample/GenDaoAndBatUpd_sample/app.config @@ -5,7 +5,7 @@ - + @@ -37,4 +37,4 @@ - + diff --git a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb index 5a0bfe533..41061a993 100644 --- a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + 'メモ:このファイルは自動生成されました。直接変更しないでください。変更したり、 + ' ビルド エラーが発生した場合は、プロジェクト デザイナー へ移動し (プロジェクト + ' プロパティに移動するか、またはソリューション エクスプローラーのマイ プロジェクト + ' ノード上でダブルクリック)、アプリケーション タブ上で変更を行います。 ' Partial Friend Class MyApplication diff --git a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index 8dee300b6..299ca2036 100644 --- a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F2B6C80D-C886-4074-AB38-427F4A15AA55} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj index e6d40218e..05ac693f6 100644 --- a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.vbproj +++ b/root/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 @@ -100,6 +100,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config index 6d1635664..9131839ab 100644 --- a/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config +++ b/root/programs/VB/Samples/2CS_sample/TimeStamp_sample/app.config @@ -5,7 +5,7 @@ - + @@ -30,4 +30,4 @@ - + diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 2c57ef890..3934a3017 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9BDF3CEB-DE9F-4D42-A7C1-E9DF933CBBF6} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj index 0249471e8..d1b76eecb 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.vbproj @@ -10,7 +10,7 @@ Properties RerunnableBatch_sample RerunnableBatch_sample - v4.6 + v4.8 diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config index e85299ce6..5631bf1f5 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample/app.config @@ -5,7 +5,7 @@ - + @@ -61,4 +61,4 @@ - + diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index 2da351b6c..40291fca1 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CF7F4091-B295-4122-AF8C-3E8A86A00215} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj index ae6bf5b9a..20071ed3c 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.vbproj @@ -25,7 +25,7 @@ false false true - v4.6 + v4.8 diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config index 4fbcec7b1..085f0c2da 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample2/app.config @@ -5,7 +5,7 @@ - + @@ -61,4 +61,4 @@ - + diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 14b19779a..4d7dfeda7 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B3991629-48D6-4C92-A2F0-7F1A4DFC17EB} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj index 55dab0114..dbcbada0e 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.vbproj @@ -25,7 +25,7 @@ false false true - v4.6 + v4.8 diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config index 63623a353..6121445c5 100644 --- a/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config +++ b/root/programs/VB/Samples/Bat_sample/RerunnableBatch_sample3/app.config @@ -5,7 +5,7 @@ - + @@ -61,4 +61,4 @@ - + diff --git a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb index 88dd01c78..8effad9c4 100644 --- a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ diff --git a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml +++ b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SampleLogConf2CS.xml @@ -3,131 +3,131 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FileAppender ：ファイルに出力。 + RollingFileAppender ：ファイルに出力。ローリング機能付き。 + EventLogAppender ：イベントビューアに出力（ローカルのPCのみ） + ConsoleAppender ：コンソールに出力 + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + その他、特定のレベルのログだけを出力したい + 場合にはFilterと呼ばれる機能を使用する。 + --> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 56241cddd..40e593416 100644 --- a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9D69667A-2E88-442F-BB1C-960CBCC7B3C7} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj index 2d33ea87e..e2ed8198f 100644 --- a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.vbproj +++ b/root/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 @@ -89,6 +89,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config index 1b5c24aa2..4928f4ecb 100644 --- a/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config +++ b/root/programs/VB/Samples/Bat_sample/SimpleBatch_sample/app.config @@ -5,7 +5,7 @@ - + @@ -61,4 +61,4 @@ - + diff --git a/root/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md b/root/programs/VB/Samples/CLI_sample/DAG_Login_CLI/README.md new file mode 100644 index 000000000..9597c69bf --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md b/root/programs/VB/Samples/CLI_sample/LIR_Login_CLI/README.md new file mode 100644 index 000000000..f1fb33853 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/README.md b/root/programs/VB/Samples/CLI_sample/Simple_CLI/README.md new file mode 100644 index 000000000..7bf4bfd6a --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI.sln new file mode 100644 index 000000000..6ab9deef1 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/App.config new file mode 100644 index 000000000..9a6820f73 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Module1.vb new file mode 100644 index 000000000..a1f1bf2a7 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.Designer.vb b/root/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/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Application.myapp new file mode 100644 index 000000000..e62f1a533 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/AssemblyInfo.vb new file mode 100644 index 000000000..0703c6780 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.Designer.vb b/root/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/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.Designer.vb b/root/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/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings new file mode 100644 index 000000000..85b890b3c --- /dev/null +++ b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.vbproj new file mode 100644 index 000000000..96e516611 --- /dev/null +++ b/root/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/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config b/root/programs/VB/Samples/CLI_sample/Simple_CLI/Simple_CLI/packages.config new file mode 100644 index 000000000..bd438e3c3 --- /dev/null +++ b/root/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/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/SampleLogConf2CS.xml +++ b/root/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/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 07922466e..773f0a3bd 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root/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 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 @@ -57,4 +57,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AE6C1D4E-7736-4241-A806-54E26D3473E0} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj index 41973b950..194b1a17b 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.vbproj +++ b/root/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 @@ -132,7 +132,7 @@ Always - + Always diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config index a3b4f1db5..09f470d15 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config +++ b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/app.config @@ -66,7 +66,7 @@ - + @@ -86,20 +86,20 @@ - + - - + + - - + + - - + + @@ -107,19 +107,19 @@ - + - + - - + + - + diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb index 88dd01c78..8effad9c4 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/SampleLogConf2CS.xml +++ b/root/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/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index 09d64096b..0ab460e90 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root/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 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 @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {87FF1D65-2414-4D80-A081-58EAD7FB484C} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj index 6856d7cac..10a99b448 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.vbproj +++ b/root/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 @@ -133,6 +133,7 @@ True Application.myapp + True Splash.vb diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config index 6734fd9de..7f9024809 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config +++ b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/app.config @@ -1,4 +1,4 @@ - + @@ -25,7 +25,7 @@ - + @@ -42,9 +42,9 @@ - - + + - + diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb index 88dd01c78..8effad9c4 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml index e39f2b3fe..476cea7c5 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/SampleLogConf2CS.xml +++ b/root/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/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 078cb6a57..a998b2910 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root/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 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 @@ -45,4 +45,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A1A55A74-0329-4E74-B2A2-D5649FB70C73} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj index e0bc1d153..3c1d1d89f 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.vbproj +++ b/root/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 @@ -127,6 +127,7 @@ True Application.myapp + True Splash.vb diff --git a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config index e7db09881..baa77b2b8 100644 --- a/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config +++ b/root/programs/VB/Samples/WS_sample/WSClient_sample/WSClientWin_sample/app.config @@ -1,4 +1,4 @@ - + @@ -11,13 +11,13 @@ - - - - - + + + + + - + @@ -25,10 +25,10 @@ - - - - + + + + @@ -47,31 +47,31 @@ - + - + - + - + - + - - - + + + - + - + @@ -80,40 +80,40 @@ - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + @@ -121,27 +121,27 @@ - + - + - - + + - - + + - - + + - + diff --git a/root/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb index 88dd01c78..8effad9c4 100644 --- a/root/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/WS_sample/WSIFType_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ diff --git a/root/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj b/root/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj index 81d8f0490..9ac844e79 100644 --- a/root/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj +++ b/root/programs/VB/Samples/WS_sample/WSIFType_sample/WSIFType_sample.vbproj @@ -11,7 +11,7 @@ WSIFType_sample Windows - v4.6 + v4.8 2.0 @@ -78,6 +78,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb b/root/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb index 88dd01c78..8effad9c4 100644 --- a/root/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.Designer.vb +++ b/root/programs/VB/Samples/WS_sample/WSServer_sample/My Project/Application.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. +' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +' コードが再生成されるときに損失したりします。 ' '------------------------------------------------------------------------------ diff --git a/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index cf570e7f6..a096765e1 100644 --- a/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root/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 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 @@ -25,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A1EDF313-0C1F-4EE6-8515-FC092C26C63B} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj b/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj index 17a6da118..cbcd3c891 100644 --- a/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj +++ b/root/programs/VB/Samples/WS_sample/WSServer_sample/WSServer_sample.vbproj @@ -11,7 +11,7 @@ WSServer_sample Windows - v4.6 + v4.8 2.0 @@ -86,6 +86,7 @@ True Application.myapp + True diff --git a/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index ad66d6ce5..62b6a464e 100644 --- a/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root/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.29613.14 +# 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/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css b/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css index 81812e812..9bf527574 100644 --- a/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Content/touryo/Style.css +++ b/root/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/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj b/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj index a10724d85..5e9061b4f 100644 --- a/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj +++ b/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/MVC_Sample.vbproj @@ -13,7 +13,7 @@ Library MVC_Sample MVC_Sample - v4.6 + v4.8 On Binary Off @@ -29,6 +29,7 @@ ..\ true 3.0 + true @@ -273,6 +274,10 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll + + + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll @@ -303,6 +308,7 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll True diff --git a/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config b/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config index 487b69d1e..a2bec2c0d 100644 --- a/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config +++ b/root/programs/VB/Samples/WebApp_sample/MVC_Sample/MVC_Sample/Web.config @@ -1,4 +1,4 @@ - + - + - + - + - + - + - + - + - + - + + - + - + - - - - - - - + + + + + + + - + - + - + - + - + - - + + + + + + + - - - + + + + + + + + + + + + + + + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln b/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln index 73755e309..736043781 100644 --- a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln +++ b/root/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 17 +VisualStudioVersion = 17.0.32126.317 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 = {E2AE3CBB-F59D-4873-AE86-401D58F70DA1} + EndGlobalSection EndGlobal diff --git a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css b/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css index 3fec9f089..00c04d7f9 100644 --- a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/Content/touryo/Style.css +++ b/root/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/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj b/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj index 517dd1cdb..63d7c61b3 100644 --- a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj +++ b/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/WebForms_Sample.vbproj @@ -14,7 +14,7 @@ Library WebForms_Sample WebForms_Sample - v4.6 + v4.8 true 44333 @@ -23,6 +23,7 @@ 3.0 + true @@ -759,17 +760,22 @@ + + + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll True + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll diff --git a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config b/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config index 5f4c231f5..e57920da9 100644 --- a/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config +++ b/root/programs/VB/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample/web.config @@ -1,4 +1,4 @@ - + - + - + - + - + - + - + - + - + - + + - + - + - + - - + - + - + - + - + - - - + + + + + + + - - + + + + + + + - + - - + + - + - + - - + - - + + - - + + - - + + @@ -257,43 +272,43 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + \ No newline at end of file diff --git a/root/programs/VB/z_Common.bat b/root/programs/VB/z_Common.bat index 316b1b414..fa944d38b 100644 --- a/root/programs/VB/z_Common.bat +++ b/root/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/programs/VB/z_Common2.bat b/root/programs/VB/z_Common2.bat index 5c83cd5f1..a7c6d4661 100644 --- a/root/programs/VB/z_Common2.bat +++ b/root/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).