From 27bde3311f01b4a1948279bb1bb7f71f9870d08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=BC=9F?= Date: Mon, 26 Sep 2022 15:08:50 +0800 Subject: [PATCH 1/2] Adjust solution structure. --- .../Apollo.AspNetCore.Demo.csproj | 13 ------ .../Apollo.ConfigAdapter.Yaml.Tests.csproj | 19 -------- .../Apollo.Configuration.Demo.csproj | 17 -------- .../Apollo.ConfigurationManager.Demo.csproj | 15 ------- .../Apollo.OpenApi.Tests.csproj | 18 -------- Apollo.sln | 43 +++++++++++-------- Directory.Build.props | 21 +-------- Directory.Build.targets | 8 ++-- .../Apollo.AspNet.Demo.csproj | 8 ++-- .../Apollo.AspNet.Demo}/Global.asax | 0 .../Apollo.AspNet.Demo}/Global.asax.cs | 0 .../Apollo.AspNet.Demo}/Startup.cs | 0 .../Apollo.AspNet.Demo}/Web.config | 0 .../Apollo.AspNetCore.Demo.csproj | 12 ++++++ .../Apollo.AspNetCore.Demo}/Program.cs | 0 .../Properties/launchSettings.json | 0 .../Apollo.AspNetCore.Demo}/Startup.cs | 0 .../Apollo.Configuration.Demo.csproj | 16 +++++++ .../ConfigurationDemo.cs | 0 .../Apollo.Configuration.Demo}/Program.cs | 0 .../Properties/launchSettings.json | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 .../Apollo.ConfigurationManager.Demo.csproj | 14 ++++++ .../ConfigurationManagerDemo.cs | 0 .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Apollo.AspNetCoreHosting.csproj | 0 .../Apollo.ConfigAdapter.Yaml.csproj | 0 .../YamlConfigAdapter.cs | 0 .../YamlConfigurationFileParser.cs | 0 .../Apollo.Configuration.csproj | 0 .../ApolloConfigurationBuilder.cs | 0 .../ApolloConfigurationExtensions.cs | 0 .../ApolloConfigurationManager.cs | 0 .../ApolloConfigurationProvider.cs | 0 .../Apollo.Configuration}/ApolloOptions.cs | 0 .../Logging/MelLogging.cs | 0 .../Apollo.Configuration}/README.md | 0 .../Apollo.ConfigurationManager.csproj | 0 .../ApolloConfigurationBuilder.cs | 0 .../ApolloConfigurationManager.cs | 0 .../AppSettingsSectionBuilder.cs | 0 ...ramework.Apollo.ConfigurationManager.props | 0 .../CommonSectionBuilder.cs | 0 .../ConfigExtensions.cs | 0 .../ConnectionStringsSectionBuilder.cs | 0 .../Core/MetaDomainHelper.cs | 0 .../NodeReplaceSectionBuilder.cs | 0 .../PlaceholderConfig.cs | 0 .../PropertyPlaceholderHelper.cs | 0 .../Apollo.ConfigurationManager}/README.md | 0 .../Util/ConfigUtil.cs | 0 .../Apollo.ExtensionsHosting.csproj | 0 .../HostingBuilderExtensions.cs | 0 .../Apollo.OpenApi.DependencyInjection.csproj | 0 .../ServiceCollectionExtensions.cs | 0 .../Apollo.OpenApi}/Apollo.OpenApi.csproj | 0 .../Apollo.OpenApi}/ApolloOpenApiException.cs | 0 .../Apollo.OpenApi}/AppClusterClient.cs | 0 .../AppClusterClientExtensions.cs | 0 .../Apollo.OpenApi}/IAppClusterClient.cs | 0 .../Apollo.OpenApi}/INamespaceClient.cs | 0 .../Apollo.OpenApi}/IOpenApiClient.cs | 0 .../Apollo.OpenApi}/IOpenApiFactory.cs | 0 .../Apollo.OpenApi}/Model/AppInfo.cs | 0 .../Apollo.OpenApi}/Model/AppNamespace.cs | 0 .../Apollo.OpenApi}/Model/BaseModel.cs | 0 .../Apollo.OpenApi}/Model/Cluster.cs | 0 .../Apollo.OpenApi}/Model/EnvCluster.cs | 0 .../Apollo.OpenApi}/Model/Item.cs | 0 .../Apollo.OpenApi}/Model/Namespace.cs | 0 .../Apollo.OpenApi}/Model/NamespaceLock.cs | 0 .../Apollo.OpenApi}/Model/NamespaceRelease.cs | 0 .../Apollo.OpenApi}/Model/Release.cs | 0 .../Apollo.OpenApi}/NamespaceClient.cs | 0 .../NamespaceClientExtensions.cs | 0 .../Apollo.OpenApi}/OpenApiClient.cs | 0 .../OpenApiClientExtensions.cs | 0 .../Apollo.OpenApi}/OpenApiFactory.cs | 0 .../Apollo.OpenApi}/OpenApiOptions.cs | 0 .../Apollo.OpenApi}/README.md | 0 {Apollo => src/Apollo}/Apollo.csproj | 0 {Apollo => src/Apollo}/CacheFileProvider.cs | 0 .../ConfigAdapter/ConfigurationPath.cs | 0 .../ConfigAdapter/JsonConfigAdapter.cs | 0 .../ConfigAdapter/JsonConfigurationParser.cs | 0 .../ConfigAdapter/XmlConfigAdapter .cs | 0 .../ConfigAdapter/XmlConfigurationParser.cs | 0 {Apollo => src/Apollo}/ConfigExtensions.cs | 0 .../Apollo}/ConfigExtensions.generated.cs | 0 {Apollo => src/Apollo}/ConfigExtensions.tt | 0 {Apollo => src/Apollo}/Core/ConfigConsts.cs | 0 .../Apollo}/Core/Dto/ApolloConfig.cs | 0 .../Core/Dto/ApolloConfigNotification.cs | 0 .../Core/Dto/ApolloNotificationMessages.cs | 0 {Apollo => src/Apollo}/Core/Dto/ServiceDTO.cs | 0 .../Schedule/ExponentialSchedulePolicy.cs | 0 .../Apollo}/Core/Schedule/SchedulePolicy.cs | 0 .../LimitedConcurrencyLevelTaskScheduler.cs | 0 .../Apollo}/Core/Utils/Properties.cs | 0 .../Apollo}/Enums/ConfigFileFormat.cs | 0 {Apollo => src/Apollo}/Enums/Env.cs | 0 .../Apollo}/Enums/PropertyChangeType.cs | 0 .../Exceptions/ApolloConfigException.cs | 0 .../ApolloConfigStatusCodeException.cs | 0 .../Foundation/NetworkInterfaceManager.cs | 0 {Apollo => src/Apollo}/IApolloOptions.cs | 0 {Apollo => src/Apollo}/IConfig.cs | 0 {Apollo => src/Apollo}/IConfigAdapter.cs | 0 .../Apollo}/Internals/AbstractConfig.cs | 0 .../Internals/AbstractConfigRepository.cs | 0 .../Apollo}/Internals/ConfigManager.cs | 0 .../Internals/ConfigRepositoryFactory.cs | 0 .../Apollo}/Internals/ConfigServiceLocator.cs | 0 .../Apollo}/Internals/DefaultConfig.cs | 0 .../Apollo}/Internals/DefaultConfigManager.cs | 0 .../Apollo}/Internals/IConfigRepository.cs | 0 .../Internals/IConfigRepositoryFactory.cs | 0 .../Internals/LocalFileConfigRepository.cs | 0 .../Apollo}/Internals/MultiConfig.cs | 0 .../Internals/RemoteConfigLongPollService.cs | 0 .../Internals/RemoteConfigRepository.cs | 0 .../Internals/RepositoryChangeListener.cs | 0 {Apollo => src/Apollo}/Logging/LogLevel.cs | 0 {Apollo => src/Apollo}/Logging/LogManager.cs | 0 {Apollo => src/Apollo}/Model/ConfigChange.cs | 0 .../Apollo}/Model/ConfigChangeEventArgs.cs | 0 {Apollo => src/Apollo}/Resources.Designer.cs | 0 {Apollo => src/Apollo}/Resources.resx | 0 {Apollo => src/Apollo}/Spi/ConfigFactory.cs | 0 {Apollo => src/Apollo}/Spi/ConfigRegistry.cs | 0 .../Apollo}/Spi/DefaultConfigFactory.cs | 0 .../Apollo}/Spi/DefaultConfigRegistry.cs | 0 {Apollo => src/Apollo}/Util/ExceptionUtil.cs | 0 .../Apollo}/Util/Http/HttpResponse.cs | 0 {Apollo => src/Apollo}/Util/Http/HttpUtil.cs | 0 {Apollo => src/Apollo}/Util/Http/JsonUtil.cs | 0 {Apollo => src/Apollo}/Util/Http/Signature.cs | 0 src/Directory.Build.props | 19 ++++++++ src/Directory.Build.targets | 15 +++++++ PackAllProject.ps1 => src/PackAllProject.ps1 | 8 ++-- .../Apollo.ConfigAdapter.Yaml.Tests.csproj | 11 +++++ .../YamlConfigAdapterTest.cs | 0 .../Apollo.Configuration.Tests.csproj | 11 +++++ .../ApolloConfigurationBuilderTest.cs | 0 .../ApolloOptionsTest.cs | 0 .../Apollo.ConfigurationManager.Tests.csproj | 8 +--- .../App.config | 0 .../ConfigExtensionsTest.cs | 0 .../ConfigUtilTest.cs | 0 .../ConfigurationBuilderTest.cs | 0 .../PropertyPlaceholderHelperTest.cs | 0 .../TestConfig.cs | 0 .../TestConfigurationSection.cs | 0 .../Apollo.OpenApi.Tests.csproj | 13 ++++++ .../Apollo.OpenApi.Tests}/AppClusterTest.cs | 0 .../Apollo.OpenApi.Tests}/BaseTest.cs | 0 .../NamespaceClientTest.cs | 0 .../OpenApiFactoryTest.cs | 0 .../Apollo.Tests}/Apollo.Tests.csproj | 7 +-- .../Apollo.Tests}/ConfigAdapterTest.cs | 0 .../Apollo.Tests}/ConfigExtensionsTest.cs | 0 .../Apollo.Tests}/ConfigServiceLocatorTest.cs | 0 .../Apollo.Tests}/ConfigTest.cs | 0 .../Apollo.Tests}/LogManagerTest.cs | 0 .../Directory.Build.targets | 8 ++-- 167 files changed, 155 insertions(+), 149 deletions(-) delete mode 100644 Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj delete mode 100644 Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj delete mode 100644 Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj delete mode 100644 Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj delete mode 100644 Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj rename {Apollo.AspNet.Demo => demo/Apollo.AspNet.Demo}/Apollo.AspNet.Demo.csproj (93%) rename {Apollo.AspNet.Demo => demo/Apollo.AspNet.Demo}/Global.asax (100%) rename {Apollo.AspNet.Demo => demo/Apollo.AspNet.Demo}/Global.asax.cs (100%) rename {Apollo.AspNet.Demo => demo/Apollo.AspNet.Demo}/Startup.cs (100%) rename {Apollo.AspNet.Demo => demo/Apollo.AspNet.Demo}/Web.config (100%) create mode 100644 demo/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj rename {Apollo.AspNetCore.Demo => demo/Apollo.AspNetCore.Demo}/Program.cs (100%) rename {Apollo.AspNetCore.Demo => demo/Apollo.AspNetCore.Demo}/Properties/launchSettings.json (100%) rename {Apollo.AspNetCore.Demo => demo/Apollo.AspNetCore.Demo}/Startup.cs (100%) create mode 100644 demo/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj rename {Apollo.Configuration.Demo => demo/Apollo.Configuration.Demo}/ConfigurationDemo.cs (100%) rename {Apollo.Configuration.Demo => demo/Apollo.Configuration.Demo}/Program.cs (100%) rename {Apollo.Configuration.Demo => demo/Apollo.Configuration.Demo}/Properties/launchSettings.json (100%) rename {Apollo.Configuration.Demo => demo/Apollo.Configuration.Demo}/appsettings.Development.json (100%) rename {Apollo.Configuration.Demo => demo/Apollo.Configuration.Demo}/appsettings.json (100%) create mode 100644 demo/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj rename {Apollo.ConfigurationManager.Demo => demo/Apollo.ConfigurationManager.Demo}/ConfigurationManagerDemo.cs (100%) rename {Apollo.ConfigurationManager.Demo => demo/Apollo.ConfigurationManager.Demo}/Program.cs (100%) rename {Apollo.ConfigurationManager.Demo => demo/Apollo.ConfigurationManager.Demo}/Properties/launchSettings.json (100%) rename {Apollo.AspNetCoreHosting => src/Apollo.AspNetCoreHosting}/Apollo.AspNetCoreHosting.csproj (100%) rename {Apollo.ConfigAdapter.Yaml => src/Apollo.ConfigAdapter.Yaml}/Apollo.ConfigAdapter.Yaml.csproj (100%) rename {Apollo.ConfigAdapter.Yaml => src/Apollo.ConfigAdapter.Yaml}/YamlConfigAdapter.cs (100%) rename {Apollo.ConfigAdapter.Yaml => src/Apollo.ConfigAdapter.Yaml}/YamlConfigurationFileParser.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/Apollo.Configuration.csproj (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/ApolloConfigurationBuilder.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/ApolloConfigurationExtensions.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/ApolloConfigurationManager.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/ApolloConfigurationProvider.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/ApolloOptions.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/Logging/MelLogging.cs (100%) rename {Apollo.Configuration => src/Apollo.Configuration}/README.md (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/Apollo.ConfigurationManager.csproj (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/ApolloConfigurationBuilder.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/ApolloConfigurationManager.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/AppSettingsSectionBuilder.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/Com.Ctrip.Framework.Apollo.ConfigurationManager.props (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/CommonSectionBuilder.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/ConfigExtensions.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/ConnectionStringsSectionBuilder.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/Core/MetaDomainHelper.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/NodeReplaceSectionBuilder.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/PlaceholderConfig.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/PropertyPlaceholderHelper.cs (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/README.md (100%) rename {Apollo.ConfigurationManager => src/Apollo.ConfigurationManager}/Util/ConfigUtil.cs (100%) rename {Apollo.ExtensionsHosting => src/Apollo.ExtensionsHosting}/Apollo.ExtensionsHosting.csproj (100%) rename {Apollo.ExtensionsHosting => src/Apollo.ExtensionsHosting}/HostingBuilderExtensions.cs (100%) rename {Apollo.OpenApi.DependencyInjection => src/Apollo.OpenApi.DependencyInjection}/Apollo.OpenApi.DependencyInjection.csproj (100%) rename {Apollo.OpenApi.DependencyInjection => src/Apollo.OpenApi.DependencyInjection}/ServiceCollectionExtensions.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Apollo.OpenApi.csproj (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/ApolloOpenApiException.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/AppClusterClient.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/AppClusterClientExtensions.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/IAppClusterClient.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/INamespaceClient.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/IOpenApiClient.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/IOpenApiFactory.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/AppInfo.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/AppNamespace.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/BaseModel.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/Cluster.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/EnvCluster.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/Item.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/Namespace.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/NamespaceLock.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/NamespaceRelease.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/Model/Release.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/NamespaceClient.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/NamespaceClientExtensions.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/OpenApiClient.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/OpenApiClientExtensions.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/OpenApiFactory.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/OpenApiOptions.cs (100%) rename {Apollo.OpenApi => src/Apollo.OpenApi}/README.md (100%) rename {Apollo => src/Apollo}/Apollo.csproj (100%) rename {Apollo => src/Apollo}/CacheFileProvider.cs (100%) rename {Apollo => src/Apollo}/ConfigAdapter/ConfigurationPath.cs (100%) rename {Apollo => src/Apollo}/ConfigAdapter/JsonConfigAdapter.cs (100%) rename {Apollo => src/Apollo}/ConfigAdapter/JsonConfigurationParser.cs (100%) rename {Apollo => src/Apollo}/ConfigAdapter/XmlConfigAdapter .cs (100%) rename {Apollo => src/Apollo}/ConfigAdapter/XmlConfigurationParser.cs (100%) rename {Apollo => src/Apollo}/ConfigExtensions.cs (100%) rename {Apollo => src/Apollo}/ConfigExtensions.generated.cs (100%) rename {Apollo => src/Apollo}/ConfigExtensions.tt (100%) rename {Apollo => src/Apollo}/Core/ConfigConsts.cs (100%) rename {Apollo => src/Apollo}/Core/Dto/ApolloConfig.cs (100%) rename {Apollo => src/Apollo}/Core/Dto/ApolloConfigNotification.cs (100%) rename {Apollo => src/Apollo}/Core/Dto/ApolloNotificationMessages.cs (100%) rename {Apollo => src/Apollo}/Core/Dto/ServiceDTO.cs (100%) rename {Apollo => src/Apollo}/Core/Schedule/ExponentialSchedulePolicy.cs (100%) rename {Apollo => src/Apollo}/Core/Schedule/SchedulePolicy.cs (100%) rename {Apollo => src/Apollo}/Core/Utils/LimitedConcurrencyLevelTaskScheduler.cs (100%) rename {Apollo => src/Apollo}/Core/Utils/Properties.cs (100%) rename {Apollo => src/Apollo}/Enums/ConfigFileFormat.cs (100%) rename {Apollo => src/Apollo}/Enums/Env.cs (100%) rename {Apollo => src/Apollo}/Enums/PropertyChangeType.cs (100%) rename {Apollo => src/Apollo}/Exceptions/ApolloConfigException.cs (100%) rename {Apollo => src/Apollo}/Exceptions/ApolloConfigStatusCodeException.cs (100%) rename {Apollo => src/Apollo}/Foundation/NetworkInterfaceManager.cs (100%) rename {Apollo => src/Apollo}/IApolloOptions.cs (100%) rename {Apollo => src/Apollo}/IConfig.cs (100%) rename {Apollo => src/Apollo}/IConfigAdapter.cs (100%) rename {Apollo => src/Apollo}/Internals/AbstractConfig.cs (100%) rename {Apollo => src/Apollo}/Internals/AbstractConfigRepository.cs (100%) rename {Apollo => src/Apollo}/Internals/ConfigManager.cs (100%) rename {Apollo => src/Apollo}/Internals/ConfigRepositoryFactory.cs (100%) rename {Apollo => src/Apollo}/Internals/ConfigServiceLocator.cs (100%) rename {Apollo => src/Apollo}/Internals/DefaultConfig.cs (100%) rename {Apollo => src/Apollo}/Internals/DefaultConfigManager.cs (100%) rename {Apollo => src/Apollo}/Internals/IConfigRepository.cs (100%) rename {Apollo => src/Apollo}/Internals/IConfigRepositoryFactory.cs (100%) rename {Apollo => src/Apollo}/Internals/LocalFileConfigRepository.cs (100%) rename {Apollo => src/Apollo}/Internals/MultiConfig.cs (100%) rename {Apollo => src/Apollo}/Internals/RemoteConfigLongPollService.cs (100%) rename {Apollo => src/Apollo}/Internals/RemoteConfigRepository.cs (100%) rename {Apollo => src/Apollo}/Internals/RepositoryChangeListener.cs (100%) rename {Apollo => src/Apollo}/Logging/LogLevel.cs (100%) rename {Apollo => src/Apollo}/Logging/LogManager.cs (100%) rename {Apollo => src/Apollo}/Model/ConfigChange.cs (100%) rename {Apollo => src/Apollo}/Model/ConfigChangeEventArgs.cs (100%) rename {Apollo => src/Apollo}/Resources.Designer.cs (100%) rename {Apollo => src/Apollo}/Resources.resx (100%) rename {Apollo => src/Apollo}/Spi/ConfigFactory.cs (100%) rename {Apollo => src/Apollo}/Spi/ConfigRegistry.cs (100%) rename {Apollo => src/Apollo}/Spi/DefaultConfigFactory.cs (100%) rename {Apollo => src/Apollo}/Spi/DefaultConfigRegistry.cs (100%) rename {Apollo => src/Apollo}/Util/ExceptionUtil.cs (100%) rename {Apollo => src/Apollo}/Util/Http/HttpResponse.cs (100%) rename {Apollo => src/Apollo}/Util/Http/HttpUtil.cs (100%) rename {Apollo => src/Apollo}/Util/Http/JsonUtil.cs (100%) rename {Apollo => src/Apollo}/Util/Http/Signature.cs (100%) create mode 100644 src/Directory.Build.props create mode 100644 src/Directory.Build.targets rename PackAllProject.ps1 => src/PackAllProject.ps1 (88%) create mode 100644 test/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj rename {Apollo.ConfigAdapter.Yaml.Tests => test/Apollo.ConfigAdapter.Yaml.Tests}/YamlConfigAdapterTest.cs (100%) create mode 100644 test/Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj rename {Apollo.Configuration.Tests => test/Apollo.Configuration.Tests}/ApolloConfigurationBuilderTest.cs (100%) rename {Apollo.Configuration.Tests => test/Apollo.Configuration.Tests}/ApolloOptionsTest.cs (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/Apollo.ConfigurationManager.Tests.csproj (60%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/App.config (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/ConfigExtensionsTest.cs (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/ConfigUtilTest.cs (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/ConfigurationBuilderTest.cs (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/PropertyPlaceholderHelperTest.cs (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/TestConfig.cs (100%) rename {Apollo.ConfigurationManager.Tests => test/Apollo.ConfigurationManager.Tests}/TestConfigurationSection.cs (100%) create mode 100644 test/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj rename {Apollo.OpenApi.Tests => test/Apollo.OpenApi.Tests}/AppClusterTest.cs (100%) rename {Apollo.OpenApi.Tests => test/Apollo.OpenApi.Tests}/BaseTest.cs (100%) rename {Apollo.OpenApi.Tests => test/Apollo.OpenApi.Tests}/NamespaceClientTest.cs (100%) rename {Apollo.OpenApi.Tests => test/Apollo.OpenApi.Tests}/OpenApiFactoryTest.cs (100%) rename {Apollo.Tests => test/Apollo.Tests}/Apollo.Tests.csproj (51%) rename {Apollo.Tests => test/Apollo.Tests}/ConfigAdapterTest.cs (100%) rename {Apollo.Tests => test/Apollo.Tests}/ConfigExtensionsTest.cs (100%) rename {Apollo.Tests => test/Apollo.Tests}/ConfigServiceLocatorTest.cs (100%) rename {Apollo.Tests => test/Apollo.Tests}/ConfigTest.cs (100%) rename {Apollo.Tests => test/Apollo.Tests}/LogManagerTest.cs (100%) rename Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj => test/Directory.Build.targets (63%) diff --git a/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj b/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj deleted file mode 100644 index 3e3caad..0000000 --- a/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - net6 - false - - - - - - - - diff --git a/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj b/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj deleted file mode 100644 index fdb6b80..0000000 --- a/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net472;netcoreapp3.1 - - false - - - - - - - - - - - - - diff --git a/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj b/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj deleted file mode 100644 index e31eb48..0000000 --- a/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp3.1 - Exe - false - - - - - - - - - - - diff --git a/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj b/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj deleted file mode 100644 index 7a45247..0000000 --- a/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net45 - Exe - false - - - - - - - - - diff --git a/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj b/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj deleted file mode 100644 index f2acdc2..0000000 --- a/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net472;netcoreapp3.1 - - false - - - - - - - - - - - - diff --git a/Apollo.sln b/Apollo.sln index 34245be..a64987f 100644 --- a/Apollo.sln +++ b/Apollo.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31825.309 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Demo", "Apollo.Configuration.Demo\Apollo.Configuration.Demo.csproj", "{D78C920D-C96B-4973-BBC8-35E5DB54DF2A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Demo", "demo\Apollo.Configuration.Demo\Apollo.Configuration.Demo.csproj", "{D78C920D-C96B-4973-BBC8-35E5DB54DF2A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo", "Apollo\Apollo.csproj", "{B231A39E-9D8A-4F63-9DFF-4FB7B5A900AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo", "src\Apollo\Apollo.csproj", "{B231A39E-9D8A-4F63-9DFF-4FB7B5A900AB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration", "Apollo.Configuration\Apollo.Configuration.csproj", "{5AE563BF-2E6F-4096-A324-7A5A72B2CBAC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration", "src\Apollo.Configuration\Apollo.Configuration.csproj", "{5AE563BF-2E6F-4096-A324-7A5A72B2CBAC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager", "Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj", "{CE700879-20DD-4FAE-B431-884802B99A2D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager", "src\Apollo.ConfigurationManager\Apollo.ConfigurationManager.csproj", "{CE700879-20DD-4FAE-B431-884802B99A2D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52301167-7BBA-48C2-BA36-08270D57D2C4}" ProjectSection(SolutionItems) = preProject @@ -19,41 +19,48 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution azure-pipelines.yml = azure-pipelines.yml Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets - PackAllProject.ps1 = PackAllProject.ps1 README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Demo", "Apollo.ConfigurationManager.Demo\Apollo.ConfigurationManager.Demo.csproj", "{51A78BF1-4708-45EC-9F2E-59A24D64DB05}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Demo", "demo\Apollo.ConfigurationManager.Demo\Apollo.ConfigurationManager.Demo.csproj", "{51A78BF1-4708-45EC-9F2E-59A24D64DB05}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{12417079-E62C-4F29-ADDE-5EABD77331E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apollo.AspNet.Demo", "Apollo.AspNet.Demo\Apollo.AspNet.Demo.csproj", "{E1EF936E-182E-47BD-B658-87C0D872AB0C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apollo.AspNet.Demo", "demo\Apollo.AspNet.Demo\Apollo.AspNet.Demo.csproj", "{E1EF936E-182E-47BD-B658-87C0D872AB0C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9CB5265-6B89-42F1-BA20-2F85427359E7}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + src\Directory.Build.targets = src\Directory.Build.targets + src\PackAllProject.ps1 = src\PackAllProject.ps1 + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{24717111-7EE5-4F52-B1BA-328167E51C91}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.targets = test\Directory.Build.targets + EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Tests", "Apollo.Configuration.Tests\Apollo.Configuration.Tests.csproj", "{BBD59F3E-FB5A-4972-8195-AC980E9677FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Configuration.Tests", "test\Apollo.Configuration.Tests\Apollo.Configuration.Tests.csproj", "{BBD59F3E-FB5A-4972-8195-AC980E9677FD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Tests", "Apollo.Tests\Apollo.Tests.csproj", "{0E0A93F8-27ED-4114-81CB-AA6250EF8CDD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.Tests", "test\Apollo.Tests\Apollo.Tests.csproj", "{0E0A93F8-27ED-4114-81CB-AA6250EF8CDD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Tests", "Apollo.ConfigurationManager.Tests\Apollo.ConfigurationManager.Tests.csproj", "{0F441878-CCF9-40EB-B190-825D86883920}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigurationManager.Tests", "test\Apollo.ConfigurationManager.Tests\Apollo.ConfigurationManager.Tests.csproj", "{0F441878-CCF9-40EB-B190-825D86883920}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCore.Demo", "Apollo.AspNetCore.Demo\Apollo.AspNetCore.Demo.csproj", "{8D1A9478-6E11-4FB2-8537-E7497E004612}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCore.Demo", "demo\Apollo.AspNetCore.Demo\Apollo.AspNetCore.Demo.csproj", "{8D1A9478-6E11-4FB2-8537-E7497E004612}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml", "Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj", "{DA39FFF7-0FC5-4F5B-8224-AA8E3026BBC0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml", "src\Apollo.ConfigAdapter.Yaml\Apollo.ConfigAdapter.Yaml.csproj", "{DA39FFF7-0FC5-4F5B-8224-AA8E3026BBC0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml.Tests", "Apollo.ConfigAdapter.Yaml.Tests\Apollo.ConfigAdapter.Yaml.Tests.csproj", "{8E91B287-88A7-4AAA-B5E2-6ED46C2DBC2D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ConfigAdapter.Yaml.Tests", "test\Apollo.ConfigAdapter.Yaml.Tests\Apollo.ConfigAdapter.Yaml.Tests.csproj", "{8E91B287-88A7-4AAA-B5E2-6ED46C2DBC2D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi", "Apollo.OpenApi\Apollo.OpenApi.csproj", "{D3A91B3E-3C8E-429F-A5BA-B3178AB1D5A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi", "src\Apollo.OpenApi\Apollo.OpenApi.csproj", "{D3A91B3E-3C8E-429F-A5BA-B3178AB1D5A1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.DependencyInjection", "Apollo.OpenApi.DependencyInjection\Apollo.OpenApi.DependencyInjection.csproj", "{DF925964-C88B-4DCC-8509-EAB1847D1B05}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.DependencyInjection", "src\Apollo.OpenApi.DependencyInjection\Apollo.OpenApi.DependencyInjection.csproj", "{DF925964-C88B-4DCC-8509-EAB1847D1B05}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.Tests", "Apollo.OpenApi.Tests\Apollo.OpenApi.Tests.csproj", "{62AB1893-C173-41C7-9884-46A199244B13}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.OpenApi.Tests", "test\Apollo.OpenApi.Tests\Apollo.OpenApi.Tests.csproj", "{62AB1893-C173-41C7-9884-46A199244B13}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ExtensionsHosting", "Apollo.ExtensionsHosting\Apollo.ExtensionsHosting.csproj", "{65DED7CA-9B84-45AE-84D4-13400A3842D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.ExtensionsHosting", "src\Apollo.ExtensionsHosting\Apollo.ExtensionsHosting.csproj", "{65DED7CA-9B84-45AE-84D4-13400A3842D7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCoreHosting", "Apollo.AspNetCoreHosting\Apollo.AspNetCoreHosting.csproj", "{78AB89DD-1D81-4619-8750-2DABDA071FD4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apollo.AspNetCoreHosting", "src\Apollo.AspNetCoreHosting\Apollo.AspNetCoreHosting.csproj", "{78AB89DD-1D81-4619-8750-2DABDA071FD4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Directory.Build.props b/Directory.Build.props index 8516592..97d1213 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,22 +1,12 @@  - 2.9 - ..\Apollo.snk - $(ApolloVersion).0 - True - True - True - True + ..\..\Apollo.snk enable 10.0 enable True $(NoWarn);CS0414;CS0436;CS1591 - icon.png - apollo configcenter configuration ctripicon.png - git - https://github.com/apolloconfig/apollo.net/tree/main true @@ -29,13 +19,4 @@ - - - - - - - - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 2dfea17..b7f3718 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,9 @@  - - $(RepositoryUrl)/$(MSBuildProjectName) - + + + + + diff --git a/Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj b/demo/Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj similarity index 93% rename from Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj rename to demo/Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj index 6010b48..ffeed0b 100644 --- a/Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj +++ b/demo/Apollo.AspNet.Demo/Apollo.AspNet.Demo.csproj @@ -61,19 +61,19 @@ - + {da39fff7-0fc5-4f5b-8224-aa8e3026bbc0} Apollo.ConfigAdapter.Yaml - + {ce700879-20dd-4fae-b431-884802b99a2d} Apollo.ConfigurationManager - + {5ae563bf-2e6f-4096-a324-7a5a72b2cbac} Apollo.Configuration - + {b231a39e-9d8a-4f63-9dff-4fb7b5a900ab} Apollo diff --git a/Apollo.AspNet.Demo/Global.asax b/demo/Apollo.AspNet.Demo/Global.asax similarity index 100% rename from Apollo.AspNet.Demo/Global.asax rename to demo/Apollo.AspNet.Demo/Global.asax diff --git a/Apollo.AspNet.Demo/Global.asax.cs b/demo/Apollo.AspNet.Demo/Global.asax.cs similarity index 100% rename from Apollo.AspNet.Demo/Global.asax.cs rename to demo/Apollo.AspNet.Demo/Global.asax.cs diff --git a/Apollo.AspNet.Demo/Startup.cs b/demo/Apollo.AspNet.Demo/Startup.cs similarity index 100% rename from Apollo.AspNet.Demo/Startup.cs rename to demo/Apollo.AspNet.Demo/Startup.cs diff --git a/Apollo.AspNet.Demo/Web.config b/demo/Apollo.AspNet.Demo/Web.config similarity index 100% rename from Apollo.AspNet.Demo/Web.config rename to demo/Apollo.AspNet.Demo/Web.config diff --git a/demo/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj b/demo/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj new file mode 100644 index 0000000..8be66fd --- /dev/null +++ b/demo/Apollo.AspNetCore.Demo/Apollo.AspNetCore.Demo.csproj @@ -0,0 +1,12 @@ + + + + net6.0 + + + + + + + + diff --git a/Apollo.AspNetCore.Demo/Program.cs b/demo/Apollo.AspNetCore.Demo/Program.cs similarity index 100% rename from Apollo.AspNetCore.Demo/Program.cs rename to demo/Apollo.AspNetCore.Demo/Program.cs diff --git a/Apollo.AspNetCore.Demo/Properties/launchSettings.json b/demo/Apollo.AspNetCore.Demo/Properties/launchSettings.json similarity index 100% rename from Apollo.AspNetCore.Demo/Properties/launchSettings.json rename to demo/Apollo.AspNetCore.Demo/Properties/launchSettings.json diff --git a/Apollo.AspNetCore.Demo/Startup.cs b/demo/Apollo.AspNetCore.Demo/Startup.cs similarity index 100% rename from Apollo.AspNetCore.Demo/Startup.cs rename to demo/Apollo.AspNetCore.Demo/Startup.cs diff --git a/demo/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj b/demo/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj new file mode 100644 index 0000000..762baef --- /dev/null +++ b/demo/Apollo.Configuration.Demo/Apollo.Configuration.Demo.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp3.1 + Exe + + + + + + + + + + + diff --git a/Apollo.Configuration.Demo/ConfigurationDemo.cs b/demo/Apollo.Configuration.Demo/ConfigurationDemo.cs similarity index 100% rename from Apollo.Configuration.Demo/ConfigurationDemo.cs rename to demo/Apollo.Configuration.Demo/ConfigurationDemo.cs diff --git a/Apollo.Configuration.Demo/Program.cs b/demo/Apollo.Configuration.Demo/Program.cs similarity index 100% rename from Apollo.Configuration.Demo/Program.cs rename to demo/Apollo.Configuration.Demo/Program.cs diff --git a/Apollo.Configuration.Demo/Properties/launchSettings.json b/demo/Apollo.Configuration.Demo/Properties/launchSettings.json similarity index 100% rename from Apollo.Configuration.Demo/Properties/launchSettings.json rename to demo/Apollo.Configuration.Demo/Properties/launchSettings.json diff --git a/Apollo.Configuration.Demo/appsettings.Development.json b/demo/Apollo.Configuration.Demo/appsettings.Development.json similarity index 100% rename from Apollo.Configuration.Demo/appsettings.Development.json rename to demo/Apollo.Configuration.Demo/appsettings.Development.json diff --git a/Apollo.Configuration.Demo/appsettings.json b/demo/Apollo.Configuration.Demo/appsettings.json similarity index 100% rename from Apollo.Configuration.Demo/appsettings.json rename to demo/Apollo.Configuration.Demo/appsettings.json diff --git a/demo/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj b/demo/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj new file mode 100644 index 0000000..11b78d1 --- /dev/null +++ b/demo/Apollo.ConfigurationManager.Demo/Apollo.ConfigurationManager.Demo.csproj @@ -0,0 +1,14 @@ + + + + net45 + Exe + + + + + + + + + diff --git a/Apollo.ConfigurationManager.Demo/ConfigurationManagerDemo.cs b/demo/Apollo.ConfigurationManager.Demo/ConfigurationManagerDemo.cs similarity index 100% rename from Apollo.ConfigurationManager.Demo/ConfigurationManagerDemo.cs rename to demo/Apollo.ConfigurationManager.Demo/ConfigurationManagerDemo.cs diff --git a/Apollo.ConfigurationManager.Demo/Program.cs b/demo/Apollo.ConfigurationManager.Demo/Program.cs similarity index 100% rename from Apollo.ConfigurationManager.Demo/Program.cs rename to demo/Apollo.ConfigurationManager.Demo/Program.cs diff --git a/Apollo.ConfigurationManager.Demo/Properties/launchSettings.json b/demo/Apollo.ConfigurationManager.Demo/Properties/launchSettings.json similarity index 100% rename from Apollo.ConfigurationManager.Demo/Properties/launchSettings.json rename to demo/Apollo.ConfigurationManager.Demo/Properties/launchSettings.json diff --git a/Apollo.AspNetCoreHosting/Apollo.AspNetCoreHosting.csproj b/src/Apollo.AspNetCoreHosting/Apollo.AspNetCoreHosting.csproj similarity index 100% rename from Apollo.AspNetCoreHosting/Apollo.AspNetCoreHosting.csproj rename to src/Apollo.AspNetCoreHosting/Apollo.AspNetCoreHosting.csproj diff --git a/Apollo.ConfigAdapter.Yaml/Apollo.ConfigAdapter.Yaml.csproj b/src/Apollo.ConfigAdapter.Yaml/Apollo.ConfigAdapter.Yaml.csproj similarity index 100% rename from Apollo.ConfigAdapter.Yaml/Apollo.ConfigAdapter.Yaml.csproj rename to src/Apollo.ConfigAdapter.Yaml/Apollo.ConfigAdapter.Yaml.csproj diff --git a/Apollo.ConfigAdapter.Yaml/YamlConfigAdapter.cs b/src/Apollo.ConfigAdapter.Yaml/YamlConfigAdapter.cs similarity index 100% rename from Apollo.ConfigAdapter.Yaml/YamlConfigAdapter.cs rename to src/Apollo.ConfigAdapter.Yaml/YamlConfigAdapter.cs diff --git a/Apollo.ConfigAdapter.Yaml/YamlConfigurationFileParser.cs b/src/Apollo.ConfigAdapter.Yaml/YamlConfigurationFileParser.cs similarity index 100% rename from Apollo.ConfigAdapter.Yaml/YamlConfigurationFileParser.cs rename to src/Apollo.ConfigAdapter.Yaml/YamlConfigurationFileParser.cs diff --git a/Apollo.Configuration/Apollo.Configuration.csproj b/src/Apollo.Configuration/Apollo.Configuration.csproj similarity index 100% rename from Apollo.Configuration/Apollo.Configuration.csproj rename to src/Apollo.Configuration/Apollo.Configuration.csproj diff --git a/Apollo.Configuration/ApolloConfigurationBuilder.cs b/src/Apollo.Configuration/ApolloConfigurationBuilder.cs similarity index 100% rename from Apollo.Configuration/ApolloConfigurationBuilder.cs rename to src/Apollo.Configuration/ApolloConfigurationBuilder.cs diff --git a/Apollo.Configuration/ApolloConfigurationExtensions.cs b/src/Apollo.Configuration/ApolloConfigurationExtensions.cs similarity index 100% rename from Apollo.Configuration/ApolloConfigurationExtensions.cs rename to src/Apollo.Configuration/ApolloConfigurationExtensions.cs diff --git a/Apollo.Configuration/ApolloConfigurationManager.cs b/src/Apollo.Configuration/ApolloConfigurationManager.cs similarity index 100% rename from Apollo.Configuration/ApolloConfigurationManager.cs rename to src/Apollo.Configuration/ApolloConfigurationManager.cs diff --git a/Apollo.Configuration/ApolloConfigurationProvider.cs b/src/Apollo.Configuration/ApolloConfigurationProvider.cs similarity index 100% rename from Apollo.Configuration/ApolloConfigurationProvider.cs rename to src/Apollo.Configuration/ApolloConfigurationProvider.cs diff --git a/Apollo.Configuration/ApolloOptions.cs b/src/Apollo.Configuration/ApolloOptions.cs similarity index 100% rename from Apollo.Configuration/ApolloOptions.cs rename to src/Apollo.Configuration/ApolloOptions.cs diff --git a/Apollo.Configuration/Logging/MelLogging.cs b/src/Apollo.Configuration/Logging/MelLogging.cs similarity index 100% rename from Apollo.Configuration/Logging/MelLogging.cs rename to src/Apollo.Configuration/Logging/MelLogging.cs diff --git a/Apollo.Configuration/README.md b/src/Apollo.Configuration/README.md similarity index 100% rename from Apollo.Configuration/README.md rename to src/Apollo.Configuration/README.md diff --git a/Apollo.ConfigurationManager/Apollo.ConfigurationManager.csproj b/src/Apollo.ConfigurationManager/Apollo.ConfigurationManager.csproj similarity index 100% rename from Apollo.ConfigurationManager/Apollo.ConfigurationManager.csproj rename to src/Apollo.ConfigurationManager/Apollo.ConfigurationManager.csproj diff --git a/Apollo.ConfigurationManager/ApolloConfigurationBuilder.cs b/src/Apollo.ConfigurationManager/ApolloConfigurationBuilder.cs similarity index 100% rename from Apollo.ConfigurationManager/ApolloConfigurationBuilder.cs rename to src/Apollo.ConfigurationManager/ApolloConfigurationBuilder.cs diff --git a/Apollo.ConfigurationManager/ApolloConfigurationManager.cs b/src/Apollo.ConfigurationManager/ApolloConfigurationManager.cs similarity index 100% rename from Apollo.ConfigurationManager/ApolloConfigurationManager.cs rename to src/Apollo.ConfigurationManager/ApolloConfigurationManager.cs diff --git a/Apollo.ConfigurationManager/AppSettingsSectionBuilder.cs b/src/Apollo.ConfigurationManager/AppSettingsSectionBuilder.cs similarity index 100% rename from Apollo.ConfigurationManager/AppSettingsSectionBuilder.cs rename to src/Apollo.ConfigurationManager/AppSettingsSectionBuilder.cs diff --git a/Apollo.ConfigurationManager/Com.Ctrip.Framework.Apollo.ConfigurationManager.props b/src/Apollo.ConfigurationManager/Com.Ctrip.Framework.Apollo.ConfigurationManager.props similarity index 100% rename from Apollo.ConfigurationManager/Com.Ctrip.Framework.Apollo.ConfigurationManager.props rename to src/Apollo.ConfigurationManager/Com.Ctrip.Framework.Apollo.ConfigurationManager.props diff --git a/Apollo.ConfigurationManager/CommonSectionBuilder.cs b/src/Apollo.ConfigurationManager/CommonSectionBuilder.cs similarity index 100% rename from Apollo.ConfigurationManager/CommonSectionBuilder.cs rename to src/Apollo.ConfigurationManager/CommonSectionBuilder.cs diff --git a/Apollo.ConfigurationManager/ConfigExtensions.cs b/src/Apollo.ConfigurationManager/ConfigExtensions.cs similarity index 100% rename from Apollo.ConfigurationManager/ConfigExtensions.cs rename to src/Apollo.ConfigurationManager/ConfigExtensions.cs diff --git a/Apollo.ConfigurationManager/ConnectionStringsSectionBuilder.cs b/src/Apollo.ConfigurationManager/ConnectionStringsSectionBuilder.cs similarity index 100% rename from Apollo.ConfigurationManager/ConnectionStringsSectionBuilder.cs rename to src/Apollo.ConfigurationManager/ConnectionStringsSectionBuilder.cs diff --git a/Apollo.ConfigurationManager/Core/MetaDomainHelper.cs b/src/Apollo.ConfigurationManager/Core/MetaDomainHelper.cs similarity index 100% rename from Apollo.ConfigurationManager/Core/MetaDomainHelper.cs rename to src/Apollo.ConfigurationManager/Core/MetaDomainHelper.cs diff --git a/Apollo.ConfigurationManager/NodeReplaceSectionBuilder.cs b/src/Apollo.ConfigurationManager/NodeReplaceSectionBuilder.cs similarity index 100% rename from Apollo.ConfigurationManager/NodeReplaceSectionBuilder.cs rename to src/Apollo.ConfigurationManager/NodeReplaceSectionBuilder.cs diff --git a/Apollo.ConfigurationManager/PlaceholderConfig.cs b/src/Apollo.ConfigurationManager/PlaceholderConfig.cs similarity index 100% rename from Apollo.ConfigurationManager/PlaceholderConfig.cs rename to src/Apollo.ConfigurationManager/PlaceholderConfig.cs diff --git a/Apollo.ConfigurationManager/PropertyPlaceholderHelper.cs b/src/Apollo.ConfigurationManager/PropertyPlaceholderHelper.cs similarity index 100% rename from Apollo.ConfigurationManager/PropertyPlaceholderHelper.cs rename to src/Apollo.ConfigurationManager/PropertyPlaceholderHelper.cs diff --git a/Apollo.ConfigurationManager/README.md b/src/Apollo.ConfigurationManager/README.md similarity index 100% rename from Apollo.ConfigurationManager/README.md rename to src/Apollo.ConfigurationManager/README.md diff --git a/Apollo.ConfigurationManager/Util/ConfigUtil.cs b/src/Apollo.ConfigurationManager/Util/ConfigUtil.cs similarity index 100% rename from Apollo.ConfigurationManager/Util/ConfigUtil.cs rename to src/Apollo.ConfigurationManager/Util/ConfigUtil.cs diff --git a/Apollo.ExtensionsHosting/Apollo.ExtensionsHosting.csproj b/src/Apollo.ExtensionsHosting/Apollo.ExtensionsHosting.csproj similarity index 100% rename from Apollo.ExtensionsHosting/Apollo.ExtensionsHosting.csproj rename to src/Apollo.ExtensionsHosting/Apollo.ExtensionsHosting.csproj diff --git a/Apollo.ExtensionsHosting/HostingBuilderExtensions.cs b/src/Apollo.ExtensionsHosting/HostingBuilderExtensions.cs similarity index 100% rename from Apollo.ExtensionsHosting/HostingBuilderExtensions.cs rename to src/Apollo.ExtensionsHosting/HostingBuilderExtensions.cs diff --git a/Apollo.OpenApi.DependencyInjection/Apollo.OpenApi.DependencyInjection.csproj b/src/Apollo.OpenApi.DependencyInjection/Apollo.OpenApi.DependencyInjection.csproj similarity index 100% rename from Apollo.OpenApi.DependencyInjection/Apollo.OpenApi.DependencyInjection.csproj rename to src/Apollo.OpenApi.DependencyInjection/Apollo.OpenApi.DependencyInjection.csproj diff --git a/Apollo.OpenApi.DependencyInjection/ServiceCollectionExtensions.cs b/src/Apollo.OpenApi.DependencyInjection/ServiceCollectionExtensions.cs similarity index 100% rename from Apollo.OpenApi.DependencyInjection/ServiceCollectionExtensions.cs rename to src/Apollo.OpenApi.DependencyInjection/ServiceCollectionExtensions.cs diff --git a/Apollo.OpenApi/Apollo.OpenApi.csproj b/src/Apollo.OpenApi/Apollo.OpenApi.csproj similarity index 100% rename from Apollo.OpenApi/Apollo.OpenApi.csproj rename to src/Apollo.OpenApi/Apollo.OpenApi.csproj diff --git a/Apollo.OpenApi/ApolloOpenApiException.cs b/src/Apollo.OpenApi/ApolloOpenApiException.cs similarity index 100% rename from Apollo.OpenApi/ApolloOpenApiException.cs rename to src/Apollo.OpenApi/ApolloOpenApiException.cs diff --git a/Apollo.OpenApi/AppClusterClient.cs b/src/Apollo.OpenApi/AppClusterClient.cs similarity index 100% rename from Apollo.OpenApi/AppClusterClient.cs rename to src/Apollo.OpenApi/AppClusterClient.cs diff --git a/Apollo.OpenApi/AppClusterClientExtensions.cs b/src/Apollo.OpenApi/AppClusterClientExtensions.cs similarity index 100% rename from Apollo.OpenApi/AppClusterClientExtensions.cs rename to src/Apollo.OpenApi/AppClusterClientExtensions.cs diff --git a/Apollo.OpenApi/IAppClusterClient.cs b/src/Apollo.OpenApi/IAppClusterClient.cs similarity index 100% rename from Apollo.OpenApi/IAppClusterClient.cs rename to src/Apollo.OpenApi/IAppClusterClient.cs diff --git a/Apollo.OpenApi/INamespaceClient.cs b/src/Apollo.OpenApi/INamespaceClient.cs similarity index 100% rename from Apollo.OpenApi/INamespaceClient.cs rename to src/Apollo.OpenApi/INamespaceClient.cs diff --git a/Apollo.OpenApi/IOpenApiClient.cs b/src/Apollo.OpenApi/IOpenApiClient.cs similarity index 100% rename from Apollo.OpenApi/IOpenApiClient.cs rename to src/Apollo.OpenApi/IOpenApiClient.cs diff --git a/Apollo.OpenApi/IOpenApiFactory.cs b/src/Apollo.OpenApi/IOpenApiFactory.cs similarity index 100% rename from Apollo.OpenApi/IOpenApiFactory.cs rename to src/Apollo.OpenApi/IOpenApiFactory.cs diff --git a/Apollo.OpenApi/Model/AppInfo.cs b/src/Apollo.OpenApi/Model/AppInfo.cs similarity index 100% rename from Apollo.OpenApi/Model/AppInfo.cs rename to src/Apollo.OpenApi/Model/AppInfo.cs diff --git a/Apollo.OpenApi/Model/AppNamespace.cs b/src/Apollo.OpenApi/Model/AppNamespace.cs similarity index 100% rename from Apollo.OpenApi/Model/AppNamespace.cs rename to src/Apollo.OpenApi/Model/AppNamespace.cs diff --git a/Apollo.OpenApi/Model/BaseModel.cs b/src/Apollo.OpenApi/Model/BaseModel.cs similarity index 100% rename from Apollo.OpenApi/Model/BaseModel.cs rename to src/Apollo.OpenApi/Model/BaseModel.cs diff --git a/Apollo.OpenApi/Model/Cluster.cs b/src/Apollo.OpenApi/Model/Cluster.cs similarity index 100% rename from Apollo.OpenApi/Model/Cluster.cs rename to src/Apollo.OpenApi/Model/Cluster.cs diff --git a/Apollo.OpenApi/Model/EnvCluster.cs b/src/Apollo.OpenApi/Model/EnvCluster.cs similarity index 100% rename from Apollo.OpenApi/Model/EnvCluster.cs rename to src/Apollo.OpenApi/Model/EnvCluster.cs diff --git a/Apollo.OpenApi/Model/Item.cs b/src/Apollo.OpenApi/Model/Item.cs similarity index 100% rename from Apollo.OpenApi/Model/Item.cs rename to src/Apollo.OpenApi/Model/Item.cs diff --git a/Apollo.OpenApi/Model/Namespace.cs b/src/Apollo.OpenApi/Model/Namespace.cs similarity index 100% rename from Apollo.OpenApi/Model/Namespace.cs rename to src/Apollo.OpenApi/Model/Namespace.cs diff --git a/Apollo.OpenApi/Model/NamespaceLock.cs b/src/Apollo.OpenApi/Model/NamespaceLock.cs similarity index 100% rename from Apollo.OpenApi/Model/NamespaceLock.cs rename to src/Apollo.OpenApi/Model/NamespaceLock.cs diff --git a/Apollo.OpenApi/Model/NamespaceRelease.cs b/src/Apollo.OpenApi/Model/NamespaceRelease.cs similarity index 100% rename from Apollo.OpenApi/Model/NamespaceRelease.cs rename to src/Apollo.OpenApi/Model/NamespaceRelease.cs diff --git a/Apollo.OpenApi/Model/Release.cs b/src/Apollo.OpenApi/Model/Release.cs similarity index 100% rename from Apollo.OpenApi/Model/Release.cs rename to src/Apollo.OpenApi/Model/Release.cs diff --git a/Apollo.OpenApi/NamespaceClient.cs b/src/Apollo.OpenApi/NamespaceClient.cs similarity index 100% rename from Apollo.OpenApi/NamespaceClient.cs rename to src/Apollo.OpenApi/NamespaceClient.cs diff --git a/Apollo.OpenApi/NamespaceClientExtensions.cs b/src/Apollo.OpenApi/NamespaceClientExtensions.cs similarity index 100% rename from Apollo.OpenApi/NamespaceClientExtensions.cs rename to src/Apollo.OpenApi/NamespaceClientExtensions.cs diff --git a/Apollo.OpenApi/OpenApiClient.cs b/src/Apollo.OpenApi/OpenApiClient.cs similarity index 100% rename from Apollo.OpenApi/OpenApiClient.cs rename to src/Apollo.OpenApi/OpenApiClient.cs diff --git a/Apollo.OpenApi/OpenApiClientExtensions.cs b/src/Apollo.OpenApi/OpenApiClientExtensions.cs similarity index 100% rename from Apollo.OpenApi/OpenApiClientExtensions.cs rename to src/Apollo.OpenApi/OpenApiClientExtensions.cs diff --git a/Apollo.OpenApi/OpenApiFactory.cs b/src/Apollo.OpenApi/OpenApiFactory.cs similarity index 100% rename from Apollo.OpenApi/OpenApiFactory.cs rename to src/Apollo.OpenApi/OpenApiFactory.cs diff --git a/Apollo.OpenApi/OpenApiOptions.cs b/src/Apollo.OpenApi/OpenApiOptions.cs similarity index 100% rename from Apollo.OpenApi/OpenApiOptions.cs rename to src/Apollo.OpenApi/OpenApiOptions.cs diff --git a/Apollo.OpenApi/README.md b/src/Apollo.OpenApi/README.md similarity index 100% rename from Apollo.OpenApi/README.md rename to src/Apollo.OpenApi/README.md diff --git a/Apollo/Apollo.csproj b/src/Apollo/Apollo.csproj similarity index 100% rename from Apollo/Apollo.csproj rename to src/Apollo/Apollo.csproj diff --git a/Apollo/CacheFileProvider.cs b/src/Apollo/CacheFileProvider.cs similarity index 100% rename from Apollo/CacheFileProvider.cs rename to src/Apollo/CacheFileProvider.cs diff --git a/Apollo/ConfigAdapter/ConfigurationPath.cs b/src/Apollo/ConfigAdapter/ConfigurationPath.cs similarity index 100% rename from Apollo/ConfigAdapter/ConfigurationPath.cs rename to src/Apollo/ConfigAdapter/ConfigurationPath.cs diff --git a/Apollo/ConfigAdapter/JsonConfigAdapter.cs b/src/Apollo/ConfigAdapter/JsonConfigAdapter.cs similarity index 100% rename from Apollo/ConfigAdapter/JsonConfigAdapter.cs rename to src/Apollo/ConfigAdapter/JsonConfigAdapter.cs diff --git a/Apollo/ConfigAdapter/JsonConfigurationParser.cs b/src/Apollo/ConfigAdapter/JsonConfigurationParser.cs similarity index 100% rename from Apollo/ConfigAdapter/JsonConfigurationParser.cs rename to src/Apollo/ConfigAdapter/JsonConfigurationParser.cs diff --git a/Apollo/ConfigAdapter/XmlConfigAdapter .cs b/src/Apollo/ConfigAdapter/XmlConfigAdapter .cs similarity index 100% rename from Apollo/ConfigAdapter/XmlConfigAdapter .cs rename to src/Apollo/ConfigAdapter/XmlConfigAdapter .cs diff --git a/Apollo/ConfigAdapter/XmlConfigurationParser.cs b/src/Apollo/ConfigAdapter/XmlConfigurationParser.cs similarity index 100% rename from Apollo/ConfigAdapter/XmlConfigurationParser.cs rename to src/Apollo/ConfigAdapter/XmlConfigurationParser.cs diff --git a/Apollo/ConfigExtensions.cs b/src/Apollo/ConfigExtensions.cs similarity index 100% rename from Apollo/ConfigExtensions.cs rename to src/Apollo/ConfigExtensions.cs diff --git a/Apollo/ConfigExtensions.generated.cs b/src/Apollo/ConfigExtensions.generated.cs similarity index 100% rename from Apollo/ConfigExtensions.generated.cs rename to src/Apollo/ConfigExtensions.generated.cs diff --git a/Apollo/ConfigExtensions.tt b/src/Apollo/ConfigExtensions.tt similarity index 100% rename from Apollo/ConfigExtensions.tt rename to src/Apollo/ConfigExtensions.tt diff --git a/Apollo/Core/ConfigConsts.cs b/src/Apollo/Core/ConfigConsts.cs similarity index 100% rename from Apollo/Core/ConfigConsts.cs rename to src/Apollo/Core/ConfigConsts.cs diff --git a/Apollo/Core/Dto/ApolloConfig.cs b/src/Apollo/Core/Dto/ApolloConfig.cs similarity index 100% rename from Apollo/Core/Dto/ApolloConfig.cs rename to src/Apollo/Core/Dto/ApolloConfig.cs diff --git a/Apollo/Core/Dto/ApolloConfigNotification.cs b/src/Apollo/Core/Dto/ApolloConfigNotification.cs similarity index 100% rename from Apollo/Core/Dto/ApolloConfigNotification.cs rename to src/Apollo/Core/Dto/ApolloConfigNotification.cs diff --git a/Apollo/Core/Dto/ApolloNotificationMessages.cs b/src/Apollo/Core/Dto/ApolloNotificationMessages.cs similarity index 100% rename from Apollo/Core/Dto/ApolloNotificationMessages.cs rename to src/Apollo/Core/Dto/ApolloNotificationMessages.cs diff --git a/Apollo/Core/Dto/ServiceDTO.cs b/src/Apollo/Core/Dto/ServiceDTO.cs similarity index 100% rename from Apollo/Core/Dto/ServiceDTO.cs rename to src/Apollo/Core/Dto/ServiceDTO.cs diff --git a/Apollo/Core/Schedule/ExponentialSchedulePolicy.cs b/src/Apollo/Core/Schedule/ExponentialSchedulePolicy.cs similarity index 100% rename from Apollo/Core/Schedule/ExponentialSchedulePolicy.cs rename to src/Apollo/Core/Schedule/ExponentialSchedulePolicy.cs diff --git a/Apollo/Core/Schedule/SchedulePolicy.cs b/src/Apollo/Core/Schedule/SchedulePolicy.cs similarity index 100% rename from Apollo/Core/Schedule/SchedulePolicy.cs rename to src/Apollo/Core/Schedule/SchedulePolicy.cs diff --git a/Apollo/Core/Utils/LimitedConcurrencyLevelTaskScheduler.cs b/src/Apollo/Core/Utils/LimitedConcurrencyLevelTaskScheduler.cs similarity index 100% rename from Apollo/Core/Utils/LimitedConcurrencyLevelTaskScheduler.cs rename to src/Apollo/Core/Utils/LimitedConcurrencyLevelTaskScheduler.cs diff --git a/Apollo/Core/Utils/Properties.cs b/src/Apollo/Core/Utils/Properties.cs similarity index 100% rename from Apollo/Core/Utils/Properties.cs rename to src/Apollo/Core/Utils/Properties.cs diff --git a/Apollo/Enums/ConfigFileFormat.cs b/src/Apollo/Enums/ConfigFileFormat.cs similarity index 100% rename from Apollo/Enums/ConfigFileFormat.cs rename to src/Apollo/Enums/ConfigFileFormat.cs diff --git a/Apollo/Enums/Env.cs b/src/Apollo/Enums/Env.cs similarity index 100% rename from Apollo/Enums/Env.cs rename to src/Apollo/Enums/Env.cs diff --git a/Apollo/Enums/PropertyChangeType.cs b/src/Apollo/Enums/PropertyChangeType.cs similarity index 100% rename from Apollo/Enums/PropertyChangeType.cs rename to src/Apollo/Enums/PropertyChangeType.cs diff --git a/Apollo/Exceptions/ApolloConfigException.cs b/src/Apollo/Exceptions/ApolloConfigException.cs similarity index 100% rename from Apollo/Exceptions/ApolloConfigException.cs rename to src/Apollo/Exceptions/ApolloConfigException.cs diff --git a/Apollo/Exceptions/ApolloConfigStatusCodeException.cs b/src/Apollo/Exceptions/ApolloConfigStatusCodeException.cs similarity index 100% rename from Apollo/Exceptions/ApolloConfigStatusCodeException.cs rename to src/Apollo/Exceptions/ApolloConfigStatusCodeException.cs diff --git a/Apollo/Foundation/NetworkInterfaceManager.cs b/src/Apollo/Foundation/NetworkInterfaceManager.cs similarity index 100% rename from Apollo/Foundation/NetworkInterfaceManager.cs rename to src/Apollo/Foundation/NetworkInterfaceManager.cs diff --git a/Apollo/IApolloOptions.cs b/src/Apollo/IApolloOptions.cs similarity index 100% rename from Apollo/IApolloOptions.cs rename to src/Apollo/IApolloOptions.cs diff --git a/Apollo/IConfig.cs b/src/Apollo/IConfig.cs similarity index 100% rename from Apollo/IConfig.cs rename to src/Apollo/IConfig.cs diff --git a/Apollo/IConfigAdapter.cs b/src/Apollo/IConfigAdapter.cs similarity index 100% rename from Apollo/IConfigAdapter.cs rename to src/Apollo/IConfigAdapter.cs diff --git a/Apollo/Internals/AbstractConfig.cs b/src/Apollo/Internals/AbstractConfig.cs similarity index 100% rename from Apollo/Internals/AbstractConfig.cs rename to src/Apollo/Internals/AbstractConfig.cs diff --git a/Apollo/Internals/AbstractConfigRepository.cs b/src/Apollo/Internals/AbstractConfigRepository.cs similarity index 100% rename from Apollo/Internals/AbstractConfigRepository.cs rename to src/Apollo/Internals/AbstractConfigRepository.cs diff --git a/Apollo/Internals/ConfigManager.cs b/src/Apollo/Internals/ConfigManager.cs similarity index 100% rename from Apollo/Internals/ConfigManager.cs rename to src/Apollo/Internals/ConfigManager.cs diff --git a/Apollo/Internals/ConfigRepositoryFactory.cs b/src/Apollo/Internals/ConfigRepositoryFactory.cs similarity index 100% rename from Apollo/Internals/ConfigRepositoryFactory.cs rename to src/Apollo/Internals/ConfigRepositoryFactory.cs diff --git a/Apollo/Internals/ConfigServiceLocator.cs b/src/Apollo/Internals/ConfigServiceLocator.cs similarity index 100% rename from Apollo/Internals/ConfigServiceLocator.cs rename to src/Apollo/Internals/ConfigServiceLocator.cs diff --git a/Apollo/Internals/DefaultConfig.cs b/src/Apollo/Internals/DefaultConfig.cs similarity index 100% rename from Apollo/Internals/DefaultConfig.cs rename to src/Apollo/Internals/DefaultConfig.cs diff --git a/Apollo/Internals/DefaultConfigManager.cs b/src/Apollo/Internals/DefaultConfigManager.cs similarity index 100% rename from Apollo/Internals/DefaultConfigManager.cs rename to src/Apollo/Internals/DefaultConfigManager.cs diff --git a/Apollo/Internals/IConfigRepository.cs b/src/Apollo/Internals/IConfigRepository.cs similarity index 100% rename from Apollo/Internals/IConfigRepository.cs rename to src/Apollo/Internals/IConfigRepository.cs diff --git a/Apollo/Internals/IConfigRepositoryFactory.cs b/src/Apollo/Internals/IConfigRepositoryFactory.cs similarity index 100% rename from Apollo/Internals/IConfigRepositoryFactory.cs rename to src/Apollo/Internals/IConfigRepositoryFactory.cs diff --git a/Apollo/Internals/LocalFileConfigRepository.cs b/src/Apollo/Internals/LocalFileConfigRepository.cs similarity index 100% rename from Apollo/Internals/LocalFileConfigRepository.cs rename to src/Apollo/Internals/LocalFileConfigRepository.cs diff --git a/Apollo/Internals/MultiConfig.cs b/src/Apollo/Internals/MultiConfig.cs similarity index 100% rename from Apollo/Internals/MultiConfig.cs rename to src/Apollo/Internals/MultiConfig.cs diff --git a/Apollo/Internals/RemoteConfigLongPollService.cs b/src/Apollo/Internals/RemoteConfigLongPollService.cs similarity index 100% rename from Apollo/Internals/RemoteConfigLongPollService.cs rename to src/Apollo/Internals/RemoteConfigLongPollService.cs diff --git a/Apollo/Internals/RemoteConfigRepository.cs b/src/Apollo/Internals/RemoteConfigRepository.cs similarity index 100% rename from Apollo/Internals/RemoteConfigRepository.cs rename to src/Apollo/Internals/RemoteConfigRepository.cs diff --git a/Apollo/Internals/RepositoryChangeListener.cs b/src/Apollo/Internals/RepositoryChangeListener.cs similarity index 100% rename from Apollo/Internals/RepositoryChangeListener.cs rename to src/Apollo/Internals/RepositoryChangeListener.cs diff --git a/Apollo/Logging/LogLevel.cs b/src/Apollo/Logging/LogLevel.cs similarity index 100% rename from Apollo/Logging/LogLevel.cs rename to src/Apollo/Logging/LogLevel.cs diff --git a/Apollo/Logging/LogManager.cs b/src/Apollo/Logging/LogManager.cs similarity index 100% rename from Apollo/Logging/LogManager.cs rename to src/Apollo/Logging/LogManager.cs diff --git a/Apollo/Model/ConfigChange.cs b/src/Apollo/Model/ConfigChange.cs similarity index 100% rename from Apollo/Model/ConfigChange.cs rename to src/Apollo/Model/ConfigChange.cs diff --git a/Apollo/Model/ConfigChangeEventArgs.cs b/src/Apollo/Model/ConfigChangeEventArgs.cs similarity index 100% rename from Apollo/Model/ConfigChangeEventArgs.cs rename to src/Apollo/Model/ConfigChangeEventArgs.cs diff --git a/Apollo/Resources.Designer.cs b/src/Apollo/Resources.Designer.cs similarity index 100% rename from Apollo/Resources.Designer.cs rename to src/Apollo/Resources.Designer.cs diff --git a/Apollo/Resources.resx b/src/Apollo/Resources.resx similarity index 100% rename from Apollo/Resources.resx rename to src/Apollo/Resources.resx diff --git a/Apollo/Spi/ConfigFactory.cs b/src/Apollo/Spi/ConfigFactory.cs similarity index 100% rename from Apollo/Spi/ConfigFactory.cs rename to src/Apollo/Spi/ConfigFactory.cs diff --git a/Apollo/Spi/ConfigRegistry.cs b/src/Apollo/Spi/ConfigRegistry.cs similarity index 100% rename from Apollo/Spi/ConfigRegistry.cs rename to src/Apollo/Spi/ConfigRegistry.cs diff --git a/Apollo/Spi/DefaultConfigFactory.cs b/src/Apollo/Spi/DefaultConfigFactory.cs similarity index 100% rename from Apollo/Spi/DefaultConfigFactory.cs rename to src/Apollo/Spi/DefaultConfigFactory.cs diff --git a/Apollo/Spi/DefaultConfigRegistry.cs b/src/Apollo/Spi/DefaultConfigRegistry.cs similarity index 100% rename from Apollo/Spi/DefaultConfigRegistry.cs rename to src/Apollo/Spi/DefaultConfigRegistry.cs diff --git a/Apollo/Util/ExceptionUtil.cs b/src/Apollo/Util/ExceptionUtil.cs similarity index 100% rename from Apollo/Util/ExceptionUtil.cs rename to src/Apollo/Util/ExceptionUtil.cs diff --git a/Apollo/Util/Http/HttpResponse.cs b/src/Apollo/Util/Http/HttpResponse.cs similarity index 100% rename from Apollo/Util/Http/HttpResponse.cs rename to src/Apollo/Util/Http/HttpResponse.cs diff --git a/Apollo/Util/Http/HttpUtil.cs b/src/Apollo/Util/Http/HttpUtil.cs similarity index 100% rename from Apollo/Util/Http/HttpUtil.cs rename to src/Apollo/Util/Http/HttpUtil.cs diff --git a/Apollo/Util/Http/JsonUtil.cs b/src/Apollo/Util/Http/JsonUtil.cs similarity index 100% rename from Apollo/Util/Http/JsonUtil.cs rename to src/Apollo/Util/Http/JsonUtil.cs diff --git a/Apollo/Util/Http/Signature.cs b/src/Apollo/Util/Http/Signature.cs similarity index 100% rename from Apollo/Util/Http/Signature.cs rename to src/Apollo/Util/Http/Signature.cs diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..27319b9 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,19 @@ + + + + + + 2.9 + $(ApolloVersion).0 + True + True + True + True + icon.png + apollo configcenter configuration ctrip + icon.png + git + https://github.com/apolloconfig/apollo.net/tree/main + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 0000000..21bd3df --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,15 @@ + + + + + + $(RepositoryUrl)/src/$(MSBuildProjectName) + + + + + + + + + diff --git a/PackAllProject.ps1 b/src/PackAllProject.ps1 similarity index 88% rename from PackAllProject.ps1 rename to src/PackAllProject.ps1 index 0c864e1..67a90ff 100644 --- a/PackAllProject.ps1 +++ b/src/PackAllProject.ps1 @@ -1,4 +1,4 @@ -function FindMSBuild () { +function FindMSBuild () { if ($null -eq $env:OS) { try { return (Get-Command msbuild).Source; @@ -34,10 +34,10 @@ foreach ($csproj in (Get-ChildItem -r -filter *.csproj)) { $MSBuild = FindMSBuild if ($null -eq $MSBuild) { - dotnet build -c Release + dotnet build -c Release /p:IsPacking=true .. } else { - & "$MSBuild" /r /m /v:m /p:Configuration=Release + & "$MSBuild" /r /m /v:m /p:Configuration=Release /p:IsPacking=true .. } foreach ($csproj in (Get-ChildItem -r -filter *.csproj)) { @@ -45,7 +45,7 @@ foreach ($csproj in (Get-ChildItem -r -filter *.csproj)) { if (Test-Path $dir) { $nupkg = Get-ChildItem "$([System.IO.Path]::GetDirectoryName($csproj.FullName))\bin\Release" | - Where-Object { $_.Name.Endswith(".symbols.nupkg") } | + Where-Object { $_.Name.Endswith(".nupkg") } | Sort-Object -Property LastWriteTime -Descending | Select-Object -First 1; diff --git a/test/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj b/test/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj new file mode 100644 index 0000000..efa74d0 --- /dev/null +++ b/test/Apollo.ConfigAdapter.Yaml.Tests/Apollo.ConfigAdapter.Yaml.Tests.csproj @@ -0,0 +1,11 @@ + + + + net472;netcoreapp3.1 + + + + + + + diff --git a/Apollo.ConfigAdapter.Yaml.Tests/YamlConfigAdapterTest.cs b/test/Apollo.ConfigAdapter.Yaml.Tests/YamlConfigAdapterTest.cs similarity index 100% rename from Apollo.ConfigAdapter.Yaml.Tests/YamlConfigAdapterTest.cs rename to test/Apollo.ConfigAdapter.Yaml.Tests/YamlConfigAdapterTest.cs diff --git a/test/Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj b/test/Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj new file mode 100644 index 0000000..4dac24d --- /dev/null +++ b/test/Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj @@ -0,0 +1,11 @@ + + + + net472;netcoreapp3.1 + + + + + + + diff --git a/Apollo.Configuration.Tests/ApolloConfigurationBuilderTest.cs b/test/Apollo.Configuration.Tests/ApolloConfigurationBuilderTest.cs similarity index 100% rename from Apollo.Configuration.Tests/ApolloConfigurationBuilderTest.cs rename to test/Apollo.Configuration.Tests/ApolloConfigurationBuilderTest.cs diff --git a/Apollo.Configuration.Tests/ApolloOptionsTest.cs b/test/Apollo.Configuration.Tests/ApolloOptionsTest.cs similarity index 100% rename from Apollo.Configuration.Tests/ApolloOptionsTest.cs rename to test/Apollo.Configuration.Tests/ApolloOptionsTest.cs diff --git a/Apollo.ConfigurationManager.Tests/Apollo.ConfigurationManager.Tests.csproj b/test/Apollo.ConfigurationManager.Tests/Apollo.ConfigurationManager.Tests.csproj similarity index 60% rename from Apollo.ConfigurationManager.Tests/Apollo.ConfigurationManager.Tests.csproj rename to test/Apollo.ConfigurationManager.Tests/Apollo.ConfigurationManager.Tests.csproj index 6e1ca2e..ea56592 100644 --- a/Apollo.ConfigurationManager.Tests/Apollo.ConfigurationManager.Tests.csproj +++ b/test/Apollo.ConfigurationManager.Tests/Apollo.ConfigurationManager.Tests.csproj @@ -2,8 +2,6 @@ net472;netcoreapp3.1 - - false @@ -11,11 +9,7 @@ - - - - - + diff --git a/Apollo.ConfigurationManager.Tests/App.config b/test/Apollo.ConfigurationManager.Tests/App.config similarity index 100% rename from Apollo.ConfigurationManager.Tests/App.config rename to test/Apollo.ConfigurationManager.Tests/App.config diff --git a/Apollo.ConfigurationManager.Tests/ConfigExtensionsTest.cs b/test/Apollo.ConfigurationManager.Tests/ConfigExtensionsTest.cs similarity index 100% rename from Apollo.ConfigurationManager.Tests/ConfigExtensionsTest.cs rename to test/Apollo.ConfigurationManager.Tests/ConfigExtensionsTest.cs diff --git a/Apollo.ConfigurationManager.Tests/ConfigUtilTest.cs b/test/Apollo.ConfigurationManager.Tests/ConfigUtilTest.cs similarity index 100% rename from Apollo.ConfigurationManager.Tests/ConfigUtilTest.cs rename to test/Apollo.ConfigurationManager.Tests/ConfigUtilTest.cs diff --git a/Apollo.ConfigurationManager.Tests/ConfigurationBuilderTest.cs b/test/Apollo.ConfigurationManager.Tests/ConfigurationBuilderTest.cs similarity index 100% rename from Apollo.ConfigurationManager.Tests/ConfigurationBuilderTest.cs rename to test/Apollo.ConfigurationManager.Tests/ConfigurationBuilderTest.cs diff --git a/Apollo.ConfigurationManager.Tests/PropertyPlaceholderHelperTest.cs b/test/Apollo.ConfigurationManager.Tests/PropertyPlaceholderHelperTest.cs similarity index 100% rename from Apollo.ConfigurationManager.Tests/PropertyPlaceholderHelperTest.cs rename to test/Apollo.ConfigurationManager.Tests/PropertyPlaceholderHelperTest.cs diff --git a/Apollo.ConfigurationManager.Tests/TestConfig.cs b/test/Apollo.ConfigurationManager.Tests/TestConfig.cs similarity index 100% rename from Apollo.ConfigurationManager.Tests/TestConfig.cs rename to test/Apollo.ConfigurationManager.Tests/TestConfig.cs diff --git a/Apollo.ConfigurationManager.Tests/TestConfigurationSection.cs b/test/Apollo.ConfigurationManager.Tests/TestConfigurationSection.cs similarity index 100% rename from Apollo.ConfigurationManager.Tests/TestConfigurationSection.cs rename to test/Apollo.ConfigurationManager.Tests/TestConfigurationSection.cs diff --git a/test/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj b/test/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj new file mode 100644 index 0000000..4726fba --- /dev/null +++ b/test/Apollo.OpenApi.Tests/Apollo.OpenApi.Tests.csproj @@ -0,0 +1,13 @@ + + + + net472;netcoreapp3.1 + + + + + + + + + diff --git a/Apollo.OpenApi.Tests/AppClusterTest.cs b/test/Apollo.OpenApi.Tests/AppClusterTest.cs similarity index 100% rename from Apollo.OpenApi.Tests/AppClusterTest.cs rename to test/Apollo.OpenApi.Tests/AppClusterTest.cs diff --git a/Apollo.OpenApi.Tests/BaseTest.cs b/test/Apollo.OpenApi.Tests/BaseTest.cs similarity index 100% rename from Apollo.OpenApi.Tests/BaseTest.cs rename to test/Apollo.OpenApi.Tests/BaseTest.cs diff --git a/Apollo.OpenApi.Tests/NamespaceClientTest.cs b/test/Apollo.OpenApi.Tests/NamespaceClientTest.cs similarity index 100% rename from Apollo.OpenApi.Tests/NamespaceClientTest.cs rename to test/Apollo.OpenApi.Tests/NamespaceClientTest.cs diff --git a/Apollo.OpenApi.Tests/OpenApiFactoryTest.cs b/test/Apollo.OpenApi.Tests/OpenApiFactoryTest.cs similarity index 100% rename from Apollo.OpenApi.Tests/OpenApiFactoryTest.cs rename to test/Apollo.OpenApi.Tests/OpenApiFactoryTest.cs diff --git a/Apollo.Tests/Apollo.Tests.csproj b/test/Apollo.Tests/Apollo.Tests.csproj similarity index 51% rename from Apollo.Tests/Apollo.Tests.csproj rename to test/Apollo.Tests/Apollo.Tests.csproj index 61ee2a4..8002b57 100644 --- a/Apollo.Tests/Apollo.Tests.csproj +++ b/test/Apollo.Tests/Apollo.Tests.csproj @@ -2,19 +2,14 @@ net472;netcoreapp3.1 - - false - - - - + diff --git a/Apollo.Tests/ConfigAdapterTest.cs b/test/Apollo.Tests/ConfigAdapterTest.cs similarity index 100% rename from Apollo.Tests/ConfigAdapterTest.cs rename to test/Apollo.Tests/ConfigAdapterTest.cs diff --git a/Apollo.Tests/ConfigExtensionsTest.cs b/test/Apollo.Tests/ConfigExtensionsTest.cs similarity index 100% rename from Apollo.Tests/ConfigExtensionsTest.cs rename to test/Apollo.Tests/ConfigExtensionsTest.cs diff --git a/Apollo.Tests/ConfigServiceLocatorTest.cs b/test/Apollo.Tests/ConfigServiceLocatorTest.cs similarity index 100% rename from Apollo.Tests/ConfigServiceLocatorTest.cs rename to test/Apollo.Tests/ConfigServiceLocatorTest.cs diff --git a/Apollo.Tests/ConfigTest.cs b/test/Apollo.Tests/ConfigTest.cs similarity index 100% rename from Apollo.Tests/ConfigTest.cs rename to test/Apollo.Tests/ConfigTest.cs diff --git a/Apollo.Tests/LogManagerTest.cs b/test/Apollo.Tests/LogManagerTest.cs similarity index 100% rename from Apollo.Tests/LogManagerTest.cs rename to test/Apollo.Tests/LogManagerTest.cs diff --git a/Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj b/test/Directory.Build.targets similarity index 63% rename from Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj rename to test/Directory.Build.targets index eb68f50..0839afc 100644 --- a/Apollo.Configuration.Tests/Apollo.Configuration.Tests.csproj +++ b/test/Directory.Build.targets @@ -1,8 +1,8 @@ - + - - net472;netcoreapp3.1 + + false @@ -10,8 +10,6 @@ - - From f7b50892f4f2967713f82b6d38ec4c7620d53b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E4=BC=9F?= Date: Mon, 26 Sep 2022 15:13:31 +0800 Subject: [PATCH 2/2] Update --- README.md | 4 ++-- src/Apollo.Configuration/README.md | 6 +++--- src/Apollo.ConfigurationManager/README.md | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 21aebc2..301e1b4 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ # 一、框架集成 -1. 与[Microsoft.Extensions.Configuration](https://docs.microsoft.com/zh-cn/aspnet/core/fundamentals/configuration/)集成请参考[Apollo.Configuration](https://github.com/apolloconfig/apollo.net/blob/main/Apollo.Configuration/README.md)，完全支持IConfiguration的变动通知 -2. 与[System.Configuration.ConfigurationManager](https://docs.microsoft.com/zh-cn/dotnet/api/system.configuration.configurationbuilder)集成(.net 4.7.1及以后版本)或直接使用ApolloConfigurationManager请参考[Apollo.ConfigurationManager](https://github.com/apolloconfig/apollo.net/blob/main/Apollo.ConfigurationManager/README.md) +1. 与[Microsoft.Extensions.Configuration](https://docs.microsoft.com/zh-cn/aspnet/core/fundamentals/configuration/)集成请参考[Apollo.Configuration](https://github.com/apolloconfig/apollo.net/blob/main/src/Apollo.Configuration/README.md)，完全支持IConfiguration的变动通知 +2. 与[System.Configuration.ConfigurationManager](https://docs.microsoft.com/zh-cn/dotnet/api/system.configuration.configurationbuilder)集成(.net 4.7.1及以后版本)或直接使用ApolloConfigurationManager请参考[Apollo.ConfigurationManager](https://github.com/apolloconfig/apollo.net/blob/main/src/Apollo.ConfigurationManager/README.md) 3. 如果想将传统的config配置（如web.config）转成json配置，可以使用[config2json](https://github.com/pengweiqhca/config2json)工具 # 二、日志输出 diff --git a/src/Apollo.Configuration/README.md b/src/Apollo.Configuration/README.md index 29896b0..1f21315 100644 --- a/src/Apollo.Configuration/README.md +++ b/src/Apollo.Configuration/README.md @@ -181,13 +181,13 @@ Apollo支持配置按照集群划分，也就是说对于一个appId和一个环 ## 3.2 监听配置变化事件 -sdk已经完美支持Microsoft.Extensions.Configuration，请参考[IOptionsMonitor](https://docs.microsoft.com/zh-cn/aspnet/core/fundamentals/configuration/options#options-factory-monitoring-and-cache)或者[Demo](https://github.com/apolloconfig/apollo.net/blob/main/Apollo.Configuration.Demo/ConfigurationDemo.cs#L46) +sdk已经完美支持Microsoft.Extensions.Configuration，请参考[IOptionsMonitor](https://docs.microsoft.com/zh-cn/aspnet/core/fundamentals/configuration/options#options-factory-monitoring-and-cache)或者[Demo](https://github.com/apolloconfig/apollo.net/blob/main/demo/Apollo.Configuration.Demo/ConfigurationDemo.cs#L46) ## 3.3 Demo apollo.net项目中有多个样例客户端的项目： -* [Apollo.AspNetCore.Demo](https://github.com/apolloconfig/apollo.net/tree/main/Apollo.AspNetCore.Demo)（使用appsettings.json配置） -* [Apollo.Configuration.Demo](https://github.com/apolloconfig/apollo.net/tree/main/Apollo.Configuration.Demo)（使用环境变量配置） +* [Apollo.AspNetCore.Demo](https://github.com/apolloconfig/apollo.net/tree/main/demo/Apollo.AspNetCore.Demo)（使用appsettings.json配置） +* [Apollo.Configuration.Demo](https://github.com/apolloconfig/apollo.net/tree/main/demo/Apollo.Configuration.Demo)（使用环境变量配置） # 四、FAQ diff --git a/src/Apollo.ConfigurationManager/README.md b/src/Apollo.ConfigurationManager/README.md index 2cff575..f1b1172 100644 --- a/src/Apollo.ConfigurationManager/README.md +++ b/src/Apollo.ConfigurationManager/README.md @@ -129,7 +129,7 @@ Apollo支持配置按照集群划分，也就是说对于一个appId和一个环 1. Apollo.XXX => Apollo:XXX 2. Apollo.{ENV}.Meta => Apollo:Meta:{ENV} -> 优先级低于原来的方式，具体可以参考[Demo](https://github.com/apolloconfig/apollo.net/tree/main/Apollo.ConfigurationManager.Demo)或者[Tests](https://github.com/apolloconfig/apollo.net/tree/main/Apollo.ConfigurationManager.Tests) +> 优先级低于原来的方式，具体可以参考[Demo](https://github.com/apolloconfig/apollo.net/tree/main/src/Apollo.ConfigurationManager.Demo)或者[Tests](https://github.com/apolloconfig/apollo.net/tree/main/test/Apollo.ConfigurationManager.Tests) # 二、引入方式 @@ -193,8 +193,8 @@ string value = config.GetProperty(someKey, someDefaultValue); ## 3.4 Demo apollo.net项目中有多个样例客户端的项目： -* [Apollo.AspNet.Demo](https://github.com/apolloconfig/apollo.net/tree/main/Apollo.AspNet.Demo)（通过Web.config配置） -* [Apollo.ConfigurationManager.Demo](https://github.com/apolloconfig/apollo.net/tree/main/Apollo.ConfigurationManager.Demo)（通过环境变量配置） +* [Apollo.AspNet.Demo](https://github.com/apolloconfig/apollo.net/tree/main/src/Apollo.AspNet.Demo)（通过Web.config配置） +* [Apollo.ConfigurationManager.Demo](https://github.com/apolloconfig/apollo.net/tree/main/src/Apollo.ConfigurationManager.Demo)（通过环境变量配置） # 四、NETFramework 4.7.1+ ConfigurationBuilder支持