Skip to content

Commit

Permalink
Merge pull request #347 from OpenTouryoProject/develop
Browse files Browse the repository at this point in the history
Release work ( ~ October 1, 2019)
  • Loading branch information
yusukemaegawa authored Sep 27, 2019
2 parents 39bcaf7 + 4db92a6 commit 9c100bd
Show file tree
Hide file tree
Showing 395 changed files with 16,198 additions and 9,340 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Windows batch files want to use CRLF by default.
*.bat text eol=crlf

# Visual Studio files want to use CRLF by default.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ The programs in this repository are developed in the following IDE/targetFramewo
- IDE (Integrated Development Environment)
- Visual Studio 2015
- Visual Studio 2017
- Visual Studio 2019
- 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 Core 2.0 (netcoreapp2.0)
- .NET Core 3.0 (netcoreapp3.0)
- .NET Standard 2.0 (netstandard2.0)
- .NET Standard 2.1 (netstandard2.1)

The default targetFramework of projects and solutions is net46(.NET Framework 4.6).
The name of projects and solutions for other targetFramework include the targetFramework.
Expand Down
4 changes: 4 additions & 0 deletions Readme.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@
- IDE(統合開発環境)
- Visual Studio 2015
- Visual Studio 2017
- Visual Studio 2019
- targetFramework(実行環境)
- .NET Framework 4.5.2 (net452)
- .NET Framework 4.6 (net46)
- .NET Framework 4.7 (net47)
- .NET Framework 4.8 (net48)
- .NET Core 2.0 (netcoreapp2.0)
- .NET Core 3.0 (netcoreapp3.0)
- .NET Standard 2.0 (netstandard2.0)
- .NET Standard 2.1 (netstandard2.1)


プロジェクト・ソリューションの既定の targetFramework は net46(.NET Framework 4.6) です。
Expand Down
32 changes: 30 additions & 2 deletions root/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,13 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">2_Build_NuGet_net47.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build the framework (Base class 1 and library part) to make NuGet package that targets .NET Framework 4.6. </td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build the framework (Base class 1 and library part) to make NuGet package that targets .NET Framework 4.7. </td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*1</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">2_Build_NuGet_net48.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build the framework (Base class 1 and library part) to make NuGet package that targets .NET Framework 4.8.</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*1</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
Expand All @@ -159,6 +165,12 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">2_Build_NuGet_netstd21.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build the framework (Base class 1 and library part) to make NuGet package that targets .NET Standard 2.1.</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*1, *3</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_Business_net45.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build a framework (base class 2, library part) of Business namespace that targets .NET Framework 4.5.2.</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○</td>
Expand All @@ -174,6 +186,11 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_Business_net48.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build a framework (base class 2, library part) of Business namespace that targets .NET Framework 4.8.</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_BusinessRichClient_net45.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Framework 4.5.2.</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○*2</td>
Expand All @@ -189,6 +206,11 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○*2</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_BusinessRichClient_net48.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build a framework for rich client application (base class 2, library part) of Business namespace that targets .NET Framework 4.8.</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○*2</td>
</tr>
<tr>
<Td style="background-color:#F8CBAD;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_Business_netcore20.bat</td>
<Td style="background-color:#F8CBAD;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build a framework (base class 2, library part) of Business namespace that targets .NET Core 2.0.</td>
<Td style="background-color:#F8CBAD;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*3</td>
Expand Down Expand Up @@ -295,7 +317,7 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">y_Build_TestCode_SecCUI.txt</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">y_Build_TestCode_SecCUI.sh</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Build and execute the CUI test code of the following Public.Security namespace usin WSL.</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
Expand Down Expand Up @@ -325,6 +347,12 @@ By executing `0_ExecAllBat.bat`, you can execute necessary batch files together.
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">z_ChangePackages_net48.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Batch file to switch packages.config when creating NuGet package. (for .NET Framework 4.8)</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">z_Common.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Common settings (for MSBuild)</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○</td>
Expand Down
30 changes: 29 additions & 1 deletion root/Readme.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,24 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">2_Build_NuGet_net48.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Framework&nbsp;4.8&nbsp;をターゲットとする&nbsp;NuGet&nbsp;パッケージの作成用に、フレームワーク&nbsp;(ベースクラス2,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*1</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">2_Build_NuGet_netstd20.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Standard&nbsp;2.0&nbsp;をターゲットとする&nbsp;NuGet&nbsp;パッケージの作成用に、フレームワーク&nbsp;(ベースクラス1,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*1,&nbsp;*3</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">2_Build_NuGet_netstd21.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Standard&nbsp;2.1&nbsp;をターゲットとする&nbsp;NuGet&nbsp;パッケージの作成用に、フレームワーク&nbsp;(ベースクラス2,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*1,&nbsp;*3</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_Business_net45.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Framework&nbsp;4.5.2&nbsp;をターゲットとする&nbsp;Business名前空間のフレームワーク&nbsp;(ベースクラス2,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○</td>
Expand All @@ -165,6 +177,11 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_Business_net48.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Framework&nbsp;4.8&nbsp;をターゲットとする&nbsp;Business名前空間のフレームワーク&nbsp;(ベースクラス2,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_BusinessRichClient_net45.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Framework&nbsp;4.5.2&nbsp;をターゲットとする&nbsp;Business名前空間のリッチクライアント用フレームワーク&nbsp;(ベースクラス2,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○*2</td>
Expand All @@ -180,6 +197,11 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○*2</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_BusinessRichClient_net48.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Framework&nbsp;4.8&nbsp;をターゲットとするBusiness名前空間のリッチクライアント用フレームワーク&nbsp;(ベースクラス3,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;" colspan="2" rowspan="1">○*2</td>
</tr>
<tr>
<Td style="background-color:#F8CBAD;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">3_Build_Business_netcore20.bat</td>
<Td style="background-color:#F8CBAD;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">.NET&nbsp;Core&nbsp;2.0&nbsp;をターゲットとする&nbsp;Business名前空間のフレームワーク&nbsp;(ベースクラス2,&nbsp;ライブラリ部分)&nbsp;をビルドする。</td>
<Td style="background-color:#F8CBAD;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○*3</td>
Expand Down Expand Up @@ -286,7 +308,7 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">y_Build_TestCode_SecCUI.txt</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">y_Build_TestCode_SecCUI.sh</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">Public.Security名前空間のCUIテストコードのビルドと実行を行う(WSL用)。</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
Expand Down Expand Up @@ -316,6 +338,12 @@ Open 棟梁のプログラムをビルドするときは、**初回のみ、MSBu
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">z_ChangePackages_net48.bat</td>
<Td style="background-color:#C6E0B4;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">NuGet&nbsp;パッケージの作成時に、packages.config切り替えるバッチ(.NET&nbsp;Framework&nbsp;4.8)</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○</td>
<Td style="background-color:#C6E0B4;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">-</td>
</tr>
<tr>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">z_Common.bat</td>
<Td style="background-color:#FFFFFF;text-align:left;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">共通設定&nbsp;(MSBuild&nbsp;用)</td>
<Td style="background-color:#FFFFFF;text-align:center;color:#000000;font-family:'MS Pゴシック';font-size:11pt;">○</td>
Expand Down
3 changes: 1 addition & 2 deletions root/files/resource/X509/GenDsaCertByOpenSSL.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ openssl dsaparam -out dsaparam.out 2048
openssl gendsa -out private-key.pem dsaparam.out
openssl req -new -key private-key.pem > csr.csr
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA256DSA.cer
openssl pkcs12 -export -out _SHA256DSA.pfx -inkey private-key.pem -in _SHA256DSA.cer
:openssl pkcs12 -in _SHA256DSA.pfx -out _SHA256DSA.cer -nokeys -clcerts
openssl pkcs12 -export -inkey private-key.pem -in _SHA256DSA.cer > _SHA256DSA.pfx
14 changes: 12 additions & 2 deletions root/files/resource/X509/GenECDsaCertByOpenSSL.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
openssl ecparam -list_curves

openssl ecparam -out private-key.pem -name prime256v1 -genkey
openssl req -new -key private-key.pem > csr.csr
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA256ECDSA.cer
openssl pkcs12 -export -out _SHA256ECDSA.pfx -inkey private-key.pem -in _SHA256ECDSA.cer
:openssl pkcs12 -in _SHA256ECDSA.pfx -out _SHA256ECDSA.cer -nokeys -clcerts
openssl pkcs12 -export -inkey private-key.pem -in _SHA256ECDSA.cer > _SHA256ECDSA.pfx

openssl ecparam -out private-key.pem -name secp384r1 -genkey
openssl req -new -key private-key.pem > csr.csr
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA384ECDSA.cer
openssl pkcs12 -export -inkey private-key.pem -in _SHA384ECDSA.cer > _SHA384ECDSA.pfx

openssl ecparam -out private-key.pem -name secp521r1 -genkey
openssl req -new -key private-key.pem > csr.csr
openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA512ECDSA.cer
openssl pkcs12 -export -inkey private-key.pem -in _SHA512ECDSA.cer > _SHA512ECDSA.pfx
Loading

0 comments on commit 9c100bd

Please sign in to comment.