Merge pull request #369 from TimSirmovics/SettingsConfigFilePathNullReference

sjh37 · web-flow · commit 98537ffbe7cc · 2017-12-28T23:55:52.000Z
Do not print configuration file if it is blank. Thanks to Tim Sirmovics
diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude
@@ -543,7 +543,7 @@
         if (Settings.IncludeConnectionSettingComments)
         {
             WriteLine("// The following connection settings were used to generate this file:");
-            if (!string.IsNullOrEmpty(Settings.ConnectionStringName))
+            if (!string.IsNullOrEmpty(Settings.ConnectionStringName) && !string.IsNullOrEmpty(Settings.ConfigFilePath))
             {
                 var solutionPath = Path.GetDirectoryName(GetSolution().FileName) + "\\";
                 WriteLine("//     Configuration file:     \"{0}\"", Settings.ConfigFilePath.Replace(solutionPath, string.Empty));

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@`
`543`	`543`	`if (Settings.IncludeConnectionSettingComments)`
`544`	`544`	`{`
`545`	`545`	`WriteLine("// The following connection settings were used to generate this file:");`
`546`		`- if (!string.IsNullOrEmpty(Settings.ConnectionStringName))`
	`546`	`+ if (!string.IsNullOrEmpty(Settings.ConnectionStringName) && !string.IsNullOrEmpty(Settings.ConfigFilePath))`
`547`	`547`	`{`
`548`	`548`	`var solutionPath = Path.GetDirectoryName(GetSolution().FileName) + "\\";`
`549`	`549`	`WriteLine("// Configuration file: \"{0}\"", Settings.ConfigFilePath.Replace(solutionPath, string.Empty));`