Skip to content

Commit 5ef959e

Browse files
Merge pull request #397 from OpenTouryoProject/develop
Tweak.
2 parents af8e8c0 + cbe1f11 commit 5ef959e

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ The programs in this repository are developed in the following IDE/targetFramewo
1717
- .NET Framework 4.8 (net48)
1818
- .NET Core 2.0 (netcoreapp2.0)
1919
- .NET Core 3.0 (netcoreapp3.0)
20+
- .NET 5.0 (net5.0)
2021
- .NET Standard 2.0 (netstandard2.0)
2122
- .NET Standard 2.1 (netstandard2.1)
2223

23-
The default targetFramework of projects and solutions is net46(.NET Framework 4.6).
24-
The name of projects and solutions for other targetFramework include the targetFramework.
24+
The name of projects and solutions include the targetFramework.
2525
For example, the projects and solutions for net47(.NET Framework 4.7) are named {identifier}_net47.{ext}.
2626

2727
The programs in this repository are for *open source developers*.

Readme.ja.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
- .NET Framework 4.8 (net48)
1818
- .NET Core 2.0 (netcoreapp2.0)
1919
- .NET Core 3.0 (netcoreapp3.0)
20+
- .NET 5.0 (net5.0)
2021
- .NET Standard 2.0 (netstandard2.0)
2122
- .NET Standard 2.1 (netstandard2.1)
2223

2324

24-
プロジェクト・ソリューションの既定の targetFramework は net46(.NET Framework 4.6) です。
25-
その他の targetFramework 向けのプロジェクト・ソリューションには、それぞれ targetFramework がプロジェクト・ソリューション名に含まれます。
25+
プロジェクトやソリューションの名前には、targetFrameworkが含まれます。
2626
たとえば、net47(.NET Framework 4.7) を対象としたプロジェクト・ソリューションは、"{identifier}_net47.{ext}" と命名しています。
2727

2828
このリポジトリのプログラムは、OSS 開発者向けのものです。

root/programs/CS/6_Build_WSSrvCore_sample.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ rem --------------------------------------------------
2727
dotnet restore "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln"
2828
dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln"
2929

30-
xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\netcoreapp3.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\netcoreapp3.0\"
31-
xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\netcoreapp3.0" "Samples4NetCore\Legacy\WS_sample\Build\netcoreapp3.0\"
30+
xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0\"
31+
xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net5.0" "Samples4NetCore\Legacy\WS_sample\Build\net5.0\"
3232

3333
pause
3434

0 commit comments

Comments
 (0)