Skip to content

Commit 294366f

Browse files
daisukenishino2daisukenishino2
authored
Merge pull request #157 from OpenTouryoProject/develop
Tweak.
2 parents 00ca3ab + 17e687e commit 294366f

11 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎root/programs/3_BuildLibsAtOtherRepos.bat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

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_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/CommandLineTools/CommandLineTools.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 15
4-
VisualStudioVersion = 15.0.28010.2016
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateClientsIdentity", "CreateClientsIdentity\net\CreateClientsIdentity.csproj", "{9176504B-F14B-4C59-8601-5C04BE9A889D}"
77
EndProject

‎root/programs/CommandLineTools/CommandLineToolsCore.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 15
4-
VisualStudioVersion = 15.0.28010.2016
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateClientsIdentity", "CreateClientsIdentity\netcore\CreateClientsIdentity.csproj", "{AA6CE5AB-B764-4E84-A5D9-0F49DFD312E4}"
77
EndProject

‎root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,10 +26,10 @@
2626

2727
<ItemGroup>
2828
<Reference Include="OpenTouryo.Public">
29-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
29+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
3030
</Reference>
3131
<Reference Include="OpenTouryo.Public.Security">
32-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
32+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
3333
</Reference>
3434
</ItemGroup>
3535

‎root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
2727

2828
<ItemGroup>
2929
<Reference Include="OpenTouryo.Framework">
30-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
30+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
3131
</Reference>
3232
<Reference Include="OpenTouryo.Public">
33-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
33+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
3434
</Reference>
3535
<Reference Include="OpenTouryo.Public.Security">
36-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
36+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
3737
</Reference>
3838
</ItemGroup>
3939

‎root/programs/CommandLineTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
2727

2828
<ItemGroup>
2929
<Reference Include="OpenTouryo.Framework">
30-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
30+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
3131
</Reference>
3232
<Reference Include="OpenTouryo.Public">
33-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
33+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
3434
</Reference>
3535
<Reference Include="OpenTouryo.Public.Security">
36-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
36+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
3737
</Reference>
3838
</ItemGroup>
3939

‎root/programs/CommonLibrary/NetCoreLibrary.csproj‎

Lines changed: 5 additions & 5 deletions
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
<RootNamespace>MultiPurposeAuthSite</RootNamespace>
66
<AssemblyName>MultiPurposeAuthSite.NetCoreLibrary</AssemblyName>
77
</PropertyGroup>
@@ -62,16 +62,16 @@
6262

6363
<ItemGroup>
6464
<Reference Include="OpenTouryo.Business">
65-
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
65+
<HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll</HintPath>
6666
</Reference>
6767
<Reference Include="OpenTouryo.Framework">
68-
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
68+
<HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
6969
</Reference>
7070
<Reference Include="OpenTouryo.Public">
71-
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
71+
<HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
7272
</Reference>
7373
<Reference Include="OpenTouryo.Public.Security">
74-
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
74+
<HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
7575
</Reference>
7676
</ItemGroup>
7777

‎root/programs/MultiPurposeAuthSite/MultiPurposeAuthSite.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.29306.81
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiPurposeAuthSite", "MultiPurposeAuthSite\MultiPurposeAuthSite.csproj", "{4BA4D9DE-2656-4FBD-8F1F-31FC9583B5F5}"
77
EndProject

‎root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.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.29306.81
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32126.317
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiPurposeAuthSiteCore", "MultiPurposeAuthSiteCore\MultiPurposeAuthSiteCore.csproj", "{9113DCB6-89F8-4C17-BFFC-49855D9CCD57}"
77
EndProject

0 commit comments

Comments
 (0)