From b56a5c8532690f47d89b9db506ddf73cbc2b9e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=98=8E=E6=97=AD?= <cloomcmx1554@hotmail.com>
Date: Tue, 21 Nov 2023 13:55:21 +0800
Subject: [PATCH] fix: #282 fix .NET7-Ocelot19.* and .NET8-Ocelot20.* bug
 (#283)

* fix: #282 fix .NET7-Ocelot19.* and .NET8-Ocelot20.* bug

* fix: Fix the bug that specifies the wrong .NET version in the workflow and fix the bug of the wrong .NET version number in the test project.
---
 .github/workflows/deploy.yml                     |  2 +-
 .github/workflows/pull_request.yml               |  2 +-
 .../MMLib.SwaggerForOcelot.csproj                | 16 ++++++++++------
 .../SwaggerServiceDiscoveryProvider.cs           |  5 ++++-
 .../MMLib.SwaggerForOcelot.BenchmarkTests.csproj |  2 +-
 .../MMLib.SwaggerForOcelot.Tests.csproj          | 10 ++++++----
 .../SwaggerServiceDiscoveryProviderShould.cs     |  2 +-
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 11d955e..d09429a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core if needed
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version:  7.0.x
+        dotnet-version:  8.0.x
     - name: Build
       run: dotnet build ./MMLib.SwaggerForOcelot.sln --configuration Release
     - name: Test
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 24c03dd..3aa534b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Setup .NET Core if needed
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version:  7.0.x
+        dotnet-version:  8.0.x
     - name: Build
       run: dotnet build ./MMLib.SwaggerForOcelot.sln --configuration Release
     - name: Test
diff --git a/src/MMLib.SwaggerForOcelot/MMLib.SwaggerForOcelot.csproj b/src/MMLib.SwaggerForOcelot/MMLib.SwaggerForOcelot.csproj
index 2bbf58e..62e309c 100644
--- a/src/MMLib.SwaggerForOcelot/MMLib.SwaggerForOcelot.csproj
+++ b/src/MMLib.SwaggerForOcelot/MMLib.SwaggerForOcelot.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Version>7.0.1</Version>
         <Authors>Milan Martiniak</Authors>
         <Company>MMLib</Company>
@@ -17,23 +16,28 @@
         <LangVersion>preview</LangVersion>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
-
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
         <DocumentationFile>bin\Release\MMLib.SwaggerForOcelot.xml</DocumentationFile>
         <OutputPath>bin\Release</OutputPath>
     </PropertyGroup>
-
     <ItemGroup>
         <None Include="icon.png" Pack="true" PackagePath="" />
     </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Kros.Utils" Version="2.1.0" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-        <PackageReference Include="Ocelot" Version="19.0.2" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
     </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Ocelot" Version="18.*" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Ocelot" Version="19.*" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Ocelot" Version="20.*" />
+    </ItemGroup>
     <ItemGroup>
         <None Include="../../README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
diff --git a/src/MMLib.SwaggerForOcelot/ServiceDiscovery/SwaggerServiceDiscoveryProvider.cs b/src/MMLib.SwaggerForOcelot/ServiceDiscovery/SwaggerServiceDiscoveryProvider.cs
index 27a3883..bab1ea6 100644
--- a/src/MMLib.SwaggerForOcelot/ServiceDiscovery/SwaggerServiceDiscoveryProvider.cs
+++ b/src/MMLib.SwaggerForOcelot/ServiceDiscovery/SwaggerServiceDiscoveryProvider.cs
@@ -93,8 +93,11 @@ private async Task<Uri> GetSwaggerUri(SwaggerEndPointConfig endPoint, RouteOptio
             {
                 throw new InvalidOperationException(GetErrorMessage(endPoint));
             }
-
+#if NET6_0
             ServiceHostAndPort service = (await serviceProvider.Data.Get()).FirstOrDefault()?.HostAndPort;
+#else
+            ServiceHostAndPort service = (await serviceProvider.Data.GetAsync()).FirstOrDefault()?.HostAndPort;
+#endif
 
             if (service is null)
             {
diff --git a/tests/MMLib.SwaggerForOcelot.BenchmarkTests/MMLib.SwaggerForOcelot.BenchmarkTests.csproj b/tests/MMLib.SwaggerForOcelot.BenchmarkTests/MMLib.SwaggerForOcelot.BenchmarkTests.csproj
index 2ae58df..97659e2 100644
--- a/tests/MMLib.SwaggerForOcelot.BenchmarkTests/MMLib.SwaggerForOcelot.BenchmarkTests.csproj
+++ b/tests/MMLib.SwaggerForOcelot.BenchmarkTests/MMLib.SwaggerForOcelot.BenchmarkTests.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <PublishSingleFile>true</PublishSingleFile>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/MMLib.SwaggerForOcelot.Tests.csproj b/tests/MMLib.SwaggerForOcelot.Tests/MMLib.SwaggerForOcelot.Tests.csproj
index 7f5727f..200316a 100644
--- a/tests/MMLib.SwaggerForOcelot.Tests/MMLib.SwaggerForOcelot.Tests.csproj
+++ b/tests/MMLib.SwaggerForOcelot.Tests/MMLib.SwaggerForOcelot.Tests.csproj
@@ -1,8 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
+  </ItemGroup>
   <ItemGroup>
     <None Remove="Resources\AggregatesOpenApiResource.json" />
     <None Remove="Tests\BasicConfigurationWithSchemaInHostOverride.json" />
@@ -70,7 +75,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\MMLib.SwaggerForOcelot\MMLib.SwaggerForOcelot.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/ServiceDiscovery/SwaggerServiceDiscoveryProviderShould.cs b/tests/MMLib.SwaggerForOcelot.Tests/ServiceDiscovery/SwaggerServiceDiscoveryProviderShould.cs
index 8c53799..b91757c 100644
--- a/tests/MMLib.SwaggerForOcelot.Tests/ServiceDiscovery/SwaggerServiceDiscoveryProviderShould.cs
+++ b/tests/MMLib.SwaggerForOcelot.Tests/ServiceDiscovery/SwaggerServiceDiscoveryProviderShould.cs
@@ -108,7 +108,7 @@ private static SwaggerServiceDiscoveryProvider CreateProvider(Service service =
             options.CurrentValue.Returns(new FileConfiguration());
 
             IServiceDiscoveryProvider serviceProvider = Substitute.For<IServiceDiscoveryProvider>();
-            serviceProvider.Get().Returns(new List<Service>() { service });
+            serviceProvider.GetAsync().Returns(new List<Service>() { service });
             var response = new OkResponse<IServiceDiscoveryProvider>(serviceProvider);
 
             serviceDiscovery.Get(Arg.Any<ServiceProviderConfiguration>(), Arg.Any<DownstreamRoute>()).Returns(response);