升级Ocelot 18.0.0 & 支持.net6

3 years ago · 75730ec6ff
parent ab147e9ed1
commit 75730ec6ff
7 changed files with 15 additions and 13 deletions
--- a/demo/ApiGatewayDemo/ApiGatewayDemo.csproj
+++ b/demo/ApiGatewayDemo/ApiGatewayDemo.csproj
@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <AssemblyName>ApiGatewayDemo</AssemblyName>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Ocelot" Version="17.0.0" />
+    <PackageReference Include="Ocelot" Version="18.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/demo/ApiGatewayDemo/Properties/launchSettings.json
+++ b/demo/ApiGatewayDemo/Properties/launchSettings.json
@ -3,7 +3,7 @@
    "ApiGatewayDemo": {
      "commandName": "Project",
      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5001",
+      "applicationUrl": "http://0.0.0.0:5001",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/demo/ProductApi/ProductApi.csproj
+++ b/demo/ProductApi/ProductApi.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
    
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
--- a/demo/ProductApi/Properties/launchSettings.json
+++ b/demo/ProductApi/Properties/launchSettings.json
@ -18,7 +18,7 @@
    "ProductApi": {
      "commandName": "Project",
      "launchBrowser": true,
-      "applicationUrl": "http://*:5002",
+      "applicationUrl": "http://0.0.0.0:5002",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/src/Ocelot.Provider.Nacos/NacosClient/V2/ServiceCollectionExtensions.cs
+++ b/src/Ocelot.Provider.Nacos/NacosClient/V2/ServiceCollectionExtensions.cs
@ -21,7 +21,9 @@ namespace Ocelot.Provider.Nacos.NacosClient.V2
        public static IServiceCollection AddNacosAspNet(this IServiceCollection services, IConfiguration configuration, string section = "nacos")
        {
            services.Configure<NacosAspNetOptions>(configuration.GetSection(section));
-            services.AddNacosV2Naming(configuration);
+
+            services.AddNacosV2Naming(configuration, sectionName: section);
+
            services.AddSingleton<RegSvcBgTask>();

            return services;
--- a/src/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
+++ b/src/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Authors>softlgl</Authors>
    <Copyright>softlgl</Copyright>
    <Owners>softlgl</Owners>
@ -12,10 +12,10 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="nacos-sdk-csharp" Version="1.2.2" />
-    <PackageReference Include="Ocelot" Version="17.0.0" />   
+    <PackageReference Include="nacos-sdk-csharp" Version="1.3.1" />
+    <PackageReference Include="Ocelot" Version="18.0.0" />   
    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="EasyCaching.InMemory" Version="1.4.1" />
+    <PackageReference Include="EasyCaching.InMemory" Version="1.5.0" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
  </ItemGroup>
 </Project>
--- a/test/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj
+++ b/test/Ocelot.Provider.Nacos.Test/Ocelot.Provider.Nacos.Test.csproj
@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>

    <IsPackable>false</IsPackable>
  </PropertyGroup>