From 17e687e053b87296b33c9708ab5b88c207d7bdd3 Mon Sep 17 00:00:00 2001 From: daisukenishino2 Date: Tue, 5 Apr 2022 12:50:36 +0900 Subject: [PATCH] fixed #156 --- root/programs/3_BuildLibsAtOtherRepos.bat | 10 +++++----- root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat | 6 +++--- root/programs/CommandLineTools/CommandLineTools.sln | 4 ++-- .../programs/CommandLineTools/CommandLineToolsCore.sln | 4 ++-- .../netcore/CreateClientsIdentity.csproj | 6 +++--- .../CreateJwkSetJson/netcore/CreateJwkSetJson.csproj | 8 ++++---- .../netcore/CreateJwtBearerTokenFlowAssertion.csproj | 8 ++++---- root/programs/CommonLibrary/NetCoreLibrary.csproj | 10 +++++----- .../MultiPurposeAuthSite/MultiPurposeAuthSite.sln | 4 ++-- .../MultiPurposeAuthSiteCore.sln | 4 ++-- .../MultiPurposeAuthSiteCore.csproj | 10 +++++----- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/root/programs/3_BuildLibsAtOtherRepos.bat b/root/programs/3_BuildLibsAtOtherRepos.bat index 6692ff59..42b45e7c 100644 --- a/root/programs/3_BuildLibsAtOtherRepos.bat +++ b/root/programs/3_BuildLibsAtOtherRepos.bat @@ -35,18 +35,18 @@ if exist %extDir%\%tmpDir% GOTO Build :Build @rem ビルドがあるならコピーへ -if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore50" GOTO Xcopy +if exist "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\Frameworks\Infrastructure\Build_netcore60" GOTO Xcopy @rem batファイルを使用してビルド -cd "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\" +cd "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\" echo | call 3_Build_Business_net48.bat -echo | call 3_Build_Business_netcore50.bat +echo | call 3_Build_Business_netcore60.bat :Xcopy @rem ビルド出力をコピー cd %extDir% -xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\" -xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2019\programs\CS\Frameworks\Infrastructure\Build_netcore50" "OpenTouryoAssemblies\Build_netcore50\" +xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\" +xcopy /Y /E "Temp\OpenTouryoTemplates-%branchName%\root_VS2022\programs\CS\Frameworks\Infrastructure\Build_netcore60" "OpenTouryoAssemblies\Build_netcore60\" pause diff --git a/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat b/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat index fde69924..b47fbdb7 100644 --- a/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat +++ b/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat @@ -34,20 +34,20 @@ if exist %extDir%\%tmpDir% GOTO Build :Build @rem ビルドがあるならコピーへ -if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore50" GOTO Xcopy +if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore60" GOTO Xcopy @rem batファイルを使用してビルド cd "Temp\OpenTouryo-develop\root\programs\CS\" echo | call 2_Build_NuGet_net48.bat echo | call 3_Build_Business_net48.bat echo | call 2_Build_NuGet_netstd21.bat -echo | call 3_Build_Business_netcore50.bat +echo | call 3_Build_Business_netcore60.bat :Xcopy @rem ビルド出力をコピー cd %extDir% xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net48" "OpenTouryoAssemblies\Build_net48\" -xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore50" "OpenTouryoAssemblies\Build_netcore50\" +xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore60" "OpenTouryoAssemblies\Build_netcore60\" pause diff --git a/root/programs/CommandLineTools/CommandLineTools.sln b/root/programs/CommandLineTools/CommandLineTools.sln index d95189f2..57c38d12 100644 --- a/root/programs/CommandLineTools/CommandLineTools.sln +++ b/root/programs/CommandLineTools/CommandLineTools.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateClientsIdentity", "CreateClientsIdentity\net\CreateClientsIdentity.csproj", "{9176504B-F14B-4C59-8601-5C04BE9A889D}" EndProject diff --git a/root/programs/CommandLineTools/CommandLineToolsCore.sln b/root/programs/CommandLineTools/CommandLineToolsCore.sln index 73b5e6ad..bd846fae 100644 --- a/root/programs/CommandLineTools/CommandLineToolsCore.sln +++ b/root/programs/CommandLineTools/CommandLineToolsCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateClientsIdentity", "CreateClientsIdentity\netcore\CreateClientsIdentity.csproj", "{AA6CE5AB-B764-4E84-A5D9-0F49DFD312E4}" EndProject diff --git a/root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj b/root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj index f4587981..f707825c 100644 --- a/root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj +++ b/root/programs/CommandLineTools/CreateClientsIdentity/netcore/CreateClientsIdentity.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -26,10 +26,10 @@ - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj b/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj index d7d73698..065ef088 100644 --- a/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj +++ b/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -27,13 +27,13 @@ - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CommandLineTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj b/root/programs/CommandLineTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj index d7d73698..065ef088 100644 --- a/root/programs/CommandLineTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj +++ b/root/programs/CommandLineTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 @@ -27,13 +27,13 @@ - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CommonLibrary/NetCoreLibrary.csproj b/root/programs/CommonLibrary/NetCoreLibrary.csproj index d4b7a19b..38d65c9d 100644 --- a/root/programs/CommonLibrary/NetCoreLibrary.csproj +++ b/root/programs/CommonLibrary/NetCoreLibrary.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 MultiPurposeAuthSite MultiPurposeAuthSite.NetCoreLibrary @@ -62,16 +62,16 @@ - ..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/MultiPurposeAuthSite/MultiPurposeAuthSite.sln b/root/programs/MultiPurposeAuthSite/MultiPurposeAuthSite.sln index 3a5ce34e..c72a4dec 100644 --- a/root/programs/MultiPurposeAuthSite/MultiPurposeAuthSite.sln +++ b/root/programs/MultiPurposeAuthSite/MultiPurposeAuthSite.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29306.81 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiPurposeAuthSite", "MultiPurposeAuthSite\MultiPurposeAuthSite.csproj", "{4BA4D9DE-2656-4FBD-8F1F-31FC9583B5F5}" EndProject diff --git a/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.sln b/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.sln index 48eb01e6..d6831855 100644 --- a/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.sln +++ b/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29306.81 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiPurposeAuthSiteCore", "MultiPurposeAuthSiteCore\MultiPurposeAuthSiteCore.csproj", "{9113DCB6-89F8-4C17-BFFC-49855D9CCD57}" EndProject diff --git a/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.csproj b/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.csproj index 977ff2e2..3711824b 100644 --- a/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.csproj +++ b/root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 MultiPurposeAuthSite MultiPurposeAuthSite true @@ -38,16 +38,16 @@ - ..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll + ..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll - ..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll + ..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll - ..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll + ..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll - ..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll + ..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll