Skip to content

Commit 9e4ea35

Browse files
committed
Make dibix.json optional again (broken in previous refactoring)
1 parent 44b5eac commit 9e4ea35

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

src/Dibix.Sdk/Tasks/SqlCoreTask.cs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Collections.ObjectModel;
3+
using System.IO;
34
using Dibix.Sdk.Abstractions;
45
using Dibix.Sdk.CodeAnalysis;
56
using Dibix.Sdk.CodeGeneration;
@@ -84,15 +85,19 @@ private partial bool Execute()
8485
IFileSystemProvider fileSystemProvider = new PhysicalFileSystemProvider(_configuration.SqlCore.ProjectDirectory);
8586
IActionParameterConverterRegistry actionParameterConverterRegistry = new ActionParameterConverterRegistry();
8687
IActionParameterSourceRegistry actionParameterSourceRegistry = new ActionParameterSourceRegistry();
87-
UserConfigurationLoader userConfigurationLoader = new UserConfigurationLoader
88-
(
89-
_configuration.SqlCore.ConfigurationFilePath
90-
, fileSystemProvider
91-
, _logger
92-
, new SqlCodeAnalysisUserConfigurationReader(sqlCodeAnalysisConfiguration)
93-
, new CodeGenerationUserConfigurationReader(codeGenerationConfiguration, actionParameterSourceRegistry, actionParameterConverterRegistry, _logger)
94-
);
95-
userConfigurationLoader.Load();
88+
89+
if (File.Exists(_configuration.SqlCore.ConfigurationFilePath))
90+
{
91+
UserConfigurationLoader userConfigurationLoader = new UserConfigurationLoader
92+
(
93+
_configuration.SqlCore.ConfigurationFilePath
94+
, fileSystemProvider
95+
, _logger
96+
, new SqlCodeAnalysisUserConfigurationReader(sqlCodeAnalysisConfiguration)
97+
, new CodeGenerationUserConfigurationReader(codeGenerationConfiguration, actionParameterSourceRegistry, actionParameterConverterRegistry, _logger)
98+
);
99+
userConfigurationLoader.Load();
100+
}
96101

97102
if (_logger.HasLoggedErrors)
98103
return false;

0 commit comments

Comments
 (0)