Recognise IAsyncEnumerable as a channel type (#43)

* Recognise IAsyncEnumerable as a channel type Fixes #38 * Need to go to .net standard 2.1 for IAsyncEnumerable Co-authored-by: dave <[email protected]>
RicoSuter · May 20, 2022 · ca4fa64 · ca4fa64
1 parent 478d4d1
commit ca4fa64
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/src/HelloSignalR/HelloSignalR.csproj b/src/HelloSignalR/HelloSignalR.csproj
@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SigSpec.AspNetCore\SigSpec.AspNetCore.csproj" />

diff --git a/src/HelloSignalR/Startup.cs b/src/HelloSignalR/Startup.cs
@@ -25,17 +25,17 @@ public void ConfigureServices(IServiceCollection services)
             });
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             app.UseStaticFiles();
             app.UseCors();
 
             app.UseSigSpec();
             app.UseSigSpecUi();
 
-            app.UseSignalR(routes =>
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapHub<ChatHub>("/chat");
+                endpoints.MapHub<ChatHub>("/chat");
             });
         }
     }

diff --git a/src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj b/src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <Owners>Rico Suter</Owners>

diff --git a/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj b/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <Owners>Rico Suter</Owners>

diff --git a/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj b/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <Owners>Rico Suter</Owners>

diff --git a/src/SigSpec.Core/SigSpec.Core.csproj b/src/SigSpec.Core/SigSpec.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <Owners>Rico Suter</Owners>

diff --git a/src/SigSpec.Core/SigSpecGenerator.cs b/src/SigSpec.Core/SigSpecGenerator.cs
@@ -74,7 +74,7 @@ private IEnumerable<MethodInfo> GetOperationMethods(Type type)
         {
             return type.GetTypeInfo().GetRuntimeMethods().Where(m =>
             {
-                var returnsChannelReader = m.ReturnType.IsGenericType && m.ReturnType.GetGenericTypeDefinition() == typeof(ChannelReader<>);
+                var returnsChannelReader = m.ReturnType.IsGenericType && (m.ReturnType.GetGenericTypeDefinition() == typeof(ChannelReader<>) || m.ReturnType.GetGenericTypeDefinition() == typeof(IAsyncEnumerable<>));
                 return
                     m.IsPublic &&
                     m.IsSpecialName == false &&
@@ -90,7 +90,7 @@ private IEnumerable<MethodInfo> GetChannelMethods(Type type)
         {
             return type.GetTypeInfo().GetRuntimeMethods().Where(m =>
             {
-                var returnsChannelReader = m.ReturnType.IsGenericType && m.ReturnType.GetGenericTypeDefinition() == typeof(ChannelReader<>);
+                var returnsChannelReader = m.ReturnType.IsGenericType && (m.ReturnType.GetGenericTypeDefinition() == typeof(ChannelReader<>) || m.ReturnType.GetGenericTypeDefinition() == typeof(IAsyncEnumerable<>));
                 return
                     m.IsPublic &&
                     m.IsSpecialName == false &&