Skip to content

Commit 12ec08f

Browse files
daisukenishino2daisukenishino2
authored
Merge pull request #502 from OpenTouryoProject/develop
Release work (Aligned with the LTS release cycle)
2 parents 4b74a0e + f944213 commit 12ec08f

288 files changed

Lines changed: 4879 additions & 15733 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎root/programs/CS/0_ExecAllBat.bat‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
@echo on
22
timeout 5
33

4-
echo | call 1_DeleteDir.bat
5-
echo | call 1_DeleteFile.bat
6-
echo | call 2_Build_NuGet_netstd20.bat
7-
8-
@echo on
9-
timeout 5
10-
114
echo | call 1_DeleteDir.bat
125
echo | call 1_DeleteFile.bat
136
echo | call 2_Build_NuGet_net48.bat
@@ -19,9 +12,9 @@ timeout 5
1912

2013
echo | call 1_DeleteDir.bat
2114
echo | call 1_DeleteFile.bat
22-
echo | call 2_Build_NuGet_nettcore80.bat
23-
echo | call 3_Build_Business_netcore80.bat
24-
echo | call 3_Build_BusinessRichClient_netcore80.bat
15+
echo | call 2_Build_NuGet_nettcore100.bat
16+
echo | call 3_Build_Business_netcore100.bat
17+
echo | call 3_Build_BusinessRichClient_netcore100.bat
2518

2619
@echo on
2720
timeout 5

‎root/programs/CS/0_Release4Nuget.bat‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
@echo on
22
timeout 5
33

4-
echo | call 1_DeleteDir.bat
5-
echo | call 2_Build_NuGet_netstd20.bat
6-
7-
@echo on
8-
timeout 5
9-
104
echo | call 1_DeleteDir.bat
115
echo | call 2_Build_NuGet_net48.bat
126

root/programs/CS/2_Build_NuGet_nettcore80.bat renamed to root/programs/CS/2_Build_NuGet_netcore100.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ call %CURRENT_DIR%z_Common.bat
1818
rem --------------------------------------------------
1919
rem Build the batch Infrastructure
2020
rem --------------------------------------------------
21-
call dotnet restore "Frameworks\Infrastructure\Nuget_netcore80.sln"
22-
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netcore80.sln"
21+
call dotnet restore "Frameworks\Infrastructure\Nuget_netcore100.sln"
22+
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netcore100.sln"
2323

24-
call dotnet restore "Frameworks\Infrastructure\Nuget_RichClient_netcore80.sln"
25-
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore80.sln"
24+
call dotnet restore "Frameworks\Infrastructure\Nuget_RichClient_netcore100.sln"
25+
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore100.sln"
2626

2727
pause
2828

root/programs/CS/3_Build_BusinessRichClient_netcore80.bat renamed to root/programs/CS/3_Build_BusinessRichClient_netcore100.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat
1818
rem --------------------------------------------------
1919
rem Build the batch Infrastructure
2020
rem --------------------------------------------------
21-
call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore80.sln"
22-
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore80.sln"
21+
call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore100.sln"
22+
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore100.sln"
2323

2424
pause
2525

root/programs/CS/3_Build_Business_netcore80.bat renamed to root/programs/CS/3_Build_Business_netcore100.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat
1818
rem --------------------------------------------------
1919
rem Build the batch Infrastructure
2020
rem --------------------------------------------------
21-
call dotnet restore "Frameworks\Infrastructure\Business_netcore80.sln"
22-
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore80.sln"
21+
call dotnet restore "Frameworks\Infrastructure\Business_netcore100.sln"
22+
call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore100.sln"
2323

2424
pause
2525

‎root/programs/CS/4_Build_Framework_Tool.bat‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,5 @@ rem --------------------------------------------------
3131

3232
pause
3333

34-
rem --------------------------------------------------
35-
rem Batch build of Deploy ZipPack With HTTP.
36-
rem --------------------------------------------------
37-
..\nuget.exe restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln"
38-
%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln"
39-
40-
pause
41-
4234
rem -------------------------------------------------------
4335
endlocal

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

3333
pause
3434

root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore80.csproj renamed to root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore100.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>Touryo.Infrastructure.Business</RootNamespace>
66
<AssemblyName>OpenTouryo.Business</AssemblyName>
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
88
</PropertyGroup>
99

1010
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1111
<DefineConstants>TRACE;DEBUG;NETCOREAPP</DefineConstants>
12-
<OutputPath>..\Build_netcore80\</OutputPath>
13-
<DocumentationFile>..\Build_netcore80\net8.0\OpenTouryo.Business.xml</DocumentationFile>
12+
<OutputPath>..\Build_netcore100\</OutputPath>
13+
<DocumentationFile>..\Build_netcore100\net10.0\OpenTouryo.Business.xml</DocumentationFile>
1414
<DebugType>full</DebugType>
1515
<DebugSymbols>true</DebugSymbols>
1616
<NoWarn>1701;1702;NU1701</NoWarn>
1717
</PropertyGroup>
1818

1919
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2020
<DefineConstants>TRACE;NETCOREAPP</DefineConstants>
21-
<OutputPath>..\Build_netcore80\</OutputPath>
22-
<DocumentationFile>..\Build_netcore80\net8.0\OpenTouryo.Business.xml</DocumentationFile>
21+
<OutputPath>..\Build_netcore100\</OutputPath>
22+
<DocumentationFile>..\Build_netcore100\net10.0\OpenTouryo.Business.xml</DocumentationFile>
2323
<DebugType>portable</DebugType>
2424
<DebugSymbols>true</DebugSymbols>
2525
<NoWarn>1701;1702;NU1701</NoWarn>
@@ -69,22 +69,22 @@
6969

7070
<ItemGroup>
7171
<Reference Include="OpenTouryo.DamManagedOdp">
72-
<HintPath>..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll</HintPath>
72+
<HintPath>..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll</HintPath>
7373
</Reference>
7474
<Reference Include="OpenTouryo.DamMySQL">
75-
<HintPath>..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll</HintPath>
75+
<HintPath>..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll</HintPath>
7676
</Reference>
7777
<Reference Include="OpenTouryo.DamPstGrS">
78-
<HintPath>..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll</HintPath>
78+
<HintPath>..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll</HintPath>
7979
</Reference>
8080
<Reference Include="OpenTouryo.Framework">
81-
<HintPath>..\Build_netcore80\net8.0\OpenTouryo.Framework.dll</HintPath>
81+
<HintPath>..\Build_netcore100\net10.0\OpenTouryo.Framework.dll</HintPath>
8282
</Reference>
8383
<Reference Include="OpenTouryo.Public">
84-
<HintPath>..\Build_netcore80\net8.0\OpenTouryo.Public.dll</HintPath>
84+
<HintPath>..\Build_netcore100\net10.0\OpenTouryo.Public.dll</HintPath>
8585
</Reference>
8686
<Reference Include="OpenTouryo.Public.Security">
87-
<HintPath>..\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll</HintPath>
87+
<HintPath>..\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll</HintPath>
8888
</Reference>
8989
</ItemGroup>
9090

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

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net8.0-windows7.0</TargetFramework>
5+
<TargetFramework>net10.0-windows7.0</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77
<UseWPF>true</UseWPF>
88
<AssemblyName>OpenTouryo.Business.RichClient</AssemblyName>
@@ -11,17 +11,17 @@
1111

1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1313
<DefineConstants>TRACE;NETCOREAPP</DefineConstants>
14-
<OutputPath>..\..\Build_netcore80\</OutputPath>
15-
<DocumentationFile>..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
14+
<OutputPath>..\..\Build_netcore100\</OutputPath>
15+
<DocumentationFile>..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
1616
<DebugType>full</DebugType>
1717
<DebugSymbols>true</DebugSymbols>
1818
<NoWarn>1701;1702;NU1701</NoWarn>
1919
</PropertyGroup>
2020

2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2222
<DefineConstants>TRACE;NETCOREAPP</DefineConstants>
23-
<OutputPath>..\..\Build_netcore80\</OutputPath>
24-
<DocumentationFile>..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
23+
<OutputPath>..\..\Build_netcore100\</OutputPath>
24+
<DocumentationFile>..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.xml</DocumentationFile>
2525
<DebugType>portable</DebugType>
2626
<DebugSymbols>true</DebugSymbols>
2727
<NoWarn>1701;1702;NU1701</NoWarn>
@@ -33,34 +33,30 @@
3333

3434
<ItemGroup>
3535
<Reference Include="OpenTouryo.Business">
36-
<HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.Business.dll</HintPath>
36+
<HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.Business.dll</HintPath>
3737
</Reference>
3838
<Reference Include="OpenTouryo.DamManagedOdp">
39-
<HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll</HintPath>
39+
<HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll</HintPath>
4040
</Reference>
4141
<Reference Include="OpenTouryo.DamMySQL">
42-
<HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll</HintPath>
42+
<HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll</HintPath>
4343
</Reference>
4444
<Reference Include="OpenTouryo.DamPstGrS">
45-
<HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll</HintPath>
45+
<HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll</HintPath>
4646
</Reference>
4747
<Reference Include="OpenTouryo.Framework">
48-
<HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.Framework.dll</HintPath>
48+
<HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.Framework.dll</HintPath>
4949
</Reference>
5050
<Reference Include="OpenTouryo.Framework.RichClient">
51-
<HintPath>..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll</HintPath>
51+
<HintPath>..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll</HintPath>
5252
</Reference>
5353
<Reference Include="OpenTouryo.Public">
54-
<HintPath>..\..\Build_netcore80\net8.0\OpenTouryo.Public.dll</HintPath>
54+
<HintPath>..\..\Build_netcore100\net10.0\OpenTouryo.Public.dll</HintPath>
5555
</Reference>
5656
</ItemGroup>
5757

5858
<ItemGroup>
5959
<Folder Include="Properties\" />
6060
</ItemGroup>
6161

62-
<ItemGroup>
63-
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.5" />
64-
</ItemGroup>
65-
6662
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

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

0 commit comments

Comments
 (0)