Fix #224, #206: hot reload failed on asp.net core 6+ mini api.

demo/Apollo.AspNetCore.Demo/Program.cs

@@ -1,18 +1,28 @@
 using Com.Ctrip.Framework.Apollo.ConfigAdapter;
 
-namespace Apollo.AspNetCore.Demo;
+YamlConfigAdapter.Register();
 
-public class Program
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Host.AddApollo(false);
+
+var app = builder.Build();
+
+app.UseDeveloperExceptionPage();
+
+app.Run(context =>
 {
- public static Task Main(string[] args)
- {
- YamlConfigAdapter.Register();
-
- return CreateHostBuilder(args).Build().RunAsync();
- }
-
- public static IHostBuilder CreateHostBuilder(string[] args) =>
- Host.CreateDefaultBuilder(args)
- .AddApollo(false)
- .ConfigureWebHostDefaults(builder => builder.UseStartup<Startup>());
-}
+ context.Response.StatusCode = 404;
+
+ var key = context.Request.Query["key"];
+ if (string.IsNullOrWhiteSpace(key)) return Task.CompletedTask;
+
+ var value = context.RequestServices.GetRequiredService<IConfiguration>()[key];
+ if (value != null) context.Response.StatusCode = 200;
+
+ context.Response.Headers["Content-Type"] = "text/html; charset=utf-8";
+
+ return context.Response.WriteAsync(value ?? "undefined");
+});
+
+app.Run();

src/Apollo.AspNetCoreHosting/Apollo.AspNetCoreHosting.csproj

@@ -12,7 +12,7 @@
 $(PackageReleaseNotes)</Description>
  <RootNamespace>Microsoft.AspNetCore.Hosting</RootNamespace>
  <TargetFramework>netcoreapp3.1</TargetFramework>
- <Version>$(ApolloVersion).0</Version>
+ <Version>$(ApolloVersion).1</Version>
  </PropertyGroup>
 
  <ItemGroup>

src/Apollo.Configuration/Apollo.Configuration.csproj

@@ -12,7 +12,7 @@
 $(PackageReleaseNotes)</Description>
  <RootNamespace>Com.Ctrip.Framework.Apollo</RootNamespace>
  <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
- <Version>$(ApolloVersion).0</Version>
+ <Version>$(ApolloVersion).1</Version>
  </PropertyGroup>
 
  <ItemGroup>

src/Apollo.Configuration/ApolloConfigurationProvider.cs

@@ -8,6 +8,7 @@ public class ApolloConfigurationProvider : ConfigurationProvider, IRepositoryCha
  internal string? SectionKey { get; }
  internal IConfigRepository ConfigRepository { get; }
  private Task? _initializeTask;
+ private int _buildCount;
 
  public ApolloConfigurationProvider(string? sectionKey, IConfigRepository configRepository)
  {
@@ -46,9 +47,18 @@ void IRepositoryChangeListener.OnRepositoryChange(string namespaceName, Properti
  OnReload();
  }
 
- IConfigurationProvider IConfigurationSource.Build(IConfigurationBuilder builder) => this;
+ IConfigurationProvider IConfigurationSource.Build(IConfigurationBuilder builder)
+ {
+ Interlocked.Increment(ref _buildCount);
+
+ return this;
+ }
 
- public void Dispose() => ConfigRepository.RemoveChangeListener(this);
+ public void Dispose()
+ {
+ if (Interlocked.Decrement(ref _buildCount) == 0)
+ ConfigRepository.RemoveChangeListener(this);
+ }
 
  public override string ToString() => string.IsNullOrEmpty(SectionKey)
  ? $"apollo {ConfigRepository}"

src/Apollo.ExtensionsHosting/Apollo.ExtensionsHosting.csproj

@@ -12,7 +12,7 @@
 $(PackageReleaseNotes)</Description>
  <RootNamespace>Microsoft.Extensions.Hosting</RootNamespace>
  <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
- <Version>$(ApolloVersion).0</Version>
+ <Version>$(ApolloVersion).1</Version>
  </PropertyGroup>
 
  <ItemGroup>