From 53faec518770bf2c943d75e3e62e41dfd92a3ff4 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 4 Jul 2024 08:22:41 -0700 Subject: [PATCH 1/2] Ignore events for now. --- Directory.Packages.props | 4 ++-- example/ExampleApi.fsd | 9 +++++++++ src/Facility.Definition.Swagger/SwaggerParser.cs | 2 +- .../Facility.Definition.Swagger.UnitTests/TestUtility.cs | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d2f25c6..0c87542 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,8 +3,8 @@ true - - + + diff --git a/example/ExampleApi.fsd b/example/ExampleApi.fsd index ba5d440..7b839ba 100644 --- a/example/ExampleApi.fsd +++ b/example/ExampleApi.fsd @@ -408,6 +408,15 @@ service ExampleApi /// An external enum. extern enum ExternalEnum; + + [http(method: GET)] + event fibonacci + { + count: int32!; + }: + { + value: int32!; + } } # ExampleApi diff --git a/src/Facility.Definition.Swagger/SwaggerParser.cs b/src/Facility.Definition.Swagger/SwaggerParser.cs index 32ab0c1..65a67b6 100644 --- a/src/Facility.Definition.Swagger/SwaggerParser.cs +++ b/src/Facility.Definition.Swagger/SwaggerParser.cs @@ -22,7 +22,7 @@ public sealed class SwaggerParser : ServiceParser /// protected override bool TryParseDefinitionCore(ServiceDefinitionText text, out ServiceInfo? service, out IReadOnlyList errors) { - var isFsd = new FsdParser().TryParseDefinition(text, out service, out errors); + var isFsd = new FsdParser(new() { SupportsEvents = true }).TryParseDefinition(text, out service, out errors); if (isFsd || text.Name.EndsWith(".fsd", StringComparison.OrdinalIgnoreCase)) return isFsd; diff --git a/tests/Facility.Definition.Swagger.UnitTests/TestUtility.cs b/tests/Facility.Definition.Swagger.UnitTests/TestUtility.cs index a9c154f..a2313cb 100644 --- a/tests/Facility.Definition.Swagger.UnitTests/TestUtility.cs +++ b/tests/Facility.Definition.Swagger.UnitTests/TestUtility.cs @@ -6,6 +6,6 @@ internal static class TestUtility { public static ServiceInfo ParseTestApi(string text) { - return new FsdParser().ParseDefinition(new ServiceDefinitionText("TestApi.fsd", text)); + return new FsdParser(new() { SupportsEvents = true }).ParseDefinition(new ServiceDefinitionText("TestApi.fsd", text)); } } From be69d59c8f59d23d5262c7940ab719c00b1ce547 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 4 Jul 2024 08:23:15 -0700 Subject: [PATCH 2/2] Publish 2.6.1. --- 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 a71f005..c9229e2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 2.6.0 - 2.5.0 + 2.6.1 + 2.6.0 12.0 enable enable diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 9354d72..e13fe91 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,9 @@ # Release Notes +## 2.6.1 + +* Ignore events for now. + ## 2.6.0 * Add .NET 8 targets. Update dependencies.