Merge pull request #397 from OpenTouryoProject/develop

Tweak.
OpenTouryoProject · Mar 30, 2021 · 5ef959e · 5ef959e
2 parents af8e8c0 + cbe1f11
commit 5ef959e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -17,11 +17,11 @@ The programs in this repository are developed in the following IDE/targetFramewo
   - .NET Framework 4.8 (net48)
   - .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)
 
-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.
+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}.
 
 The programs in this repository are for *open source developers*.

diff --git a/Readme.ja.md b/Readme.ja.md
@@ -17,12 +17,12 @@
   - .NET Framework 4.8 (net48)
   - .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)
 
 
-プロジェクト・ソリューションの既定の targetFramework は net46(.NET Framework 4.6) です。
-その他の targetFramework 向けのプロジェクト・ソリューションには、それぞれ targetFramework がプロジェクト・ソリューション名に含まれます。
+プロジェクトやソリューションの名前には、targetFrameworkが含まれます。
 たとえば、net47(.NET Framework 4.7) を対象としたプロジェクト・ソリューションは、"{identifier}_net47.{ext}" と命名しています。
 
 このリポジトリのプログラムは、OSS 開発者向けのものです。

diff --git 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%\netcoreapp3.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\netcoreapp3.0\"
-xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\netcoreapp3.0" "Samples4NetCore\Legacy\WS_sample\Build\netcoreapp3.0\"
+xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0\"
+xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Build\net5.0\"
 
 pause