Skip to content

Commit f86cc2c

Browse files
daisukenishino2daisukenishino2
committed
fixed #14 
1 parent 8cb9630 commit f86cc2c

File tree

10 files changed

+44
-37
lines changed

10 files changed

+44
-37
lines changed

‎root/programs/3_BuildLibsAtOtherRepos.bat

+6-6
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-70
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_netcore50" 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_netcore50.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_netcore50" "OpenTouryoAssemblies\Build_netcore50\"
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

+3-3
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_netcore50" 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_netcore50.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_netcore50" "OpenTouryoAssemblies\Build_netcore50\"
50+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore60" "OpenTouryoAssemblies\Build_netcore60\"
5151

5252
pause
5353

‎root/programs/ASPNETWebService/ASPNETWebService.sln

+2-2
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/ASPNETWebServiceCore/ASPNETWebServiceCore.sln

+2-2
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

+10-10
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/WS_sample/WSServer_sample/WSServer_sample.sln

+5-2
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 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSServer_sample", "WSServer_sample.csproj", "{FA674CFA-F91C-4E05-B87E-93F5A052E614}"
77
EndProject
@@ -25,4 +25,7 @@ Global
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {1BF24D69-EB4D-4AD9-92C6-2E5EE69EF695}
30+
EndGlobalSection
2831
EndGlobal

‎root/programs/WS_sample/WSServer_sample/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net48" />
4+
</packages>

‎root/programs/WS_sampleCore/WSIFType_sample/WSIFType_sample.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
<ItemGroup>
@@ -10,13 +10,13 @@
1010

1111
<ItemGroup>
1212
<Reference Include="OpenTouryo.Business">
13-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
13+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll</HintPath>
1414
</Reference>
1515
<Reference Include="OpenTouryo.Framework">
16-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
16+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
1717
</Reference>
1818
<Reference Include="OpenTouryo.Public">
19-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
19+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
2020
</Reference>
2121
</ItemGroup>
2222

‎root/programs/WS_sampleCore/WSServer_sample/WSServer_sample.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
8-
<OutputPath>..\..\OpenTouryoAssemblies\Build_netcore50\</OutputPath>
9-
<DocumentationFile>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\WSServer_sample.xml</DocumentationFile>
8+
<OutputPath>..\..\OpenTouryoAssemblies\Build_netcore60\</OutputPath>
9+
<DocumentationFile>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\WSServer_sample.xml</DocumentationFile>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
@@ -26,13 +26,13 @@
2626

2727
<ItemGroup>
2828
<Reference Include="OpenTouryo.Business">
29-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
29+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll</HintPath>
3030
</Reference>
3131
<Reference Include="OpenTouryo.Framework">
32-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
32+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
3333
</Reference>
3434
<Reference Include="OpenTouryo.Public">
35-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
35+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
3636
</Reference>
3737
</ItemGroup>
3838

‎root/programs/WS_sampleCore/WSServer_sample/WSServer_sample.sln

+2-2
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}") = "WSServer_sample", "WSServer_sample.csproj", "{E11525D4-EB70-4F4E-B758-42861377705E}"
77
EndProject

0 commit comments

Comments
 (0)