From ad15be04e92465b5029b64a8afb6177d1437abb6 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 2 Oct 2025 11:00:02 +0300
Subject: [PATCH 1/3] Cli: fix directory problem in csharp proxy generatror

---
 .../CSharp/CSharpServiceProxyGenerator.cs             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
index e0dcc14fb1..7c476b8808 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
@@ -162,7 +162,10 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
     private async Task CreateJsonFile(GenerateProxyArgs args, ApplicationApiDescriptionModel applicationApiDescriptionModel)
     {
         var folder = args.Folder.IsNullOrWhiteSpace() ? ProxyDirectory : args.Folder;
-        var filePath = Path.Combine(args.WorkDirectory, folder, $"{args.Module}-generate-proxy.json");
+        var directory = Path.Combine(args.WorkDirectory, folder);
+        Directory.CreateDirectory(directory);
+        
+        var filePath = Path.Combine(directory, $"{args.Module}-generate-proxy.json");
         using (var writer = new StreamWriter(filePath))
         {
             await writer.WriteAsync(JsonSerializer.Serialize(applicationApiDescriptionModel, indented: true));
@@ -187,7 +190,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         classTemplateEmptyPart.Replace(NamespacePlaceholder, rootNamespace);
 
         var filePath = Path.Combine(args.WorkDirectory, folder, $"{clientProxyName}.cs");
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
         if (!File.Exists(filePath))
         {
             using (var writer = new StreamWriter(filePath))
@@ -223,7 +226,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         classTemplate.Replace($"{Environment.NewLine}{Environment.NewLine}    {MethodPlaceholder}", string.Empty).Replace(MethodPlaceholder, string.Empty);
 
         filePath = Path.Combine(args.WorkDirectory, folder, $"{clientProxyName}.Generated.cs");
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
         using (var writer = new StreamWriter(filePath))
         {
             await writer.WriteAsync(classTemplate.ToString());
@@ -253,7 +256,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
             interfaceTemplate.Replace(NamespacePlaceholder, rootNamespace);
 
             filePath = Path.Combine(args.WorkDirectory, folder, $"{appServiceTypeName}.cs");
-            Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+            Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
             using (var writer = new StreamWriter(filePath))
             {
                 await writer.WriteAsync(interfaceTemplate.ToString());

From 813fc7b457bef579a22671c655732093630311d7 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 2 Oct 2025 11:04:17 +0300
Subject: [PATCH 2/3] Update CSharpServiceProxyGenerator.cs

---
 .../Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
index 7c476b8808..350556aea2 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
@@ -9,6 +9,7 @@ using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Modeling;
+using Volo.Abp.IO;
 using Volo.Abp.Json;
 
 namespace Volo.Abp.Cli.ServiceProxying.CSharp;
@@ -163,7 +164,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
     {
         var folder = args.Folder.IsNullOrWhiteSpace() ? ProxyDirectory : args.Folder;
         var directory = Path.Combine(args.WorkDirectory, folder);
-        Directory.CreateDirectory(directory);
+        DirectoryHelper.CreateIfNotExists(directory);
         
         var filePath = Path.Combine(directory, $"{args.Module}-generate-proxy.json");
         using (var writer = new StreamWriter(filePath))

From 9b5ad640bc27a487c9446a9f24010018ed776504 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 2 Oct 2025 11:07:52 +0300
Subject: [PATCH 3/3] Use DirectoryHelper.CreateIfNotExists in
 CSharpServiceProxyGenerator

---
 .../ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
index 350556aea2..4783c2dcda 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs
@@ -191,7 +191,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         classTemplateEmptyPart.Replace(NamespacePlaceholder, rootNamespace);
 
         var filePath = Path.Combine(args.WorkDirectory, folder, $"{clientProxyName}.cs");
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
+        DirectoryHelper.CreateIfNotExists(Path.GetDirectoryName(filePath)!);
         if (!File.Exists(filePath))
         {
             using (var writer = new StreamWriter(filePath))
@@ -227,7 +227,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         classTemplate.Replace($"{Environment.NewLine}{Environment.NewLine}    {MethodPlaceholder}", string.Empty).Replace(MethodPlaceholder, string.Empty);
 
         filePath = Path.Combine(args.WorkDirectory, folder, $"{clientProxyName}.Generated.cs");
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
+        DirectoryHelper.CreateIfNotExists(Path.GetDirectoryName(filePath)!);
         using (var writer = new StreamWriter(filePath))
         {
             await writer.WriteAsync(classTemplate.ToString());
@@ -257,7 +257,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
             interfaceTemplate.Replace(NamespacePlaceholder, rootNamespace);
 
             filePath = Path.Combine(args.WorkDirectory, folder, $"{appServiceTypeName}.cs");
-            Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
+            DirectoryHelper.CreateIfNotExists(Path.GetDirectoryName(filePath)!);
             using (var writer = new StreamWriter(filePath))
             {
                 await writer.WriteAsync(interfaceTemplate.ToString());