Merge branch 'main' into fix-shorten-file-path

CHANGELOG.md

@@ -7,21 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
-- Implemented partial class model declarations. [4894](https://github.com/microsoft/kiota/issues/4894)
-- Fixed a bug where the Go file names were too long
-
 ### Added
 
 ### Changed
 
+- Implemented partial class model declarations. [4894](https://github.com/microsoft/kiota/issues/4894)
+- Fixed a bug where the Go file names were too long
 - Fixes bug with model names in Go generated from camel case namespace. [https://github.com/microsoftgraph/msgraph-sdk-go/issues/721]
 - Plugins OpenAPI extensions are only added when generating plugins to reduce the risk of parsing errors. [#4834](https://github.com/microsoft/kiota/issues/4834)
 - TypeScript imports are now using ES6 imports with the .js extension.
 - Remove LINQ usage in generated code.
 - Ensures descriptions are not empty in sliced OpenApi file when generating a plugin.
 - Plugins do not emit parameters anymore. [#4841](https://github.com/microsoft/kiota/issues/4841)
 - References to C# types generated by kiota are prefixed with `global::` to avoid name collisions. [#4796](https://github.com/microsoft/kiota/issues/4796)
+- Ensures HashSet properties in `KiotaLock` maintain IgnoreCase comparer across runs [#4916](https://github.com/microsoft/kiota/issues/4916)
+- Dropped `client base url set to` message when generating plugins. [#4905](https://github.com/microsoft/kiota/issues/4905)
 
 ## [1.15.0] - 2024-06-06
 

src/Kiota.Builder/KiotaBuilder.cs

@@ -432,7 +432,10 @@ internal void SetApiRootUrl()
         if (openApiDocument is not null && openApiDocument.GetAPIRootUrl(config.OpenAPIFilePath) is string candidateUrl)
         {
             config.ApiRootUrl = candidateUrl;
-            logger.LogInformation("Client root URL set to {ApiRootUrl}", candidateUrl);
+            if (!config.IsPluginConfiguration)
+            {
+                logger.LogInformation("Client root URL set to {ApiRootUrl}", candidateUrl);
+            }
         }
         else
             logger.LogWarning("No server url found in the OpenAPI document. The base url will need to be set when using the client.");

src/Kiota.Builder/Lock/KiotaLock.cs

@@ -70,11 +70,11 @@ public bool DisableSSLValidation
     /// <summary>
     /// The serializers used for this client.
     /// </summary>
-    public HashSet<string> Serializers { get; set; } = new();
+    public HashSet<string> Serializers { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     /// <summary>
     /// The deserializers used for this client.
     /// </summary>
-    public HashSet<string> Deserializers { get; set; } = new();
+    public HashSet<string> Deserializers { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     /// <summary>
     /// The structured mime types used for this client.
     /// </summary>
@@ -84,15 +84,15 @@ public bool DisableSSLValidation
     /// <summary>
     /// The path patterns for API endpoints to include for this client.
     /// </summary>
-    public HashSet<string> IncludePatterns { get; set; } = new();
+    public HashSet<string> IncludePatterns { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     /// <summary>
     /// The path patterns for API endpoints to exclude for this client.
     /// </summary>
-    public HashSet<string> ExcludePatterns { get; set; } = new();
+    public HashSet<string> ExcludePatterns { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     /// <summary>
     /// The OpenAPI validation rules to disable during the generation.
     /// </summary>
-    public HashSet<string> DisabledValidationRules { get; set; } = new();
+    public HashSet<string> DisabledValidationRules { get; set; } = new(StringComparer.OrdinalIgnoreCase);
 #pragma warning restore CA2227
     /// <summary>
     /// Updates the passed configuration with the values from the lock file.
@@ -108,13 +108,13 @@ public void UpdateGenerationConfigurationFromLock(GenerationConfiguration config
         config.UsesBackingStore = UsesBackingStore;
         config.ExcludeBackwardCompatible = ExcludeBackwardCompatible;
         config.IncludeAdditionalData = IncludeAdditionalData;
-        config.Serializers = Serializers;
-        config.Deserializers = Deserializers;
+        config.Serializers = Serializers.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        config.Deserializers = Deserializers.ToHashSet(StringComparer.OrdinalIgnoreCase);
         config.StructuredMimeTypes = new(StructuredMimeTypes);
-        config.IncludePatterns = IncludePatterns;
-        config.ExcludePatterns = ExcludePatterns;
+        config.IncludePatterns = IncludePatterns.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        config.ExcludePatterns = ExcludePatterns.ToHashSet(StringComparer.OrdinalIgnoreCase);
         config.OpenAPIFilePath = DescriptionLocation;
-        config.DisabledValidationRules = DisabledValidationRules;
+        config.DisabledValidationRules = DisabledValidationRules.ToHashSet(StringComparer.OrdinalIgnoreCase);
         config.DisableSSLValidation = DisableSSLValidation;
     }
     /// <summary>
@@ -136,13 +136,13 @@ public KiotaLock(GenerationConfiguration config)
         UsesBackingStore = config.UsesBackingStore;
         ExcludeBackwardCompatible = config.ExcludeBackwardCompatible;
         IncludeAdditionalData = config.IncludeAdditionalData;
-        Serializers = config.Serializers;
-        Deserializers = config.Deserializers;
+        Serializers = config.Serializers.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        Deserializers = config.Deserializers.ToHashSet(StringComparer.OrdinalIgnoreCase);
         StructuredMimeTypes = config.StructuredMimeTypes.ToList();
-        IncludePatterns = config.IncludePatterns;
-        ExcludePatterns = config.ExcludePatterns;
+        IncludePatterns = config.IncludePatterns.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        ExcludePatterns = config.ExcludePatterns.ToHashSet(StringComparer.OrdinalIgnoreCase);
         DescriptionLocation = config.OpenAPIFilePath;
-        DisabledValidationRules = config.DisabledValidationRules;
+        DisabledValidationRules = config.DisabledValidationRules.ToHashSet(StringComparer.OrdinalIgnoreCase);
         DisableSSLValidation = config.DisableSSLValidation;
     }
 }

src/Kiota.Builder/WorkspaceManagement/ApiClientConfiguration.cs

@@ -48,7 +48,7 @@ public bool ExcludeBackwardCompatible
     /// <summary>
     /// The OpenAPI validation rules to disable during the generation.
     /// </summary>
-    public HashSet<string> DisabledValidationRules { get; set; } = new();
+    public HashSet<string> DisabledValidationRules { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     /// <summary>
     /// Initializes a new instance of the <see cref="ApiClientConfiguration"/> class.
     /// </summary>
@@ -69,7 +69,7 @@ public ApiClientConfiguration(GenerationConfiguration config) : base(config)
         ExcludeBackwardCompatible = config.ExcludeBackwardCompatible;
         IncludeAdditionalData = config.IncludeAdditionalData;
         StructuredMimeTypes = config.StructuredMimeTypes.ToList();
-        DisabledValidationRules = config.DisabledValidationRules;
+        DisabledValidationRules = config.DisabledValidationRules.ToHashSet(StringComparer.OrdinalIgnoreCase);
     }
     /// <summary>
     /// Updates the passed configuration with the values from the config file.
@@ -88,7 +88,7 @@ public void UpdateGenerationConfigurationFromApiClientConfiguration(GenerationCo
         config.ExcludeBackwardCompatible = ExcludeBackwardCompatible;
         config.IncludeAdditionalData = IncludeAdditionalData;
         config.StructuredMimeTypes = new(StructuredMimeTypes);
-        config.DisabledValidationRules = DisabledValidationRules;
+        config.DisabledValidationRules = DisabledValidationRules.ToHashSet(StringComparer.OrdinalIgnoreCase);
         UpdateGenerationConfigurationFromBase(config, clientName, requests);
     }
 

src/Kiota.Builder/WorkspaceManagement/ApiPluginConfiguration.cs

@@ -23,7 +23,7 @@ public ApiPluginConfiguration() : base()
     public ApiPluginConfiguration(GenerationConfiguration config) : base(config)
     {
         ArgumentNullException.ThrowIfNull(config);
-        Types = config.PluginTypes.Select(x => x.ToString()).ToHashSet();
+        Types = config.PluginTypes.Select(x => x.ToString()).ToHashSet(StringComparer.OrdinalIgnoreCase);
     }
     public HashSet<string> Types { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     public object Clone()
@@ -45,7 +45,7 @@ public void UpdateGenerationConfigurationFromApiPluginConfiguration(GenerationCo
     {
         ArgumentNullException.ThrowIfNull(config);
         ArgumentException.ThrowIfNullOrEmpty(pluginName);
-        config.PluginTypes = Types.Select(x => Enum.TryParse<PluginType>(x, out var result) ? result : (PluginType?)null).OfType<PluginType>().ToHashSet();
+        config.PluginTypes = Types.Select(x => Enum.TryParse<PluginType>(x, true, out var result) ? result : (PluginType?)null).OfType<PluginType>().ToHashSet();
         UpdateGenerationConfigurationFromBase(config, pluginName, requests);
     }
 }

src/Kiota.Builder/WorkspaceManagement/BaseApiConsumerConfiguration.cs

@@ -18,8 +18,8 @@ private protected BaseApiConsumerConfiguration(GenerationConfiguration config)
     {
         ArgumentNullException.ThrowIfNull(config);
         DescriptionLocation = config.OpenAPIFilePath;
-        IncludePatterns = new HashSet<string>(config.IncludePatterns);
-        ExcludePatterns = new HashSet<string>(config.ExcludePatterns);
+        IncludePatterns = new HashSet<string>(config.IncludePatterns, StringComparer.OrdinalIgnoreCase);
+        ExcludePatterns = new HashSet<string>(config.ExcludePatterns, StringComparer.OrdinalIgnoreCase);
         OutputPath = config.OutputPath;
     }
     /// <summary>
@@ -60,8 +60,8 @@ protected void UpdateGenerationConfigurationFromBase(GenerationConfiguration con
     {
         ArgumentNullException.ThrowIfNull(config);
         ArgumentException.ThrowIfNullOrEmpty(clientName);
-        config.IncludePatterns = IncludePatterns;
-        config.ExcludePatterns = ExcludePatterns;
+        config.IncludePatterns = IncludePatterns.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        config.ExcludePatterns = ExcludePatterns.ToHashSet(StringComparer.OrdinalIgnoreCase);
         config.OpenAPIFilePath = DescriptionLocation;
         config.OutputPath = OutputPath;
         config.ClientClassName = clientName;

src/kiota/Handlers/BaseKiotaCommandHandler.cs

@@ -310,8 +310,8 @@ private static string GetSourceArg(string path, string manifest)
     }
     protected void DisplayUrlInformation(string? apiRootUrl, bool isPlugin = false)
     {
-        if (!string.IsNullOrEmpty(apiRootUrl))
-            DisplayInfo($"{(isPlugin ? "Plugin" : "Client")} base url set to {apiRootUrl}");
+        if (!string.IsNullOrEmpty(apiRootUrl) && !isPlugin)
+            DisplayInfo($"Client base url set to {apiRootUrl}");
     }
     protected void DisplayGenerateCommandHint()
     {

src/kiota/Handlers/Plugin/AddHandler.cs

@@ -75,7 +75,7 @@ public override async Task<int> InvokeAsync(InvocationContext context)
                 if (result)
                 {
                     DisplaySuccess("Generation completed successfully");
-                    DisplayUrlInformation(Configuration.Generation.ApiRootUrl);
+                    DisplayUrlInformation(Configuration.Generation.ApiRootUrl, true);
                 }
                 else if (skipGeneration)
                 {

src/kiota/Handlers/Plugin/EditHandler.cs

@@ -92,7 +92,7 @@ public override async Task<int> InvokeAsync(InvocationContext context)
                 if (result)
                 {
                     DisplaySuccess("Generation completed successfully");
-                    DisplayUrlInformation(Configuration.Generation.ApiRootUrl);
+                    DisplayUrlInformation(Configuration.Generation.ApiRootUrl, true);
                 }
                 else if (skipGeneration)
                 {