Merge pull request #67 from OpenTouryoProject/develop

Fixed : "To merge the changes ( - Until March 31)." #66

Author: yusukemaegawa

.gitignore

@@ -1,32 +1,39 @@
-# Created by http://www.gitignore.io
-
-### VisualStudio ###
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
 *.user
+*.userosscache
 *.sln.docstates
 
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+[Rr]eleases/
 x64/
-build/
+x86/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
 
-# Roslyn cache directories
-*.ide
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-#NUNIT
+# NUNIT
 *.VisualState.xml
 TestResult.xml
 
@@ -35,6 +42,12 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
 *_i.c
 *_p.c
 *_i.h
@@ -67,14 +80,18 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
+*.sap
 
 # TFS 2012 Local Workspace
 $tf/
@@ -87,7 +104,7 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding addin-in
+# JustCode is a .NET coding add-in
 .JustCode
 
 # TeamCity is a build add-in
@@ -96,9 +113,14 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
 
 # MightyMoose
 *.mm.*
@@ -126,42 +148,69 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-## TODO: Comment the next line if you want to checkin your web deploy settings but do note that will include unencrypted passwords
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
-
-# NuGet Packages Directory
-packages/*
-## TODO: If the tool you use requires repositories.config uncomment the next line
-#!packages/repositories.config
-
-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
-!packages/build/
-
-# Windows Azure Build Output
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
 csx/
 *.build.csdef
 
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
 
 # Others
-*.Cache
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
 
 # RIA/Silverlight projects
 Generated_Code/
 
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
@@ -170,6 +219,7 @@ UpgradeLog*.htm
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
@@ -179,15 +229,60 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
-/root_VS2010/programs/C#/Frameworks/PortableClassLibrary/PCLBusiness/bin/Debug/PCLBusiness.dll
-/root_VS2010/programs/C#/Frameworks/PortableClassLibrary/PCLFramework/bin/Debug/PCLFramework.dll
-/root_VS2010/programs/C#/Frameworks/PortableClassLibrary/PCLPublic/bin/Debug/PCLPublic.dll
-/root_VS2012/programs/C#/Frameworks/PortableClassLibrary/PCLBusiness/bin/Debug/PCLBusiness.dll
-/root_VS2012/programs/C#/Frameworks/PortableClassLibrary/PCLFramework/bin/Debug/PCLFramework.dll
-/root_VS2012/programs/C#/Frameworks/PortableClassLibrary/PCLPublic/bin/Debug/PCLPublic.dll
-/root_VS2013/programs/C#/Frameworks/PortableClassLibrary/PCLBusiness/bin/Debug/PCLBusiness.dll
-/root_VS2013/programs/C#/Frameworks/PortableClassLibrary/PCLFramework/bin/Debug/PCLFramework.dll
-/root_VS2013/programs/C#/Frameworks/PortableClassLibrary/PCLPublic/bin/Debug/PCLPublic.dll
-/root_VS2015/programs/C#/Samples/WinAzure_sample/packages/Microsoft.WindowsAzure.ConfigurationManager.1.7.0.0/Microsoft.WindowsAzure.ConfigurationManager.1.7.0.0.nupkg
-/root_VS2015/programs/C#/Samples/WinAzure_sample/packages/Microsoft.WindowsAzure.ConfigurationManager.1.7.0.0/\[Content_Types\].xml
-/root_VS2015/programs/C#/Samples/WinAzure_sample/packages/Microsoft.WindowsAzure.ConfigurationManager.1.7.0.0/lib/net35-full/Microsoft.WindowsAzure.Configuration.dll
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs

README.md

@@ -1,28 +1,20 @@
-#Open棟梁(OpenTouryo)
+# OpenTouryo
+*OpenTouryo* is an application framework for .NET Framework which was developed using the accumulated know-how with a long track record in .NET application development.
 
-"Open棟梁" は、長年の.NETアプリケーション開発実績にて蓄積したノウハウに基づき開発した.NET Framework用アプリケーション フレームワークです。
-("OpenTouryo" is an application framework for .NET Framework which was developed using the accumulated know-how with a long track record in .NET application development.)
-
-テンプレート・ベースに同梱されるサンプルはOpen棟梁の評価に利用できます。
-また、テンプレート・ベースをチュートリアルの内容に従いカスタマイズすることで
-当該Visual Studioバージョンの案件向けプロジェクト・テンプレートを作成できます。 
-(You can see what OpenTouryo is according to template-base.
+You can see what OpenTouryo is according to template-base.
 Further, you can create the "project template" using proper version of Visual Studio.
-Tutorial will be helpful to you for customizing template-base!)
-
-詳しくは、各フォルダのReadmeをご参照ください。
-(For more information, please refer to the Readme in each root_VS20XX folder.)
+Tutorial will be helpful to you for customizing template-base!
 
-## 内容物(contents)
+For more information, please refer to the Readme in each root_VS20XX folder.
 
-### [/license/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/license)
-ライセンス(license)
+## contents
 
-### テンプレート・ベース（Template-base）
+### license
+[/license/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/license)
 
+### Template-base
 |Template-base|Develop Environment|Run-time Environment|
 |:-----|:------------------|:-------------------|
-|[/root_VS2010/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2010)|Visual Studio 2010|.NET Framework 3.5 SP1|
-|[/root_VS2012/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2012)|Visual Studio 2012|.NET Framework 4.5|
-|[/root_VS2013/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2013)|Visual Studio 2013|.NET Framework 4.5.1|
 |[/root_VS2015/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2015)|Visual Studio 2015|.NET Framework 4.6|
+
+When using Visual Studio 2013 or earlier, please use *[OpenTouryoTemplates version 01-80](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/01-80)*.

Readme.ja.md

@@ -0,0 +1,21 @@
+# Open棟梁
+**Open棟梁** は、長年の.NETアプリケーション開発実績にて蓄積したノウハウに基づき開発した.NET Framework用アプリケーション フレームワークです。
+
+テンプレート・ベースに同梱されるサンプルはOpen棟梁の評価に利用できます。
+また、テンプレート・ベースをチュートリアルの内容に従いカスタマイズすることで
+当該Visual Studioバージョンの案件向けプロジェクト・テンプレートを作成できます。 
+
+詳しくは、各フォルダのReadmeをご参照ください。
+
+## 内容物
+
+### ライセンス
+[/license/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/license)
+
+### テンプレート・ベース
+
+|Template-base|Develop Environment|Run-time Environment|
+|:-----|:------------------|:-------------------|
+|[/root_VS2015/](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/master/root_VS2015)|Visual Studio 2015|.NET Framework 4.6|
+
+Visual Studio 2013以前を使用する場合は、*[OpenTouryoTemplates バージョン 01-80](https://github.com/OpenTouryoProject/OpenTouryoTemplates/tree/01-80)*を使用してください。