Skip to content

Commit 9ea5056

Browse files
daisukenishino2daisukenishino2
committed
https://github.com/OpenTouryoProject/OpenTouryo/issues/362
1 parent a07769b commit 9ea5056

7 files changed

Lines changed: 33 additions & 45 deletions

File tree

‎root/programs/1_DeleteDir.bat‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
@echo off
22

3+
set DIRECTORIES=packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs
34
@echo --------------------------------------------------
4-
@echo Delete the packages, obj, bin, bld, Temp, Build, PrecompiledWeb, .vs folders.
5+
@echo Delete the %DIRECTORIES% folders.
56
@echo --------------------------------------------------
67

7-
for /D /R %%i in ( packages ) do (
8-
if exist "%%~i" RD /S /Q "%%~i"
9-
)
10-
for /D /R %%i in ( obj ) do (
11-
if exist "%%~i" RD /S /Q "%%~i"
12-
)
13-
for /D /R %%i in ( bin ) do (
14-
if exist "%%~i" RD /S /Q "%%~i"
15-
)
16-
for /D /R %%i in ( bld ) do (
17-
if exist "%%~i" RD /S /Q "%%~i"
18-
)
19-
for /D /R %%i in ( Temp ) do (
20-
if exist "%%~i" RD /S /Q "%%~i"
21-
)
22-
for /D /R %%i in ( Build ) do (
23-
if exist "%%~i" RD /S /Q "%%~i"
24-
)
25-
for /D /R %%i in ( PrecompiledWeb ) do (
26-
if exist "%%~i" RD /S /Q "%%~i"
27-
)
28-
for /D /R %%i in ( .vs ) do (
29-
if exist "%%~i" RD /S /Q "%%~i"
8+
@rem カンマをスペースに変換
9+
set w1=%DIRECTORIES:,= %
10+
11+
@rem 連続したスペースを、スペース１個に変換
12+
set w2=%w1: = %
13+
14+
for %%a in ( %w2% ) do (
15+
for /D /R %%i in ( %%a ) do (
16+
if exist "%%~i" RD /S /Q "%%~i"
17+
)
3018
)
3119
pause

‎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>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.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_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
29+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
3030
</Reference>
3131
<Reference Include="OpenTouryo.Public.Security">
32-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
32+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.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>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.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_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
30+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
3131
</Reference>
3232
<Reference Include="OpenTouryo.Public">
33-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
33+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
3434
</Reference>
3535
<Reference Include="OpenTouryo.Public.Security">
36-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
36+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.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>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.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_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
30+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
3131
</Reference>
3232
<Reference Include="OpenTouryo.Public">
33-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
33+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
3434
</Reference>
3535
<Reference Include="OpenTouryo.Public.Security">
36-
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
36+
<HintPath>..\..\..\OpenTouryoAssemblies\Build_netcore50\net5.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>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.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_netcore30\netcoreapp3.0\OpenTouryo.Business.dll</HintPath>
65+
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
6666
</Reference>
6767
<Reference Include="OpenTouryo.Framework">
68-
<HintPath>..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
68+
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
6969
</Reference>
7070
<Reference Include="OpenTouryo.Public">
71-
<HintPath>..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
71+
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
7272
</Reference>
7373
<Reference Include="OpenTouryo.Public.Security">
74-
<HintPath>..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
74+
<HintPath>..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
7575
</Reference>
7676
</ItemGroup>
7777

‎root/programs/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore/MultiPurposeAuthSiteCore.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
66
<AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName>
77
<UserSecretsId>aspnet-MultiPurposeAuthSite-4D4ED842-8221-4C3E-A9D4-5295FF6E400D</UserSecretsId>
@@ -41,16 +41,16 @@
4141

4242
<ItemGroup>
4343
<Reference Include="OpenTouryo.Business">
44-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Business.dll</HintPath>
44+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
4545
</Reference>
4646
<Reference Include="OpenTouryo.Framework">
47-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
47+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
4848
</Reference>
4949
<Reference Include="OpenTouryo.Public">
50-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
50+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
5151
</Reference>
5252
<Reference Include="OpenTouryo.Public.Security">
53-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
53+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
5454
</Reference>
5555
</ItemGroup>
5656

‎root/programs/nuget.exe‎

-6.27 MB
Binary file not shown.

0 commit comments

Comments
 (0)