Merge pull request #157 from OpenTouryoProject/develop

Tweak.
OpenTouryoProject · Apr 5, 2022 · 294366f · 294366f
2 parents 00ca3ab + 17e687e
commit 294366f
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,10 +26,10 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj b/root/programs/CommandLineTools/CreateJwkSetJson/netcore/CreateJwkSetJson.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/...eTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj b/...eTools/CreateJwtBearerTokenFlowAssertion/netcore/CreateJwtBearerTokenFlowAssertion.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,13 +27,13 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/root/programs/CommonLibrary/NetCoreLibrary.csproj b/root/programs/CommonLibrary/NetCoreLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>MultiPurposeAuthSite</RootNamespace>
     <AssemblyName>MultiPurposeAuthSite.NetCoreLibrary</AssemblyName>
   </PropertyGroup>
@@ -62,16 +62,16 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Business">
-      <HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
+      <HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git 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
@@ -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/...rograms/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.csproj b/...rograms/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>MultiPurposeAuthSite</RootNamespace>
     <AssemblyName>MultiPurposeAuthSite</AssemblyName>
     <PreserveCompilationContext>true</PreserveCompilationContext>
@@ -38,16 +38,16 @@
 
   <ItemGroup>
     <Reference Include="OpenTouryo.Business">
-      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
+      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Business.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Framework">
-      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
+      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public">
-      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
+      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.dll</HintPath>
     </Reference>
     <Reference Include="OpenTouryo.Public.Security">
-      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
+      <HintPath>..\..\OpenTouryoAssemblies\Build_netcore60\net6.0\OpenTouryo.Public.Security.dll</HintPath>
     </Reference>
   </ItemGroup>