Merge pull request #904 from christianhelle/kiota-always-generates-mu…

…ltiple-files Ensure Kiota custom tool respects the Generate Multiple Files option
christianhelle · May 16, 2024 · 6337026 · 6337026
2 parents 7d67046 + 196e6c2
commit 6337026
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs
@@ -21,7 +21,8 @@ public string GenerateCode(IProgressReporter? pGenerateProgress)
         pGenerateProgress?.Progress(10);
         dependencyInstaller.InstallKiota();
 
-        if (new FileInfo(swaggerFile).Name == KiotaLockFile)
+        string swaggerFilename = new FileInfo(swaggerFile).Name;
+        if (swaggerFilename == KiotaLockFile)
         {
             pGenerateProgress?.Progress(40);
             RunKiotaUpdate();
@@ -47,13 +48,22 @@ public string GenerateCode(IProgressReporter? pGenerateProgress)
         if (!options.GenerateMultipleFiles &&
             File.Exists(Path.Combine(Path.GetDirectoryName(swaggerFile)!, KiotaLockFile)))
         {
+            File.Copy(
+                swaggerFile,
+                Path.Combine(outputFolder, swaggerFilename),
+                true);
+
             File.Copy(
                 Path.Combine(Path.GetDirectoryName(swaggerFile)!, KiotaLockFile),
                 Path.Combine(outputFolder, KiotaLockFile),
                 true);
 
             pGenerateProgress?.Progress(60);
-            RunKiotaUpdate();
+
+            var arguments = $" update -o \"{outputFolder}\"";
+            using var context = new DependencyContext("Kiota", $"{Command} {arguments}");
+            processLauncher.Start(Command, arguments, outputFolder);
+            context.Succeeded();
         }
 
         pGenerateProgress?.Progress(80);