Skip to content

Commit e96b5aa

Browse files
daisukenishino2daisukenishino2
authored
Merge pull request #15 from OpenTouryoProject/develop
Release work ( ~ May 1, 2022)
2 parents c22e7be + f86cc2c commit e96b5aa

File tree

22 files changed

+118
-142
lines changed

22 files changed

+118
-142
lines changed

‎root/programs/10_ASPNETWebService.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ rem --------------------------------------------------
1919
rem Batch build of ASPNETWebService.
2020
rem --------------------------------------------------
2121
nuget.exe restore "ASPNETWebService\ASPNETWebService.sln"
22-
%BUILDFILEPATH% %COMMANDLINE% /t:Restore "ASPNETWebService\ASPNETWebService.sln"
22+
%BUILDFILEPATH% %COMMANDLINE% "ASPNETWebService\ASPNETWebService.sln"
23+
2324

2425
pause
2526

‎root/programs/3_BuildLibsAtOtherRepos.bat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ setlocal
1010
set zipfilename=Temp.zip
1111

1212
@rem GitHubのZIPパス
13-
set branchName=02-60
13+
set branchName=03-00
1414
set srcUrl=https://github.com/OpenTouryoProject/OpenTouryoTemplates/archive/%branchName%.zip
1515

1616
@rem 解凍ディレクトリ
@@ -35,18 +35,18 @@ if exist %extDir%\%tmpDir% GOTO Build
3535

3636
:Build
3737
@rem ビルドがあるならコピーへ
38-
if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
38+
if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\Frameworks\Infrastructure\Build_netcore60" GOTO Xcopy
3939

4040
@rem batファイルを使用してビルド
41-
cd "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\"
41+
cd "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\"
4242
echo | call 3_Build_Business_net48.bat
43-
echo | call 3_Build_Business_netcore30.bat
43+
echo | call 3_Build_Business_netcore60.bat
4444

4545
:Xcopy
4646
@rem ビルド出力をコピー
4747
cd %extDir%
48-
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
49-
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
48+
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
49+
xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\Frameworks\Infrastructure\Build_netcore60" "OpenTouryoAssemblies\Build_netcore60\"
5050

5151
pause
5252

‎root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ if exist %extDir%\%tmpDir% GOTO Build
3434

3535
:Build
3636
@rem ビルドがあるならコピーへ
37-
if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
37+
if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore60" GOTO Xcopy
3838

3939
@rem batファイルを使用してビルド
4040
cd "Temp\OpenTouryo-develop\root\programs\CS\"
4141
echo | call 2_Build_NuGet_net48.bat
4242
echo | call 3_Build_Business_net48.bat
4343
echo | call 2_Build_NuGet_netstd21.bat
44-
echo | call 3_Build_Business_netcore30.bat
44+
echo | call 3_Build_Business_netcore60.bat
4545

4646
:Xcopy
4747
@rem ビルド出力をコピー
4848
cd %extDir%
4949
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\"
50-
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
50+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore60" "OpenTouryoAssemblies\Build_netcore60\"
5151

5252
pause
5353

‎root/programs/6_Build_WSSrv_sample.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ call %CURRENT_DIR%z_Common.bat
1818
rem --------------------------------------------------
1919
rem Batch build of WSServer_sample.
2020
rem --------------------------------------------------
21-
%BUILDFILEPATH% %COMMANDLINE% /t:Restore "WS_sample\WSServer_sample\WSServer_sample.sln"
21+
..\nuget.exe restore "WS_sample\WSServer_sample\WSServer_sample.sln"
22+
%BUILDFILEPATH% %COMMANDLINE% "WS_sample\WSServer_sample\WSServer_sample.sln"
2223

2324
pause
2425

‎root/programs/ASPNETWebService/ASPNETWebService.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 16
4-
VisualStudioVersion = 16.0.30320.27
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebService", "ASPNETWebService\ASPNETWebService.csproj", "{C24BC2FA-D423-4F0F-B2B0-E647B621683D}"
77
EndProject

‎root/programs/ASPNETWebService/ASPNETWebService/Controllers/JsonController.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,9 @@ TestParameterValue testParameterValue
394394
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
395395
new MyUserInfo(userName, ipAddress));
396396

397-
testParameterValue.OrderColumn = param.orderColumn;
398-
testParameterValue.OrderSequence = param.orderSequence;
399-
397+
testParameterValue.OrderColumn = param.OrderColumn;
398+
testParameterValue.OrderSequence = param.OrderSequence;
399+
400400
// 非同期呼び出し
401401
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
402402

@@ -454,7 +454,7 @@ TestParameterValue testParameterValue
454454
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
455455
new MyUserInfo(userName, ipAddress));
456456

457-
testParameterValue.ShipperID = param.shipper.ShipperID;
457+
testParameterValue.ShipperID = param.Shipper.ShipperID;
458458

459459
// 非同期呼び出し
460460
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -517,8 +517,8 @@ TestParameterValue testParameterValue
517517
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
518518
new MyUserInfo(userName, ipAddress));
519519

520-
testParameterValue.CompanyName = param.shipper.CompanyName;
521-
testParameterValue.Phone = param.shipper.Phone;
520+
testParameterValue.CompanyName = param.Shipper.CompanyName;
521+
testParameterValue.Phone = param.Shipper.Phone;
522522

523523
// 非同期呼び出し
524524
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -576,10 +576,10 @@ TestParameterValue testParameterValue
576576
"JsonController", "Update", "Update",
577577
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
578578
new MyUserInfo(userName, ipAddress));
579-
580-
testParameterValue.ShipperID = param.shipper.ShipperID;
581-
testParameterValue.CompanyName = param.shipper.CompanyName;
582-
testParameterValue.Phone = param.shipper.Phone;
579+
580+
testParameterValue.ShipperID = param.Shipper.ShipperID;
581+
testParameterValue.CompanyName = param.Shipper.CompanyName;
582+
testParameterValue.Phone = param.Shipper.Phone;
583583

584584
// 非同期呼び出し
585585
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -638,7 +638,7 @@ TestParameterValue testParameterValue
638638
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
639639
new MyUserInfo(userName, ipAddress));
640640

641-
testParameterValue.ShipperID = param.shipper.ShipperID;
641+
testParameterValue.ShipperID = param.Shipper.ShipperID;
642642

643643
// 非同期呼び出し
644644
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);

‎root/programs/ASPNETWebService/ASPNETWebService/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- connectionStringsの設定 -->
1717
<connectionStrings>
1818
<!-- SQL Server / SQL Client用 -->
19-
<add name="ConnectionString_SQL" connectionString="Data Source=localhost\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;" />
19+
<add name="ConnectionString_SQL" connectionString="Data Source=localhost;Initial Catalog=Northwind;User ID=sa;Password=seigi@123;" />
2020
<!-- Multi-DB / OLEDB.NET用 -->
2121
<add name="ConnectionString_OLE" connectionString="Provider=SQLNCLI10.1;Data Source=localhost\sqlexpress;Integrated Security=SSPI;Initial Catalog=Northwind;" />
2222
<!-- Multi-DB / ODCB.NET用 -->

‎root/programs/ASPNETWebServiceCore/ASPNETWebServiceCore.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 16
4-
VisualStudioVersion = 16.0.29209.62
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASPNETWebServiceCore", "ASPNETWebServiceCore\ASPNETWebServiceCore.csproj", "{B325E5F0-EEF5-4E52-A55E-2AA5F46A5697}"
77
EndProject

‎root/programs/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -14,31 +14,31 @@
1414

1515
<ItemGroup>
1616
<Reference Include="OpenTouryo.Business">
17-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
17+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll</HintPath>
1818
</Reference>
1919
<Reference Include="OpenTouryo.DamManagedOdp">
20-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.DamManagedOdp.dll</HintPath>
20+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.DamManagedOdp.dll</HintPath>
2121
</Reference>
2222
<Reference Include="OpenTouryo.DamMySQL">
23-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll</HintPath>
23+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.DamMySQL.dll</HintPath>
2424
</Reference>
2525
<Reference Include="OpenTouryo.DamPstGrS">
26-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll</HintPath>
26+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.DamPstGrS.dll</HintPath>
2727
</Reference>
2828
<Reference Include="OpenTouryo.Framework">
29-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
29+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
3030
</Reference>
3131
<Reference Include="OpenTouryo.Public">
32-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
32+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
3333
</Reference>
3434
<Reference Include="OpenTouryo.Public.Security">
35-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
35+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
3636
</Reference>
3737
<Reference Include="WSIFType_sample">
38-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\WSIFType_sample.dll</HintPath>
38+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\WSIFType_sample.dll</HintPath>
3939
</Reference>
4040
<Reference Include="WSServer_sample">
41-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\WSServer_sample.dll</HintPath>
41+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\WSServer_sample.dll</HintPath>
4242
</Reference>
4343
</ItemGroup>
4444

‎root/programs/ASPNETWebServiceCore/ASPNETWebServiceCore/Controllers/JsonController.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ TestParameterValue testParameterValue
390390
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
391391
new MyUserInfo(userName, ipAddress));
392392

393-
testParameterValue.OrderColumn = param.orderColumn;
394-
testParameterValue.OrderSequence = param.orderSequence;
393+
testParameterValue.OrderColumn = param.OrderColumn;
394+
testParameterValue.OrderSequence = param.OrderSequence;
395395

396396
// 非同期呼び出し
397397
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -449,7 +449,7 @@ TestParameterValue testParameterValue
449449
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
450450
new MyUserInfo(userName, ipAddress));
451451

452-
testParameterValue.ShipperID = param.shipper.ShipperID;
452+
testParameterValue.ShipperID = param.Shipper.ShipperID;
453453

454454
// 非同期呼び出し
455455
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -511,8 +511,8 @@ TestParameterValue testParameterValue
511511
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
512512
new MyUserInfo(userName, ipAddress));
513513

514-
testParameterValue.CompanyName = param.shipper.CompanyName;
515-
testParameterValue.Phone = param.shipper.Phone;
514+
testParameterValue.CompanyName = param.Shipper.CompanyName;
515+
testParameterValue.Phone = param.Shipper.Phone;
516516

517517
// 非同期呼び出し
518518
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -570,9 +570,9 @@ TestParameterValue testParameterValue
570570
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
571571
new MyUserInfo(userName, ipAddress));
572572

573-
testParameterValue.ShipperID = param.shipper.ShipperID;
574-
testParameterValue.CompanyName = param.shipper.CompanyName;
575-
testParameterValue.Phone = param.shipper.Phone;
573+
testParameterValue.ShipperID = param.Shipper.ShipperID;
574+
testParameterValue.CompanyName = param.Shipper.CompanyName;
575+
testParameterValue.Phone = param.Shipper.Phone;
576576

577577
// 非同期呼び出し
578578
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);
@@ -630,7 +630,7 @@ TestParameterValue testParameterValue
630630
param.ddlDap + "%" + param.ddlMode1 + "%" + param.ddlMode2 + "%" + param.ddlExRollback,
631631
new MyUserInfo(userName, ipAddress));
632632

633-
testParameterValue.ShipperID = param.shipper.ShipperID;
633+
testParameterValue.ShipperID = param.Shipper.ShipperID;
634634

635635
// 非同期呼び出し
636636
AsyncRetVal asyncRetVal = await this.Call("testInProcess", testParameterValue);

0 commit comments

Comments
 (0)