Merge pull request #27 from hazzik/cli-current-directory

CLI shall resolve solution path relative to current directory
maca88 · Jun 15, 2017 · d2fb230 · d2fb230
2 parents 741bdae + 487688e
commit d2fb230
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/AsyncGenerator.CommandLine/Program.cs b/Source/AsyncGenerator.CommandLine/Program.cs
@@ -47,7 +47,7 @@ static AsyncCodeConfiguration Configure()
 				using (var stream = xmlConfig.OpenRead())
 				{
 					return AsyncCodeConfiguration.Create()
-						.ConfigureSolutionFromStream<XmlFileConfigurator>(stream);
+						.ConfigureSolutionFromStream<XmlFileConfigurator>(stream, Environment.CurrentDirectory);
 				}
 			}
 			var ymlConfig = new FileInfo("AsyncGenerator.yml");
@@ -56,7 +56,7 @@ static AsyncCodeConfiguration Configure()
 				using (var stream = ymlConfig.OpenRead())
 				{
 					return AsyncCodeConfiguration.Create()
-						.ConfigureSolutionFromStream<YamlFileConfigurator>(stream);
+						.ConfigureSolutionFromStream<YamlFileConfigurator>(stream, Environment.CurrentDirectory);
 				}
 			}
 

diff --git a/Source/AsyncGenerator/Configuration/AsyncCodeConfiguration.cs b/Source/AsyncGenerator/Configuration/AsyncCodeConfiguration.cs
@@ -50,9 +50,9 @@ public AsyncCodeConfiguration ConfigureSolution(string solutionFilePath, Action<
 			return ConfigureSolutionFromFile(filePath, new T());
 		}
 
-		public AsyncCodeConfiguration ConfigureSolutionFromStream<T>(Stream stream) where T : class, ISolutionFileConfigurator, new()
+		public AsyncCodeConfiguration ConfigureSolutionFromStream<T>(Stream stream, string basePath = null) where T : class, ISolutionFileConfigurator, new()
 		{
-			return ConfigureSolutionFromStream(stream, new T());
+			return ConfigureSolutionFromStream(stream, new T(), basePath);
 		}
 
 		private AsyncCodeConfiguration ConfigureSolutionFromFile(string filePath, ISolutionFileConfigurator fileConfigurator)