To merge the changes ( - Until September 30) about opentouryo

[daisukenishino]

Question-and-answer session

• The challenges for PullRequest
  • I want to receive one PullRequest that aggregated multiple commits.
  • Note the "push unit and commit unit".
    • To facilitate review by dividing it into units.
    • Please divided into small units PullRequest.
    • Because bottleneck of the whole occured by large units PullRequest that it is difficult to review.
  • You can not send more than one PullRequest from one branch.
• Solution (1)
  • I will merge a PullRequest as quickly as possible.
• Solution (2)
  • I think that there is also a means to use the Symphony/Feature branch.
    • Operator to create a Feature branch of their own.
    • To perform the merge work in Feature branch,
      and sends the PullRequest to Symphony/nishino branch.
  • After the review, I'll merge the pullRequest in nishino branch.
  • After that, you will pull the change of nishino branch in each Feature branch.

[daisukenishino]

Question-and-answer session

• Question
  • For information about changing the project file or solution file by adding files.
• Answer
  • It does not merge with WinMarge, you should use the Visual Studio.
• Question
  • How to handle files that do not exist in the working of the merge.
• Answer
  • You will add a file that does not exist in the working of the merge.
    • Workflow folder is exist in the root.
    • Workflow folder does not exist in root_easysetup.
  • You add the workflow folder to root_easysetup.

[daisukenishino]

Question-and-answer session

• Question
  • I compared the root_easysetup and root.
  • There is a file that does not exist ByVal files and there is ByVal. Which is correct ?
• Answer
  • root is correct.
  • Why the difference ?
    • The VB file is what I was converted using the SharpDeveloper a C # file.
    • After conversion is different depending on the version of SharpDeveloperp.
    • (ByVal exists, does not exist.)

[daisukenishino]

Functions that supported by the new .NET Framework or program language version. In this case, " *.cs file and *.vb file" can be commonize the source code using the #if and #define.

(新しい.NET Frameworkか、プログラム言語のバージョンでサポートされている機能。この場合、 *.csファイルと *.vbファイルは#ifと#defineを使用してソースコードを共通化できる。)

About "# if, # else, # endif".

• Following the oldest development environment that you are currently using.
  • root, root_easysetup
    • Visual Studio2010
    • .NET Framework 3.5
• The following environment to which you want to merge.
  • root_VS2010
    • Visual Studio2010
    • .NET Framework 4.0
  • root_VS2012
    • Visual Studio2012
    • .NET Framework 4.5
  • root_VS2013
    • Visual Studio2013
    • .NET Framework 4.5.1

If a statement such as that can not be merged into new .NET Framework and Visual Studio version was exist in the root folder, and will be addressed in the following way.

You should be able to get around this problem by using "# if, # else, # endif".

• There are places that are supported by comment out on the current code.
• So, I want to replace the part "# if, # else, # endif".

[daisukenishino]

Some data providers have been removed.

(一部のデータプロバイダが取り除かれている。)

"root_easysetup and root_VS2010 - 2013 do not use data providers other than SQLServer.

The reason for this is to eliminate the need for preparation of other data providers in order to use in the evaluation. If you want to add support for other data providers, and follow the instructions in the following documents.

https://github.com/OpenTouryoProject/OpenTouryoDocuments/blob/master/documents/2_Tutorial/ja-JP/Tutorial_Template_development.doc
https://github.com/OpenTouryoProject/OpenTouryoDocuments/blob/master/documents/2_Tutorial/en/Tutorial_Template_development_EN.doc

[daisukenishino]

The web.config and project files and solution file, there is a difference by the version of Visual Studio and .NET.

(ソリューションファイルとプロジェクトファイルとweb.configは、
.NETやVisual Studioのversionによって違いがある。)

Therefore, do not merge all the contents of the web.config. Please merge only the changes.

[daisukenishino]

Improvement

I fixes after merging.
Please check the log using the TortoiseGit for future reference.

• OpenTouryo
  • Corrections of "OpenTouryo\root".
  • Corrections of "OpenTouryo\root_easysetup".
  • Corrections of "OpenTouryo"_#2.
  • Corrections of "OpenTouryo"_#3.
  • Corrections of "OpenTouryo"_#4.
  • Corrections of "OpenTouryo"_#5.
• OpenTouryoTemplates
  • Finishing of change (merge) to version 01-50.
  • Finishing of change (merge) to version 01-50_#2.
  • Finishing of change (merge) to version 01-50_#3.

I was able to see the problem of merging the file resources, designers, solutions, projects, and so on.