Skip to content

Commit c22e7be

Browse files
daisukenishino2daisukenishino2
authored
Merge pull request #10 from OpenTouryoProject/develop
Release work ( ~ June 1, 2021)
2 parents f12806d + 86018cc commit c22e7be

File tree

14 files changed

+94
-82
lines changed

14 files changed

+94
-82
lines changed

license/LICENSE renamed to license/LICENSE.txt

File renamed without changes.

‎license/LicenseForTemplates.ja.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
テンプレート使用許諾契約書 参考訳
2+
3+
以下は、「Template License Agreement」を和訳したものである。英語版との矛盾が生じた場合は、英語版を優先する。
4+
5+
本ソフトウェア中のカスタマイズや追加実装を前提とした「テンプレート ファイル部分」は、この複製を取得するすべての人に対し、The MIT License に従い、使用等許諾します。
6+
7+
The MIT License
8+
Copyright (c) 2017 Hitachi Solutions,Ltd.
9+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
10+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎license/LicenseForTemplates.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Template License Agreement
2+
3+
"This Template File Part" assuming customization and additional implementation in this software is licensed to everyone who acquires this copy under the MIT License.
4+
5+
The MIT License
6+
Copyright (c) 2017 Hitachi Solutions,Ltd.
7+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
8+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

license/STATUS renamed to license/STATUS.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/02-50/root_VS2019/
77
新規追加部分はコピーライトを明記していませんが、
88
「著作物を創作した時点で自動的に著作権が付与される。」
99
と言う意味では、自動的にコミッタの著作権が付与されます。
10-
11-
テンプレート相当なので、著作権を主張するつもりもあまりありません。

‎root/programs/1_DeleteDir.bat‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
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
)
19+
3120
pause
21+
22+
set DIRECTORIES=Build, Build_net45, Build_net46, Build_net47, Build_net48, Build_netstd20, Build_netstd21, Build_netcore20, Build_netcore30, Build_netcore50
23+
@echo --------------------------------------------------
24+
@echo Delete the %DIRECTORIES% folders.
25+
@echo --------------------------------------------------
26+
27+
@rem カンマをスペースに変換
28+
set w1=%DIRECTORIES:,= %
29+
30+
@rem 連続したスペースを、スペース１個に変換
31+
set w2=%w1: = %
32+
33+
for %%a in ( %w2% ) do (
34+
for /D /R %%i in ( %%a ) do (
35+
if exist "%%~i" RD /S /Q "%%~i"
36+
)
37+
)
38+
39+
pause

‎root/programs/ASPNETWebService/ASPNETWebService.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 16
4+
VisualStudioVersion = 16.0.30320.27
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/ASPNETWebService/ASPNETWebService/ASPNETWebService.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<AssemblyName>ASPNETWebService</AssemblyName>
1717
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1818
<UseIISExpress>true</UseIISExpress>
19-
<IISExpressSSLPort />
20-
<IISExpressAnonymousAuthentication />
21-
<IISExpressWindowsAuthentication />
22-
<IISExpressUseClassicPipelineMode />
19+
<IISExpressSSLPort>44335</IISExpressSSLPort>
20+
<IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
21+
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
22+
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
2323
<UseGlobalApplicationHostFile />
2424
<NuGetPackageImportStamp>
2525
</NuGetPackageImportStamp>
@@ -190,11 +190,9 @@
190190
<WebProjectProperties>
191191
<UseIIS>True</UseIIS>
192192
<AutoAssignPort>True</AutoAssignPort>
193-
<DevelopmentServerPort>50064</DevelopmentServerPort>
193+
<DevelopmentServerPort>58497</DevelopmentServerPort>
194194
<DevelopmentServerVPath>/</DevelopmentServerVPath>
195-
<IISUrl>http://localhost:8888/</IISUrl>
196-
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
197-
<IISAppRootUrl>http://localhost:8888/</IISAppRootUrl>
195+
<IISUrl>https://localhost:44335/</IISUrl>
198196
<NTLMAuthentication>False</NTLMAuthentication>
199197
<UseCustomServer>False</UseCustomServer>
200198
<CustomServerUrl>

‎root/programs/ASPNETWebServiceCore/ASPNETWebServiceCore/ASPNETWebServiceCore.csproj‎

Lines changed: 10 additions & 10 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
</PropertyGroup>
66

77
<ItemGroup>
@@ -14,31 +14,31 @@
1414

1515
<ItemGroup>
1616
<Reference Include="OpenTouryo.Business">
17-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Business.dll</HintPath>
17+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Business.dll</HintPath>
1818
</Reference>
1919
<Reference Include="OpenTouryo.DamManagedOdp">
20-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.DamManagedOdp.dll</HintPath>
20+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.DamManagedOdp.dll</HintPath>
2121
</Reference>
2222
<Reference Include="OpenTouryo.DamMySQL">
23-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.DamMySQL.dll</HintPath>
23+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.DamMySQL.dll</HintPath>
2424
</Reference>
2525
<Reference Include="OpenTouryo.DamPstGrS">
26-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.DamPstGrS.dll</HintPath>
26+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.DamPstGrS.dll</HintPath>
2727
</Reference>
2828
<Reference Include="OpenTouryo.Framework">
29-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Framework.dll</HintPath>
29+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Framework.dll</HintPath>
3030
</Reference>
3131
<Reference Include="OpenTouryo.Public">
32-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.dll</HintPath>
32+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.dll</HintPath>
3333
</Reference>
3434
<Reference Include="OpenTouryo.Public.Security">
35-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\OpenTouryo.Public.Security.dll</HintPath>
35+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\OpenTouryo.Public.Security.dll</HintPath>
3636
</Reference>
3737
<Reference Include="WSIFType_sample">
38-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\WSIFType_sample.dll</HintPath>
38+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\WSIFType_sample.dll</HintPath>
3939
</Reference>
4040
<Reference Include="WSServer_sample">
41-
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore30\netcoreapp3.0\WSServer_sample.dll</HintPath>
41+
<HintPath>..\..\OpenTouryoAssemblies\Build_netcore50\net5.0\WSServer_sample.dll</HintPath>
4242
</Reference>
4343
</ItemGroup>
4444

‎root/programs/ASPNETWebServiceCore/ASPNETWebServiceCore/Properties/launchSettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"windowsAuthentication": false,
44
"anonymousAuthentication": true,
55
"iisExpress": {
6-
"applicationUrl": "http://localhost:8888/",
6+
"applicationUrl": "https://localhost:44335/",
77
"sslPort": 0
88
}
99
},
@@ -21,7 +21,7 @@
2121
"environmentVariables": {
2222
"ASPNETCORE_ENVIRONMENT": "Development"
2323
},
24-
"applicationUrl": "http://localhost:8888/"
24+
"applicationUrl": "https://localhost:44335/"
2525
}
2626
}
2727
}

‎root/programs/ASPNETWebServiceCore/ASPNETWebServiceCore/appsettings.json‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
11
{
2-
// 簡易ログの設定
3-
"Logging": {
4-
"IncludeScopes": false,
5-
"Debug": {
6-
"LogLevel": {
7-
"Default": "Warning"
8-
}
9-
},
10-
"Console": {
11-
"LogLevel": {
12-
"Default": "Warning"
13-
}
14-
}
15-
},
16-
17-
// Here is where you can supply custom configuration settings, Since it is is JSON,
18-
// everything is represented as key: value pairs. Name of section is your choice.
19-
"AppConfiguration": {
20-
"XXXX": "xxxx",
21-
"YYYY": "yyyy"
22-
},
23-
24-
// 以下は*.configから移行されたsection
25-
262
// connectionStrings section
273
"connectionStrings": {
284
"ConnectionString_SQL": "Data Source=localhost\\sqlexpress;Initial Catalog=Northwind;Integrated Security=True;",

0 commit comments

Comments
 (0)