Merge pull request #182 from pengweiqhca/main

允许低版本.NET Frameowrk[net40-net471)版本使用ConfigurationBuilder功能

Author: pengweiqhca

Apollo.ConfigurationManager/Apollo.ConfigurationManager.csproj

@@ -1,5 +1,4 @@
-
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyName>Com.Ctrip.Framework.Apollo.ConfigurationManager</AssemblyName>
@@ -15,7 +14,7 @@ $(PackageReleaseNotes)</Description>
     <PackageTags>$(PackageTags) ConfigurationBuilder ConfigurationManager</PackageTags>
     <RootNamespace>Com.Ctrip.Framework.Apollo</RootNamespace>
     <TargetFrameworks>net471;net45;net40;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>$(ApolloVersion).1</Version>
+    <Version>$(ApolloVersion).2</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,6 +24,10 @@ $(PackageReleaseNotes)</Description>
 
     <ProjectReference Include="..\Apollo\Apollo.csproj" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.*" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" />
+
+    <None Include="$(PackageId).props" Pack="True" PackagePath="build/net40;build/net45" />
+    <None Include="bin/$(Configuration)/net471/$(AssemblyName).dll" Pack="True" PackagePath="build/net40;build/net45" />
+    <None Include="bin/$(Configuration)/net471/$(AssemblyName).pdb" Pack="True" PackagePath="build/net40;build/net45" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

Apollo.ConfigurationManager/Com.Ctrip.Framework.Apollo.ConfigurationManager.props

@@ -0,0 +1,11 @@
+<Project>
+
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)*" Condition="'$(UseApolloConfigurationBuilder)' == 'true'">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </None>
+  </ItemGroup>
+
+</Project>

Apollo.ConfigurationManager/README.md

@@ -290,3 +290,8 @@ ConfigUtil.UseHttpMessageHandlerFactory(() => new HttpClientHandler
 ## 5.4 如何优先使用环境变量
 
 配置Apollo.EnvironmentVariablePriority或者Apollo:EnvironmentVariablePriority值为1或者true（优先从环境变量中读取）后，则Apollo配置则优先从环境变量中读取（和现在读取顺序相反）
+
+## 5.5 如果不更改framework版本的情况下使用ConfigurationBuilder
+
+1. 运行时必须是.NET Framework 4.7.1+
+2. 在项目文件的PropertyGroup节点里添加<UseApolloConfigurationBuilder>true</UseApolloConfigurationBuilder>