[v2.0 audit] Close remaining verified #1057 regressions

README.md

@@ -158,10 +158,11 @@ OPTIONS:
         --no-inline-json-converters                              Don't inline JsonConverter attributes for enum types. When disabled, no [JsonConverter(typeof(JsonStringEnumConverter))] attributes are emitted. By default (enabled), the attribute is placed on the enum type declaration (not on properties), allowing custom converters to be registered via JsonSerializerOptions.Converters
         --integer-type                           int             The .NET type to use for OpenAPI integer types without a format specifier. Common values: 'int' (default), 'long'
         --custom-template-directory                              Custom directory with NSwag fluid templates for code generation. Default is null which uses the default NSwag templates. See <https://github.com/RicoSuter/NSwag/wiki/Templates>
-        --generate-authentication-header          None            Controls generation of Authorization header support.
-                                                                  Options: None (no authentication code is generated),
-                                                                  Parameter (adds method parameters for authentication),
-                                                                  Method (generates a Refit [Headers] attribute for bearer token authentication)
+        --generate-authentication-header [STYLE]                  Controls generation of Authorization header support.
+                                                                   Options: None (no authentication code is generated),
+                                                                   Parameter (adds method parameters for authentication),
+                                                                   Method (generates a Refit [Headers] attribute for bearer token authentication).
+                                                                   Legacy boolean forms (true/false) and omitting the value are also accepted for compatibility.
         --security-scheme                                        Generate Authorization header for a specific security scheme. When omitted, authentication headers will be generated for all security schemes
 ```
 

src/Refitter.Core/OpenApiDocumentFactory.cs

@@ -54,7 +54,7 @@
 
     private static OpenApiDocument Merge(OpenApiDocument[] documents)
     {
-        var baseDocument = documents[0];
+        var baseDocument = OpenApiDocument.FromJsonAsync(documents[0].ToJson(documents[0].SchemaType)).GetAwaiter().GetResult();
         var tags = baseDocument.Tags;
         HashSet<string>? tagNames = null;
 
@@ -68,27 +68,30 @@
             var document = documents[i];
             foreach (var path in document.Paths)
             {
-                if (!baseDocument.Paths.ContainsKey(path.Key))
-                    baseDocument.Paths[path.Key] = path.Value;
+                MergeIfMissingOrThrowOnConflict(baseDocument.Paths, path.Key, path.Value, "path");
             }
 
             if (document.Components?.Schemas != null)
             {
-                // Ensure base document has schemas dictionary initialized (#1016)
-                // Components property is read-only but auto-initialized by NSwag
                 foreach (var schema in document.Components.Schemas)
                 {
-                    if (!baseDocument.Components.Schemas.ContainsKey(schema.Key))
-                        baseDocument.Components.Schemas[schema.Key] = schema.Value;
+                    MergeIfMissingOrThrowOnConflict(baseDocument.Components.Schemas, schema.Key, schema.Value, "schema");
                 }
             }
 
             if (document.Definitions != null)
             {
                 foreach (var definition in document.Definitions)
                 {
-                    if (!baseDocument.Definitions.ContainsKey(definition.Key))
-                        baseDocument.Definitions[definition.Key] = definition.Value;
+                    MergeIfMissingOrThrowOnConflict(baseDocument.Definitions, definition.Key, definition.Value, "definition");
+                }
+            }
+
+            if (document.SecurityDefinitions != null)
+            {
+                foreach (var securityDefinition in document.SecurityDefinitions)
+                {
+                    MergeIfMissingOrThrowOnConflict(baseDocument.SecurityDefinitions, securityDefinition.Key, securityDefinition.Value, "security scheme");
                 }
             }
 
@@ -107,6 +110,40 @@
         return baseDocument;
     }
 
+    private static void MergeIfMissingOrThrowOnConflict<TValue>(
+        IDictionary<string, TValue> target,
+        string key,
+        TValue value,
+        string itemType)
+    {
+        if (!target.TryGetValue(key, out var existingValue))
+        {
+            target[key] = value;
+            return;
+        }
+
+        if (!AreEquivalent(existingValue, value))
+            throw CreateMergeConflictException(itemType, key);
+    }
+
+    private static bool AreEquivalent<TValue>(TValue existingValue, TValue incomingValue)
+    {
+        if (ReferenceEquals(existingValue, incomingValue) || EqualityComparer<TValue>.Default.Equals(existingValue, incomingValue))
+            return true;
+
+        try
+        {
+            return Serializer.Serialize(existingValue!) == Serializer.Serialize(incomingValue!);
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    private static InvalidOperationException CreateMergeConflictException(string itemType, string key) =>
+        new($"Cannot merge OpenAPI documents because a duplicate {itemType} '{key}' was found. Refitter fails fast on merge collisions to avoid silent data loss.");
+
     /// <summary>
     /// Creates a new instance of the <see cref="NSwag.OpenApiDocument"/> class asynchronously.
     /// </summary>

src/Refitter.Core/ParameterExtractor.cs

@@ -421,14 +421,13 @@
     {
         List<string>? parameters = null;
         var dynamicQuerystringParametersCodeBuilder = new StringBuilder();
+        var queryParameters = operationModel.Parameters
+            .Where(p => p.Kind == OpenApiParameterKind.Query)
+            .ToList();
 
         if (settings.UseDynamicQuerystringParameters)
         {
-            var operationParameters = operationModel.Parameters
-                .Where(p => p.Kind == OpenApiParameterKind.Query)
-                .ToList();
-
-            if (operationParameters.Count >= 2)
+            if (queryParameters.Count >= 2)
             {
                 var modifier = settings.TypeAccessibility.ToString().ToLowerInvariant();
                 var isRecord = settings.ImmutableRecords ||
@@ -444,7 +443,7 @@
                 var initializedParametersCodeBuilder = new StringBuilder();
                 var propertiesCodeBuilder = new StringBuilder();
                 var allNullable = true;
-                foreach (var operationParameter in operationParameters)
+                foreach (var operationParameter in queryParameters)
                 {
                     var propertyType = GetQueryParameterType(operationParameter, settings);
                     allNullable = allNullable && propertyType.EndsWith("?");
@@ -483,7 +482,6 @@
                         propertiesCodeBuilder.Append($" = {formattedDefaultValue};");
                     }
                     propertiesCodeBuilder.AppendLine();
-                    operationModel.Parameters.Remove(operationParameter);
                 }
 
                 dynamicQuerystringParametersCodeBuilder.AppendLine(
@@ -519,8 +517,7 @@
 
         dynamicQuerystringParameters = dynamicQuerystringParametersCodeBuilder.ToString();
 
-        parameters ??= operationModel.Parameters
-            .Where(p => p.Kind == OpenApiParameterKind.Query)
+        parameters ??= queryParameters
             .Select(p =>
             {
                 var variableName = GetVariableName(p);

src/Refitter.Core/RefitGenerator.cs

@@ -47,7 +47,7 @@
     {
         if (settings.OpenApiPaths is { Length: > 0 })
             return await OpenApiDocumentFactory.CreateAsync(settings.OpenApiPaths).ConfigureAwait(false);
         return await OpenApiDocumentFactory.CreateAsync(settings.OpenApiPath).ConfigureAwait(false);
     }
 
     private static void ProcessContractFilter(OpenApiDocument openApiDocument, bool removeUnusedSchema, string[] includeSchemaMatches,
@@ -289,10 +289,12 @@
             // This allows users to override the converter via JsonSerializerOptions.Converters (e.g. to use
             // JsonStringEnumMemberConverter for enums with [EnumMember] values containing special characters).
             contracts = JsonStringEnumConverterAttributeRegex.Replace(contracts, string.Empty);
+            var newLine = GetPreferredNewLine(contracts);
             return EnumDeclarationRegex
                 .Replace(
                     contracts,
-                    "$1[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]\n$1$2")
+                    match =>
+                        $"{match.Groups[1].Value}[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]{newLine}{match.Groups[1].Value}{match.Groups[2].Value}")
                 .TrimEnd();
         }
 
@@ -302,6 +304,11 @@
             .TrimEnd();
     }
 
+    private static string GetPreferredNewLine(string content) =>
+        content.Contains("\r\n", StringComparison.Ordinal)
+            ? "\r\n"
+            : "\n";
+
     private string NormalizeSwagger2OptionalReferencePropertyNullability(string contracts)
     {
         if (document.SchemaType != NJsonSchema.SchemaType.Swagger2 ||

src/Refitter.MSBuild/RefitterGenerateTask.cs

@@ -12,6 +12,21 @@
     private static readonly System.Threading.AsyncLocal<Func<ProcessStartInfo, Action<string?>, Action<string?>, ProcessExecutionResult>?> ProcessRunnerOverride = new();
     private static readonly System.Threading.AsyncLocal<int?> ProcessTimeoutMillisecondsOverride = new();
     private static readonly System.Threading.AsyncLocal<Action<Process>?> ProcessTerminatorOverride = new();
+    private static readonly System.Threading.AsyncLocal<Func<string, bool>?> FileExistsOverride = new();
+
+    private static readonly (string TargetFramework, string RuntimePrefix)[] PreferredRuntimeOrder =
+    [
+        ("net10.0", "Microsoft.NETCore.App 10."),
+        ("net9.0", "Microsoft.NETCore.App 9."),
+        ("net8.0", "Microsoft.NETCore.App 8.")
+    ];
+
+    private static readonly string[] CompatibilityFallbackOrder =
+    [
+        "net8.0",
+        "net9.0",
+        "net10.0"
+    ];
 
     internal sealed class ProcessExecutionResult
     {
@@ -53,6 +68,12 @@
         set => ProcessTerminatorOverride.Value = value;
     }
 
+    internal static Func<string, bool> FileExists
+    {
+        get => FileExistsOverride.Value ?? File.Exists;
+        set => FileExistsOverride.Value = value;
+    }
+
     public string ProjectFileDirectory { get; set; }
 
     public bool DisableLogging { get; set; }
@@ -70,6 +91,7 @@
         ProcessRunnerOverride.Value = null;
         ProcessTimeoutMillisecondsOverride.Value = null;
         ProcessTerminatorOverride.Value = null;
+        FileExistsOverride.Value = null;
     }
 
     public override bool Execute()
@@ -131,26 +153,24 @@
         failed = false;
         var assembly = Assembly.GetExecutingAssembly();
         var packageFolder = Path.GetDirectoryName(assembly.Location);
-        var separator = Path.DirectorySeparatorChar;
-        var refitterDll = $"{packageFolder}{separator}..{separator}net8.0{separator}refitter.dll";
         var outputLines = new List<string>();
 
-        List<string> installedRuntimes = InstalledDotnetRuntimesProvider();
-        if (installedRuntimes.Any(r => r.StartsWith("Microsoft.NETCore.App 10.")))
+        List<string>? installedRuntimes = null;
+        try
         {
-            // Use .NET 10 version if available
-            refitterDll = $"{packageFolder}{separator}..{separator}net10.0{separator}refitter.dll";
-            TryLogCommandLine("Detected .NET 10 runtime. Using .NET 10 version of Refitter.");
+            installedRuntimes = InstalledDotnetRuntimesProvider();
         }
-        else if (installedRuntimes.Any(r => r.StartsWith("Microsoft.NETCore.App 9.")))
+        catch (Exception exception)
         {
-            // Use .NET 9 version if available
-            refitterDll = $"{packageFolder}{separator}..{separator}net9.0{separator}refitter.dll";
-            TryLogCommandLine("Detected .NET 9 runtime. Using .NET 9 version of Refitter.");
+            TryLogCommandLine($"Failed to inspect installed .NET runtimes: {exception.Message}. Falling back to bundled Refitter runtime selection.");
         }
-        else
+
+        var refitterDll = ResolveRefitterDll(packageFolder, installedRuntimes, TryLogCommandLine);
+        if (string.IsNullOrWhiteSpace(refitterDll) || !FileExists(refitterDll))
         {
-            TryLogCommandLine("Using .NET 8 version of Refitter.");
+            failed = true;
+            TryLogError("Unable to locate a bundled Refitter CLI runtime for the MSBuild task.");
+            return new List<string>();
         }
 
         var args = $"\"{refitterDll}\" --settings-file \"{file}\" --simple-output";
@@ -185,13 +205,14 @@
         if (processResult.TimedOut)
         {
             failed = true;
+            var timeoutDescription = FormatTimeout(ProcessTimeoutMilliseconds);
             if (processResult.TerminationException is null)
             {
-                TryLogError("Refitter process timed out after 300 seconds and was terminated");
+                TryLogError($"Refitter process timed out after {timeoutDescription} and was terminated");
             }
             else
             {
-                TryLogError($"Failed to terminate timed-out process: {processResult.TerminationException.Message}");
+                TryLogError($"Refitter process timed out after {timeoutDescription}. Failed to terminate timed-out process: {processResult.TerminationException.Message}");
             }
 
             return new List<string>();
@@ -261,15 +282,86 @@
             process.Start();
             using (var reader = process.StandardOutput)
             {
-                var output = reader.ReadToEnd();
-                installedRuntimes.AddRange(output.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries));
+                while (!reader.EndOfStream)
+                {
+                    var line = reader.ReadLine();
+                    if (!string.IsNullOrWhiteSpace(line))
+                    {
+                        installedRuntimes.Add(line);
+                    }
+                }
             }
             process.WaitForExit();
         }
 
         return installedRuntimes;
     }
 
+    internal static string? ResolveRefitterDll(string? packageFolder, IReadOnlyList<string>? installedRuntimes, Action<string> logCommandLine)
+    {
+        if (string.IsNullOrWhiteSpace(packageFolder))
+        {
+            return null;
+        }
+
+        var bundledRuntimes = PreferredRuntimeOrder
+            .Select(candidate => new
+            {
+                candidate.TargetFramework,
+                candidate.RuntimePrefix,
+                Path = Path.GetFullPath(Path.Combine(packageFolder, "..", candidate.TargetFramework, "refitter.dll")),
+            })
+            .ToArray();
+
+        if (installedRuntimes is not null)
+        {
+            foreach (var runtime in bundledRuntimes)
+            {
+                if (FileExists(runtime.Path) &&
+                    installedRuntimes.Any(installed =>
+                        !string.IsNullOrWhiteSpace(installed) &&
+                        installed.StartsWith(runtime.RuntimePrefix, StringComparison.Ordinal)))
+                {
+                    logCommandLine($"Detected {GetDisplayFramework(runtime.TargetFramework)} runtime. Using {GetDisplayFramework(runtime.TargetFramework)} version of Refitter.");
+                    return runtime.Path;
+                }
+            }
+        }
+
+        foreach (var targetFramework in CompatibilityFallbackOrder)
+        {
+            var fallbackPath = bundledRuntimes
+                .First(runtime => runtime.TargetFramework == targetFramework)
+                .Path;
+
+            if (FileExists(fallbackPath))
+            {
+                logCommandLine($"Falling back to bundled {GetDisplayFramework(targetFramework)} version of Refitter.");
+                return fallbackPath;
+            }
+        }
+
+        var coLocatedCli = Path.GetFullPath(Path.Combine(packageFolder, "refitter.dll"));
+        if (FileExists(coLocatedCli))
+        {
+            logCommandLine("Falling back to co-located Refitter CLI.");
+            return coLocatedCli;
+        }
+
+        return bundledRuntimes
+            .Select(runtime => runtime.Path)
+            .FirstOrDefault();
+    }
+
+    private static string FormatTimeout(int timeoutMilliseconds) =>
+        timeoutMilliseconds >= 1000 && timeoutMilliseconds % 1000 == 0
+            ? $"{timeoutMilliseconds / 1000} seconds"
+            : timeoutMilliseconds >= 1000
+                ? $"{timeoutMilliseconds / 1000d:0.###} seconds"
+                : $"{timeoutMilliseconds} ms";
+
+    private static string GetDisplayFramework(string targetFramework) => targetFramework.Replace("net", ".NET ");
+
     private void TryLogErrorFromException(Exception e)
     {
         try

src/Refitter.SourceGenerator.Tests/Refitter.SourceGenerator.Tests.csproj

@@ -13,7 +13,9 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
         <PackageReference Include="FluentAssertions" Version="7.2.2" />
-        <PackageReference Include="System.Text.Json" Version="10.0.5" />
+        <PackageReference Include="H.Generators.Extensions" Version="1.24.2" />
+        <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
         <PackageReference Include="TUnit" Version="1.35.2" />
         <PackageReference Include="coverlet.collector" Version="10.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>