From ff0b3487f7b6be100c4c71a121bd5843e8a1dd77 Mon Sep 17 00:00:00 2001
From: Christian Helle <christian.helle@outlook.com>
Date: Tue, 3 Mar 2026 08:55:49 +0100
Subject: [PATCH] Fix #580: Auto-enable GenerateOptionalPropertiesAsNullable
 for nullable strings

---
 src/Refitter.Core/CSharpClientGeneratorFactory.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Refitter.Core/CSharpClientGeneratorFactory.cs b/src/Refitter.Core/CSharpClientGeneratorFactory.cs
index 279b69585..6b1030e3b 100644
--- a/src/Refitter.Core/CSharpClientGeneratorFactory.cs
+++ b/src/Refitter.Core/CSharpClientGeneratorFactory.cs
@@ -62,6 +62,12 @@ public CustomCSharpClientGenerator Create()
             settings.CodeGeneratorSettings,
             generator.Settings.CSharpGeneratorSettings);
 
+        // Auto-enable optional properties as nullable when nullable reference types enabled
+        if (generator.Settings.CSharpGeneratorSettings.GenerateNullableReferenceTypes)
+        {
+            generator.Settings.CSharpGeneratorSettings.GenerateOptionalPropertiesAsNullable = true;
+        }
+
         return generator;
     }