From 19983e1179a402461c548ee46d19e8adaef5b98b Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Fri, 23 Aug 2024 14:39:06 -0700 Subject: [PATCH 1/3] Fix service-name validation. --- src/fsdgenswagger/FsdGenSwaggerApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsdgenswagger/FsdGenSwaggerApp.cs b/src/fsdgenswagger/FsdGenSwaggerApp.cs index 5b7fd64..ae10db5 100644 --- a/src/fsdgenswagger/FsdGenSwaggerApp.cs +++ b/src/fsdgenswagger/FsdGenSwaggerApp.cs @@ -31,7 +31,7 @@ public sealed class FsdGenSwaggerApp : CodeGeneratorApp protected override FileGeneratorSettings CreateSettings(ArgsReader args) { var serviceName = args.ReadOption("service-name"); - if (serviceName != null && ServiceDefinitionUtility.IsValidName(serviceName)) + if (serviceName != null && !ServiceDefinitionUtility.IsValidName(serviceName)) throw new ArgsReaderException($"Invalid service name '{serviceName}'."); return new SwaggerGeneratorSettings From 3bb25edbeed398121b60645fa7481b315de8f48a Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Fri, 23 Aug 2024 14:43:33 -0700 Subject: [PATCH 2/3] Make --service-name work for generating FSD. --- src/fsdgenswagger/FsdGenSwaggerApp.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/fsdgenswagger/FsdGenSwaggerApp.cs b/src/fsdgenswagger/FsdGenSwaggerApp.cs index ae10db5..87830c4 100644 --- a/src/fsdgenswagger/FsdGenSwaggerApp.cs +++ b/src/fsdgenswagger/FsdGenSwaggerApp.cs @@ -30,17 +30,19 @@ public sealed class FsdGenSwaggerApp : CodeGeneratorApp protected override FileGeneratorSettings CreateSettings(ArgsReader args) { - var serviceName = args.ReadOption("service-name"); - if (serviceName != null && !ServiceDefinitionUtility.IsValidName(serviceName)) - throw new ArgsReaderException($"Invalid service name '{serviceName}'."); + m_serviceName = args.ReadOption("service-name"); + if (m_serviceName != null && !ServiceDefinitionUtility.IsValidName(m_serviceName)) + throw new ArgsReaderException($"Invalid service name '{m_serviceName}'."); return new SwaggerGeneratorSettings { GeneratesFsd = args.ReadFlag("fsd"), GeneratesJson = args.ReadFlag("json"), - ServiceName = serviceName, + ServiceName = m_serviceName, }; } - protected override ServiceParser CreateParser() => new SwaggerParser(); + protected override ServiceParser CreateParser() => new SwaggerParser { ServiceName = m_serviceName }; + + private string? m_serviceName; } From 657809c708b486f89d591c8a5d55146877e608af Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Fri, 23 Aug 2024 14:43:45 -0700 Subject: [PATCH 3/3] Publish 2.6.2. --- Directory.Build.props | 4 ++-- ReleaseNotes.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c9229e2..d3fb178 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 2.6.1 - 2.6.0 + 2.6.2 + 2.6.1 12.0 enable enable diff --git a/ReleaseNotes.md b/ReleaseNotes.md index e13fe91..f87cae2 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,9 @@ # Release Notes +## 2.6.2 + +* Fix `--service-name`. + ## 2.6.1 * Ignore events for now.