Merge pull request #326 from OpenTouryoProject/develop

Release work ( ~ April 1, 2019)

license/LICENSE.txt

@@ -207,6 +207,7 @@
      - The OSS included in the source code such as JavaScript / CSS
        - jQuery
        - jQuery.Validation
+       - Popper.js
        - bootstrap
        - FontAwesome
        - Respond

root/files/resource/X509/GenDsaCertByOpenSSL.bat

@@ -0,0 +1,6 @@
+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

root/files/resource/X509/GenECDsaCertByOpenSSL.bat

@@ -0,0 +1,6 @@
+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

root/files/resource/X509/GenRsaCertByOpenSSL.bat

@@ -0,0 +1,5 @@
+openssl genrsa -out private-key.pem 2048
+openssl req -new -key private-key.pem > csr.csr
+openssl x509 -in csr.csr -days 365000 -req -signkey private-key.pem > _SHA256RSA.cer
+openssl pkcs12 -export -out _SHA256RSA.pfx -inkey private-key.pem -in _SHA256RSA.cer
+:openssl pkcs12 -in _SHA256RSA.pfx -out _SHA256RSA.cer -nokeys -clcerts

root/files/resource/X509/SHA256DSA.cer

@@ -0,0 +1,28 @@
+Bag Attributes
+    localKeyID: A5 FB D2 66 C8 4D B1 C3 A9 D4 4F 8F 31 C1 CB 48 AA 5F 63 CD 
+subject=/CN=x
+issuer=/CN=x
+-----BEGIN CERTIFICATE-----
+MIID+jCCA6ACCQDzHZeMiub+gzALBglghkgBZQMEAwIwDDEKMAgGA1UEAwwBeDAg
+Fw0xODExMDcwNjMyMTRaGA8zMDE4MDMxMDA2MzIxNFowDDEKMAgGA1UEAwwBeDCC
+A0YwggI5BgcqhkjOOAQBMIICLAKCAQEAtJCn15XAdZjWAUQhP3rN9qV5GJ/b5Gp1
+6RL0vIpL6njtMJ49ZZ9x+xsQ2n9rO7j9b6GRaKoZeduqKR4DCxr5IkuU+ggMo2MF
+BYxtaw96qq4SoKTZkMVPrvRC8wjBwejv06BI3YvCI2Tyb9RgBf18oJHLx4EaoeHv
+mGSDHyDWwI+Y9pBuINhmlHRJWqcJ6DMi5fYKE58AYy0U1A8ZNo7A3kD6RK1EWh9G
+EEkrMraRJB3/2tewUBZRFS3Ulb0me8pvf0gnNYOKK7f+RUQup1NehZ/uwEuLLLu4
+NYHR6kpi/7fErpehMNiXlgkNDhx4r99qBi8JmlsNfdH7ibK9vDJ9/wIhALscndtJ
+tTkAFByK/zAN1R1jA5CDarF2KN0zZrGt1337AoIBAGd1aiHjSIiq69LOvmqn4xIO
+4GRyb8WyDcRgpUTd6s7sxDinlSRNU1q9kktZcVbCiDDlU5RhZa9m3BN1r3rMsr3Z
+d1F7YEdF9c098TJZcHGqfxVW4wXR/C///8lWlb7EDewAfsk3lXcSsJwZIlllIzkQ
+yR5gMjzRlVvHTCiB3kGOgRNQ7FBT0JzS3LbP0ZvSUv0mt/eyu8d+Toabx9yr5otk
+rvCNFVzgF/uufGJ+wgD1eoYs3vi0JkA7GeS+95dj/WHWRKoTlB4OGeZG619ukf/S
+nBsWzDaJnFnJJ7rHHqH7roOBpl2PDuHSN+AmgfEX4pMNcnQnnyOyvjHU/cVGoycD
+ggEFAAKCAQBvXBbMYZjFWb+xK+4yAd6pPZcwGlD5ncrj8nEke8m76aoAV5DZnAIV
+RE91pO3iuVueQTejnzFel/gJb4UgpNKkUS09SZWt193tNcXpJeR1Lfo6PH8leXwV
+YdBZpfw3AuUWmmU9HIRTu7+0iusWo2nSkDaEvmr0KNrlN0jgKR06R2yA+x+PnE15
+n3GWbSZFFv7A6GtT3MbKYS4JWjl+QdC7VyTXHowei8zIwDrml3yYzYHaUwTkP+Il
+lqgMsHgB+h5WtnT54J5WNtHIvxuK32m0MIq/885o3nD50K1G9QLyKexTO6PvZ/kp
+SIgaNBNqvKgK8TTfhPGiRfw2SbS8SPbIMAsGCWCGSAFlAwQDAgNHADBEAiAU/PhU
+z1SLzs2hHTTRVIhl0jnO4MsQH1syKFVzbWI8ywIgPghpfCrIj/M64vwNtADKCzQu
+uI7GSslwhiQs4sCmIH8=
+-----END CERTIFICATE-----

root/files/resource/X509/SHA256ECDSA.cer

@@ -0,0 +1,12 @@
+Bag Attributes
+    localKeyID: CC 20 9B 36 A0 37 02 42 60 A5 BA A0 E3 D6 52 47 47 3C A7 1F 
+subject=/CN=x
+issuer=/CN=x
+-----BEGIN CERTIFICATE-----
+MIIBCDCBsAIJAOQVO7kAmTNiMAoGCCqGSM49BAMCMAwxCjAIBgNVBAMMAXgwIBcN
+MTgxMTA4MTA0MDE0WhgPMzAxODAzMTExMDQwMTRaMAwxCjAIBgNVBAMMAXgwWTAT
+BgcqhkjOPQIBBggqhkjOPQMBBwNCAASp1Lduy2zdReLmnQbvUah9QH2WzV8nP/PR
+1FDD1Fn30IV+hyEkyIgy7fdFQxKhprDI9pEpRiznF4F0qs++RIVeMAoGCCqGSM49
+BAMCA0cAMEQCIFAjpQvuaV4SIheeOE1Yqc/6Ze9/GaaB2CmOcbsq2Y7iAiA9bbxh
+L0Cf5L0XrRdwC2rjpZBngz0+r1YDwJACrS7BDQ==
+-----END CERTIFICATE-----

root/files/resource/X509/SHA256ECDSA_Server.cer

@@ -0,0 +1,20 @@
+Bag Attributes
+    localKeyID: 85 BF 5A 68 BC 3E AD 12 E5 BC 16 12 D4 94 4C 67 5D 89 26 D6 
+subject=/CN=x
+issuer=/CN=x
+-----BEGIN CERTIFICATE-----
+MIICljCCAX4CCQCNtHI3aFi7BjANBgkqhkiG9w0BAQsFADAMMQowCAYDVQQDDAF4
+MCAXDTE4MTEwNzA1NTM1OVoYDzMwMTgwMzEwMDU1MzU5WjAMMQowCAYDVQQDDAF4
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqG4Y4vQJDNFO9xV7QFnB
+sny83DwUoQr2Rc4AouGI0exxeDAcXfJzGbtNwpDudDkP9Oo+s8kiVa+8nWuPPh/U
+2ziwrfgC8KD47v9i7TyTv9XZOR8NGQ2wi7HDRQ5eZFnYI2G21rDSLV66NV4RLjzq
+cpWCPpNri5e7whMRphj/pAK43vLc2IYB1I4wUq3aNBJyIcqSrVOYLaCWwzTK3OOn
+/ttfBQJ5Z8ShyILUsKJt57MBiKLwiDrPsF2I/Hh0AHwItTuNUMHr/UC6IzuNSWEl
+05U7WVvV/OgsL34/JkenB+/AB78XegBBhIiEXZ+vYUV0UGd/nBcL8k3wiDV0uDto
+vwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAABjPnJtpcQLHxpdt+iuIOu1sC5N+m
+0vG4ugOfleAC8dXQe5i2kDdgt3p8ULBqeFVI1p3pQKBg+39E4MKKTEgAz3erDHSe
+BnlmL9Cv4FbVr751/kU+NcobfC0bro6CXZzZ6fJwZ/Ng0XNIWhgIDPAgBNUy2lvn
+Vrw0Zp4nCZzy+FbmvyPaQIGbMmyxSEspjO0epj1FcI58LIchvjQNvbJcYAi1bYqM
+vgl1wlu7Cepw2E1wghfwjhaeTJgEMeCqc0N9Q78A90GDiGR7c4zVTVO4UfAa+sxZ
+aUrdA32/+r2qKAq1d11uZhveRmZz5hwbj+pheOD6zeOE0vgZ5cyOMb4a
+-----END CERTIFICATE-----

root/files/resource/X509/SHA256RSA.cer

@@ -0,0 +1,20 @@
+Bag Attributes
+    localKeyID: EA A7 FD 14 23 DE 3F 4B CE 0E C6 79 4E 32 30 53 38 24 7B EB 
+subject=/CN=x
+issuer=/CN=x
+-----BEGIN CERTIFICATE-----
+MIICljCCAX4CCQDsPd8+SuLeHjANBgkqhkiG9w0BAQsFADAMMQowCAYDVQQDDAF4
+MCAXDTE4MTEwNzA1NTgxMloYDzMwMTgwMzEwMDU1ODEyWjAMMQowCAYDVQQDDAF4
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnOSgXEBwV+maKTcGlGAF
+L6KPyTQB7Z0G0Z4ewZi5rhFhEDsZRLV5p3/AqWQQlZFVrIJ/6wdrBY5sCAle6av6
+54jqnI8AqxVV+OL+COmrhVMhrikRXxhxATAzo0Gf/hjW0yux8Ns2HT72PVscjBk9
+SKeedcorMjWWJPfr1zwsByLaSz8pQApBccRk/bUc+oBHRpDanPFz23v4ts3RXso0
+5G8UZmcaqDqjMsVZfI3Cd3jqaWdb6NeeUw0DZDtMJObOJExJN43LO7rvtWmYXlEg
+Lp+rCTI6CQ0Cmo4WuLU8Rv03fXQXGX0jDNeqfck8EEj7NwJWCvtf/AYaZ6hGcw2P
+MwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBVVFIe+gO5uMQEumXH8ikKDX95kaBK
+uc7cTXm+bhltMv2oYV1nAFFkHuzLd7UHWP/roLsLNVLxNJC3Dcw9tkVdqaPBAyKn
+7tz/G76BtwpJRS7eKt7cX4mOKPcN9onjTdXXd046nnualq/IP3pVkXLF6G1glr76
+VWzD0Lx1iANDw1ewVGV+f1JWrhUJGKfoJ/Od9xhtBZ2qBgSu+/GaeoRDfay7/A4e
+AZLPDm57Nft1tkbxlbiX7pYz81By2t3UdaVorf/2gewzun0MULtpnhTys1tHPumA
+7q9ATEa+Rt2CF4ldcu4/oO/ZL1wgeDBl4IctOXbp8ybRXafp+5lHWCmC
+-----END CERTIFICATE-----

root/files/resource/X509/SHA256RSA_Client.cer

@@ -0,0 +1,20 @@
+Bag Attributes
+    localKeyID: 9B 6E A6 D7 D6 B3 29 72 BD 1C A3 6A 94 2B C1 8B 5F 37 C7 6D 
+subject=/CN=x
+issuer=/CN=x
+-----BEGIN CERTIFICATE-----
+MIICljCCAX4CCQC1XAfk7CceaDANBgkqhkiG9w0BAQsFADAMMQowCAYDVQQDDAF4
+MCAXDTE4MTEwNzA1NTYyOVoYDzMwMTgwMzEwMDU1NjI5WjAMMQowCAYDVQQDDAF4
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArmLnq3chsnu8k11V/acJ
+9EAxcHU8w6B74LmNm0WFVEQWXm9t8m6QSfdBTzej+1zEbezZYNYSsJFCgo7Yn+N1
+WcADSMgy6XhYbT8nbbpQ79TmkI/uiSUvKrrxRiSm2IT9RwZ7V7ftUebmB9bbC0OO
+DZ/TbL0ZUhMlWNq0nAn0pbqebZ2Jl1XtLDTq9UrylAueRguvzE72z5BXwU18KO2y
+jyu4AJJH9OZ+SfRKGyYpSrw8GjDXL6nNnp5MOfNMoy1xUeHkLV/2ZUH+2KXWxBVr
+PmXEX3Vmyp7eVIakWfkk3ixn5sfCfLrzFHFj/21e/teOVQTeXQIQqJq7AZCGu6iq
+QQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB0pwxYX6CZl7z8vtgyGDoEFh8ngR2v
+D9+BVBqLQg+5lbE5fJmW8IIFAf6q16fz45oeN1AcyNiIcZOuvwa/yUxMmyDc4qVp
+meTsOVJCyTysZte9NMx3JMRnUE+VLS/K4/TsiChsjkVC11ibAeX/eWKPPVI7CH2a
+5C8UaHBGCu7fUdUAFINj0KFAtBDRwe54mOuEm539jzhi1MBuosdAHIF4SD9B9PFG
+kVS9Iagzw75eNS/9wP1ZQs1+1n46k1s44d4poEHwx5tsy7ZiH9RZfM8SwUPxLW5B
+naJI2FEO4i0lfjRhmAcOrQwcRbLcfv1lG6wXIKNQ4fQTKoY0zQYsYsRd
+-----END CERTIFICATE-----

root/files/resource/X509/SHA256RSA_Server.cer

@@ -0,0 +1,20 @@
+Bag Attributes
+    localKeyID: 10 34 09 BA 3E A8 9D C0 AE 87 86 E5 1C 77 E7 DF FD 14 AF C6 
+subject=/CN=x
+issuer=/CN=x
+-----BEGIN CERTIFICATE-----
+MIICljCCAX4CCQCdC/8UatWyojANBgkqhkiG9w0BAQsFADAMMQowCAYDVQQDDAF4
+MCAXDTE4MTEwNzA1NTMzMVoYDzMwMTgwMzEwMDU1MzMxWjAMMQowCAYDVQQDDAF4
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqG4Y4vQJDNFO9xV7QFnB
+sny83DwUoQr2Rc4AouGI0exxeDAcXfJzGbtNwpDudDkP9Oo+s8kiVa+8nWuPPh/U
+2ziwrfgC8KD47v9i7TyTv9XZOR8NGQ2wi7HDRQ5eZFnYI2G21rDSLV66NV4RLjzq
+cpWCPpNri5e7whMRphj/pAK43vLc2IYB1I4wUq3aNBJyIcqSrVOYLaCWwzTK3OOn
+/ttfBQJ5Z8ShyILUsKJt57MBiKLwiDrPsF2I/Hh0AHwItTuNUMHr/UC6IzuNSWEl
+05U7WVvV/OgsL34/JkenB+/AB78XegBBhIiEXZ+vYUV0UGd/nBcL8k3wiDV0uDto
+vwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCicA9UAhqsUlbPcdvvmGNmlUczFQVp
+1K9Xaw8P1yL/KbQfrBn4hlXBgSAzC66iQcerttgHY4Nh1sjBYVNNKCpzaME6cX93
+jGmS5R32xsywZ9ltpRK9bXrPlh1nseLG2VavGvt7iQvRSWC0cbE/zM/OHyrvpv6c
+D0iEp3kEIqgTslkPOdG/OjfA0hf6V8CZque2ND5Fx3jnUQYLl7msV4ZkpMl1o00p
+EwFVge1A8q163WKsBzEeEOwrU1+Hy9vUKt5ANnepPEaF3kE8T8/Dxs5hzNs7Vtpz
+Gdw9fWrkPjWGz9/lgNyMe6jPbgT67m2DbtfS+sScHxjDD8FLwhSX1YtP
+-----END CERTIFICATE-----

root/programs/CS/0_ExecAllBat.bat

@@ -0,0 +1,41 @@
+echo | call 1_DeleteDir.bat
+echo | call 1_DeleteFile.bat
+
+@echo on
+timeout 5
+
+echo | call 2_Build_NuGet_net45.bat
+echo | call 2_Build_NuGet_net46.bat
+echo | call 2_Build_NuGet_net47.bat
+echo | call 2_Build_NuGet_netstd20.bat
+
+@echo on
+timeout 5
+
+echo | call 3_Build_Business_net45.bat
+echo | call 3_Build_Business_net46.bat
+echo | call 3_Build_Business_net47.bat
+echo | call 3_Build_Business_netcore20.bat
+echo | call 3_Build_Business_netcore30.bat
+echo | call 3_Build_BusinessRichClient_net45.bat
+echo | call 3_Build_BusinessRichClient_net46.bat
+echo | call 3_Build_BusinessRichClient_net47.bat
+echo | call 4_Build_CopyAssemblies.bat
+
+@echo on
+timeout 5
+
+echo | call 4_Build_Framework_Tool.bat
+echo | call 5_Build_Bat_sample.bat
+echo | call 5_Build_BatCore_sample.bat
+echo | call 5_Build_2CS_sample.bat
+echo | call 6_Build_WSSrv_sample.bat
+echo | call 6_Build_WSSrvCore_sample.bat
+echo | call 7_Build_Framework_WS.bat
+echo | call 8_Build_WSClntWin_sample.bat
+echo | call 9_Build_WSClntWPF_sample.bat
+echo | call 10_Build_WebApp_sample.bat
+echo | call 10_Build_WebAppCore_sample.bat
+
+@echo on
+timeout 5

root/programs/CS/10_Build_WebAppCore_sample.bat

@@ -19,10 +19,12 @@ rem --------------------------------------------------
 rem Batch build of MVC_Sample.
 rem --------------------------------------------------
 
+set CURRENTDIR=%cd%
 cd "Samples4NetCore\Backend\MVC_Sample\MVC_Sample"
 if exist "node_modules" rd /s /q "node_modules"
-call npm install
-cd "..\..\..\..\"
+call RestoreLib1.bat
+call RestoreLib2.bat
+cd %CURRENTDIR%
 
 dotnet restore "Samples4NetCore\Backend\MVC_Sample\MVC_Sample.sln"
 dotnet msbuild %COMMANDLINE% "Samples4NetCore\Backend\MVC_Sample\MVC_Sample.sln"

root/programs/CS/1_DeleteDir.bat

@@ -1,31 +1,39 @@
 @echo off
 
+set DIRECTORIES=packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs
 @echo --------------------------------------------------
-@echo Delete the packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs folders.
+@echo Delete the %DIRECTORIES% folders.
 @echo --------------------------------------------------
 
-for /D /R %%i in ( packages ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( obj ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( bin ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( bld ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( Temp ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( Build ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( PrecompiledWeb ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
-)
-for /D /R %%i in ( .vs ) do (
-  if exist "%%~i" RD /S /Q "%%~i"
+@rem カンマをスペースに変換
+set w1=%DIRECTORIES:,= %
+
+@rem 連続したスペースを、スペース１個に変換
+set w2=%w1:  = %
+
+for %%a in ( %w2% ) do (
+  for /D /R %%i in ( %%a ) do (
+    if exist "%%~i" RD /S /Q "%%~i"
+  )
 )
+
 pause
+
+set DIRECTORIES=Build, Build_net45, Build_net46, Build_net47, Build_netstd20, Build_netcore20, Build_netcore30
+@echo --------------------------------------------------
+@echo Delete the %DIRECTORIES% folders.
+@echo --------------------------------------------------
+
+@rem カンマをスペースに変換
+set w1=%DIRECTORIES:,= %
+
+@rem 連続したスペースを、スペース１個に変換
+set w2=%w1:  = %
+
+for %%a in ( %w2% ) do (
+  for /D /R %%i in ( %%a ) do (
+    if exist "%%~i" RD /S /Q "%%~i"
+  )
+)
+
+pause

root/programs/VB/3_Build_Framework.bat → root/programs/CS/2_Build_NuGet_net45.bat

@@ -16,21 +16,18 @@ set CURRENT_DIR="%~dp0"
 call %CURRENT_DIR%z_Common.bat
 
 rem --------------------------------------------------
-rem Make the Directory.
+rem Change the packages.config.
 rem --------------------------------------------------
-md "Frameworks\Infrastructure\Temp"
-md "Frameworks\Infrastructure\Build"
+call %CURRENT_DIR%z_ChangePackages_net45.bat
 
 rem --------------------------------------------------
-rem Output xcopy after you build the batch Infrastructure(AllComponent)
+rem Build the batch Infrastructure(Nuget45)
 rem --------------------------------------------------
-..\nuget.exe restore "Frameworks\Infrastructure\AllComponent.sln"
-%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\AllComponent.sln"
+..\nuget.exe restore "Frameworks\Infrastructure\Nuget_net45.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_net45.sln"
 
-xcopy /E /Y "Frameworks\Infrastructure\Business\bin\%BUILD_CONFIG%" "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%\"
-xcopy /E /Y "Frameworks\Infrastructure\CustomControl\bin\%BUILD_CONFIG%" "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%\"
-
-xcopy /E /Y "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%" "Frameworks\Infrastructure\Build\"
+..\nuget.exe restore "Frameworks\Infrastructure\Nuget_RichClient_net45.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_net45.sln"
 
 pause
 

root/programs/CS/3_Build_RichClientFramework.bat → root/programs/CS/2_Build_NuGet_net46.bat

@@ -16,21 +16,18 @@ set CURRENT_DIR="%~dp0"
 call %CURRENT_DIR%z_Common.bat
 
 rem --------------------------------------------------
-rem Make the Directory.
+rem Change the packages.config.
 rem --------------------------------------------------
-md "Frameworks\Infrastructure\Temp"
-md "Frameworks\Infrastructure\Build"
+call %CURRENT_DIR%z_ChangePackages_net46.bat
 
 rem --------------------------------------------------
-rem Output xcopy after you build the batch Infrastructure(RichClientComponent)
+rem Build the batch Infrastructure(Nuget46)
 rem --------------------------------------------------
-%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\RichClientComponent.sln"
+..\nuget.exe restore "Frameworks\Infrastructure\Nuget_net46.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_net46.sln"
 
-xcopy /E /Y "Frameworks\Infrastructure\Framework\RichClient\bin\%BUILD_CONFIG%" "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%\"
-xcopy /E /Y "Frameworks\Infrastructure\Business\RichClient\bin\%BUILD_CONFIG%" "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%\"
-xcopy /E /Y "Frameworks\Infrastructure\CustomControl\RichClient\bin\%BUILD_CONFIG%" "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%\"
-
-xcopy /E /Y "Frameworks\Infrastructure\Temp\%BUILD_CONFIG%" "Frameworks\Infrastructure\Build\"
+..\nuget.exe restore "Frameworks\Infrastructure\Nuget_RichClient_net46.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_net46.sln"
 
 pause
 

root/programs/CS/2_Build_NuGet_net47.bat

@@ -0,0 +1,35 @@
+setlocal
+
+@rem --------------------------------------------------
+@rem Turn off the echo function.
+@rem --------------------------------------------------
+@echo off
+
+@rem --------------------------------------------------
+@rem Get the path to the executable file.
+@rem --------------------------------------------------
+set CURRENT_DIR="%~dp0"
+
+@rem --------------------------------------------------
+@rem Execution of the common processing.
+@rem --------------------------------------------------
+call %CURRENT_DIR%z_Common.bat
+
+rem --------------------------------------------------
+rem Change the packages.config.
+rem --------------------------------------------------
+call %CURRENT_DIR%z_ChangePackages_net47.bat
+
+rem --------------------------------------------------
+rem Build the batch Infrastructure(Nuget47)
+rem --------------------------------------------------
+..\nuget.exe restore "Frameworks\Infrastructure\Nuget_net47.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_net47.sln"
+
+..\nuget.exe restore "Frameworks\Infrastructure\Nuget_RichClient_net47.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_net47.sln"
+
+pause
+
+rem -------------------------------------------------------
+endlocal

root/programs/CS/3_Build_NuGet_netstd20.bat → root/programs/CS/2_Build_NuGet_netstd20.bat

@@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat
 rem --------------------------------------------------
 rem Build the batch Infrastructure
 rem --------------------------------------------------
-dotnet restore "Frameworks\Infrastructure\Nuget_netstd20.sln"
-dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netstd20.sln"
+call dotnet restore "Frameworks\Infrastructure\Nuget_netstd20.sln"
+call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netstd20.sln"
 
 pause