Dotnet10

root/programs/CS/0_ExecAllBat.bat

@@ -1,13 +1,6 @@
 @echo on
 timeout 5
 
-echo | call 1_DeleteDir.bat
-echo | call 1_DeleteFile.bat
-echo | call 2_Build_NuGet_netstd20.bat
-
-@echo on
-timeout 5
-
 echo | call 1_DeleteDir.bat
 echo | call 1_DeleteFile.bat
 echo | call 2_Build_NuGet_net48.bat
@@ -19,9 +12,9 @@ timeout 5
 
 echo | call 1_DeleteDir.bat
 echo | call 1_DeleteFile.bat
-echo | call 2_Build_NuGet_nettcore80.bat
-echo | call 3_Build_Business_netcore80.bat
-echo | call 3_Build_BusinessRichClient_netcore80.bat
+echo | call 2_Build_NuGet_nettcore100.bat
+echo | call 3_Build_Business_netcore100.bat
+echo | call 3_Build_BusinessRichClient_netcore100.bat
 
 @echo on
 timeout 5

root/programs/CS/0_Release4Nuget.bat

@@ -1,12 +1,6 @@
 @echo on
 timeout 5
 
-echo | call 1_DeleteDir.bat
-echo | call 2_Build_NuGet_netstd20.bat
-
-@echo on
-timeout 5
-
 echo | call 1_DeleteDir.bat
 echo | call 2_Build_NuGet_net48.bat
 

root/programs/CS/2_Build_NuGet_nettcore80.bat → root/programs/CS/2_Build_NuGet_netcore100.bat

@@ -18,11 +18,11 @@ call %CURRENT_DIR%z_Common.bat
 rem --------------------------------------------------
 rem Build the batch Infrastructure
 rem --------------------------------------------------
-call dotnet restore "Frameworks\Infrastructure\Nuget_netcore80.sln"
-call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netcore80.sln"
+call dotnet restore "Frameworks\Infrastructure\Nuget_netcore100.sln"
+call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netcore100.sln"
 
-call dotnet restore "Frameworks\Infrastructure\Nuget_RichClient_netcore80.sln"
-call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore80.sln"
+call dotnet restore "Frameworks\Infrastructure\Nuget_RichClient_netcore100.sln"
+call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore100.sln"
 
 pause
 

root/programs/CS/3_Build_BusinessRichClient_netcore80.bat → root/programs/CS/3_Build_BusinessRichClient_netcore100.bat

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

root/programs/CS/3_Build_Business_netcore80.bat → root/programs/CS/3_Build_Business_netcore100.bat

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

root/programs/CS/4_Build_Framework_Tool.bat

@@ -31,13 +31,5 @@ rem --------------------------------------------------
 
 pause
 
-rem --------------------------------------------------
-rem Batch build of Deploy ZipPack With HTTP.
-rem --------------------------------------------------
-..\nuget.exe restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln"
-%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln"
-
-pause
-
 rem -------------------------------------------------------
 endlocal

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

root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore80.csproj → root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore100.csproj

@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Touryo.Infrastructure.Business</RootNamespace>
     <AssemblyName>OpenTouryo.Business</AssemblyName>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NETCOREAPP</DefineConstants>
-    <OutputPath>..\Build_netcore80\</OutputPath>
-    <DocumentationFile>..\Build_netcore80\net8.0\OpenTouryo.Business.xml</DocumentationFile>
+    <OutputPath>..\Build_netcore100\</OutputPath>
+    <DocumentationFile>..\Build_netcore100\net10.0\OpenTouryo.Business.xml</DocumentationFile>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1701;1702;NU1701</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
-    <OutputPath>..\Build_netcore80\</OutputPath>
-    <DocumentationFile>..\Build_netcore80\net8.0\OpenTouryo.Business.xml</DocumentationFile>
+    <OutputPath>..\Build_netcore100\</OutputPath>
+    <DocumentationFile>..\Build_netcore100\net10.0\OpenTouryo.Business.xml</DocumentationFile>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1701;1702;NU1701</NoWarn>
@@ -69,22 +69,22 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.DamManagedOdp">
-      <HintPath>..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll</HintPath>
+      <HintPath>..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.DamMySQL">
-      <HintPath>..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll</HintPath>
+      <HintPath>..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.DamPstGrS">
-      <HintPath>..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll</HintPath>
+      <HintPath>..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\Build_netcore80\net8.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\Build_netcore100\net10.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\Build_netcore80\net8.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\Build_netcore100\net10.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore80.csproj → root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore100.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <AssemblyName>OpenTouryo.Business.RichClient</AssemblyName>
@@ -11,17 +11,17 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
-    <OutputPath>..\..\Build_netcore80\</OutputPath>
-    <DocumentationFile>..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
+    <OutputPath>..\..\Build_netcore100\</OutputPath>
+    <DocumentationFile>..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1701;1702;NU1701</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
-    <OutputPath>..\..\Build_netcore80\</OutputPath>
-    <DocumentationFile>..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
+    <OutputPath>..\..\Build_netcore100\</OutputPath>
+    <DocumentationFile>..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1701;1702;NU1701</NoWarn>
@@ -33,34 +33,30 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Business">
-      <HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.Business.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.Business.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.DamManagedOdp">
-      <HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.DamMySQL">
-      <HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.DamPstGrS">
-      <HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Framework.RichClient">
-      <HintPath>..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.5" />
-  </ItemGroup>
-
 </Project>

root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.13.35931.197 d17.13
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient_net48", "Business\RichClient\Business.RichClient_net48.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}"
 EndProject

root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore80.sln → root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore100.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32126.317
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11012.119 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore80", "Business\RichClient\Business.RichClient_netcore80.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore100", "Business\RichClient\Business.RichClient_netcore100.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore80", "CustomControl\RichClient\CustomControl.RichClient_netcore80.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore100", "CustomControl\RichClient\CustomControl.RichClient_netcore100.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

root/programs/CS/Frameworks/Infrastructure/Business_net48.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business_net48", "Business\Business_net48.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}"
 EndProject

root/programs/CS/Frameworks/Infrastructure/Business_netcore80.sln → root/programs/CS/Frameworks/Infrastructure/Business_netcore100.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32126.317
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business_netcore80", "Business\Business_netcore80.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business_netcore100", "Business\Business_netcore100.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs

@@ -48,8 +48,7 @@
 namespace Touryo.Infrastructure.CustomControl.RichClient
 {
     /// <summary>System.Windows.Forms.MaskedTextBoxのカスタム・コントロール</summary>
-    [DefaultProperty("Text")]
-    [Designer(typeof(WinCustomMaskedTextBoxDesigner))]
+    [DefaultProperty("Text"), Designer(typeof(WinCustomMaskedTextBoxDesigner))]
     public class WinCustomMaskedTextBox : MaskedTextBox, ICheck, IGetValue, INotifyPropertyChanged
     {
         ///<summary>デザイナ上の表示をカスタマイズするインナークラス</summary>
@@ -167,8 +166,7 @@ public override string Text
         /// TextMaskFormatは初期値、IncludeLiteralsのままReadonlyに変更。
         /// このため、Textプロパティでは必ずマスク適用時の値を取得する。
         /// </summary>
-        [Category("動作"),
-        Description("TextMaskFormatは初期値、IncludeLiteralsのままReadonlyに。")]
+        [Category("動作"), Description("TextMaskFormatは初期値、IncludeLiteralsのままReadonlyに。")]
         public new MaskFormat TextMaskFormat
         {
             get
@@ -179,8 +177,11 @@ public override string Text
 
         /// <summary>Text2プロパティではマスクを除いた値を取得する。</summary>
         /// <remarks>Bindingsで使用可能なようにset_Text2を用意した。</remarks>
-        [Category("表示"),
-        Description("Text2プロパティではマスクを除いた値を設定・取得する。")]
+        [Category("表示"), Description("Text2プロパティではマスクを除いた値を設定・取得する。")
+#if NETCOREAPP
+            , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)
+#endif
+            ]
         public string Text2
         {
             get
@@ -207,8 +208,7 @@ public string Text2
         }
 
         /// <summary>Text3プロパティでは表示時マスク適用時の値を取得する。</summary>
-        [Category("表示"),
-        Description("Text3プロパティでは表示時マスク適用時の値を取得する。")]
+        [Category("表示"), Description("Text3プロパティでは表示時マスク適用時の値を取得する。")]
         public string Text3
         {
             get
@@ -439,20 +439,19 @@ public bool ShouldSerializeEditInitialValue()
         internal string OriginalMask { get; private set; }
 
         /// <summary>入力中のマスク</summary>
-        [Category("Edit"),
-        Description("入力中のマスク")]
+        [Category("Edit"), Description("入力中のマスク")
+#if NETCOREAPP
+            , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)
+#endif
+        ]
         public string Mask_Editing { get; set; }
 
         /// <summary>半角編集</summary>
-        [DefaultValue(false),
-        Category("Edit"),
-        Description("半角指定（マスクで指定できないため）")]
+        [DefaultValue(false), Category("Edit"), Description("半角指定（マスクで指定できないため）")]
         public bool EditToHankaku { get; set; }
 
         /// <summary>日付編集</summary>
-        [DefaultValue(false),
-        Category("Edit"),
-        Description("YYYYMMDDのM、Dが１桁の時に補正処理を行う。")]
+        [DefaultValue(false), Category("Edit"), Description("YYYYMMDDのM、Dが１桁の時に補正処理を行う。")]
         public bool EditToYYYYMMDD { get; set; }
 
         #endregion