Tweak.

Author: daisukenishino2

root/programs/CS/0_Release4Nuget.bat

@@ -11,21 +11,7 @@ echo | call 2_Build_NuGet_net48.bat
 echo | call 2_Build_NuGet_netstd20.bat
 echo | call 2_Build_NuGet_netstd21.bat
 echo | call 2_Build_NuGet_nettcore30.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_net48.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 3_Build_BusinessRichClient_net48.bat
-echo | call 3_Build_BusinessRichClient_netcore30.bat
+echo | call 2_Build_NuGet_nettcore50.bat
 
 echo | call 4_Build_CopyAssemblies.bat
 

root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore30.csproj

@@ -14,15 +14,15 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\Build_netcore30\</OutputPath>
-    <DocumentationFile>..\..\Build_netcore30\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
+    <DocumentationFile>..\..\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Build_netcore30\</OutputPath>
-    <DocumentationFile>..\..\Build_netcore30\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
+    <DocumentationFile>..\..\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>

root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore50.csproj

@@ -14,15 +14,15 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\Build_netcore50\</OutputPath>
-    <DocumentationFile>..\..\Build_netcore50\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
+    <DocumentationFile>..\..\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Build_netcore50\</OutputPath>
-    <DocumentationFile>..\..\Build_netcore50\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
+    <DocumentationFile>..\..\Build_netcore50\net5.0-windows\OpenTouryo.Framework.RichClient.xml</DocumentationFile>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>

root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec

@@ -33,6 +33,12 @@
         <dependency id="Touryo.Infrastructure.Public" version="2.7.0" />
       </group>
       <group targetFramework=".NETCoreApp3.0">
+        <dependency id="Touryo.Infrastructure.Framework" version="2.7.0" />
+        <dependency id="Touryo.Infrastructure.Public" version="2.7.0" />
+      </group>
+      <group targetFramework=".NET5.0">
+        <dependency id="Touryo.Infrastructure.Framework" version="2.7.0" />
+        <dependency id="Touryo.Infrastructure.Public" version="2.7.0" />
       </group>
     </dependencies>
   </metadata>
@@ -59,6 +65,10 @@
     <file src="in\netcoreapp3.0\OpenTouryo.Framework.RichClient.pdb" target="lib\netcoreapp3.0" />
     <file src="in\netcoreapp3.0\OpenTouryo.Framework.RichClient.xml" target="lib\netcoreapp3.0" />
 
+    <file src="in\net5.0-windows\OpenTouryo.Framework.RichClient.dll" target="lib\net5.0" />
+    <file src="in\net5.0-windows\OpenTouryo.Framework.RichClient.pdb" target="lib\net5.0" />
+    <file src="in\net5.0-windows\OpenTouryo.Framework.RichClient.xml" target="lib\net5.0" />
+
     <file src="..\Frameworks\Infrastructure\Framework\RichClient\**\*.cs" target="src" />
   </files>
 </package>

root/programs/CS/NuGet/_NuGetPack.bat

@@ -8,6 +8,8 @@ xcopy /E /Y "..\Frameworks\Infrastructure\Build_net48" "in\net48"
 xcopy /E /Y "..\Frameworks\Infrastructure\Build_netstd20\netstandard2.0" "in\netstandard2.0"
 xcopy /E /Y "..\Frameworks\Infrastructure\Build_netstd21\netstandard2.1" "in\netstandard2.1"
 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"
 
 "..\..\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

root/programs/CS/NuGet/_手順の説明.txt

@@ -3,7 +3,7 @@
 　　https://opentouryo.osscons.jp/index.php?%E3%83%AA%E3%83%AA%E3%83%BC%E3%82%B9%E3%83%BB%E3%82%A8%E3%83%B3%E3%82%B8%E3%83%8B%E3%82%A2%E3%83%AA%E3%83%B3%E3%82%B0
 
 （２）次に、bat使用してビルドを行う。
-　　設定ファルのBUILD_CONFIG=DebugをReleaseに変更する。
+　　以下の設定ファイルのBUILD_CONFIG=DebugをReleaseに変更する。
 　　...\OpenTouryo\root\programs\CS\z_Common.bat
 
 　　以下のビルドbatを実行する。