Move back to net452 from net46
This commit is contained in:
Родитель
a4b4a24bd0
Коммит
2762d0e12f
|
@ -7,7 +7,7 @@
|
|||
<VersionPrefix>$(SteeltoeVersion)</VersionPrefix>
|
||||
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
|
||||
<Authors>Pivotal;dtillman</Authors>
|
||||
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
|
||||
<TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
|
||||
<AssemblyName>Steeltoe.Extensions.Configuration.CloudFoundry</AssemblyName>
|
||||
<PackageId>Steeltoe.Extensions.Configuration.CloudFoundry</PackageId>
|
||||
<PackageTags>CloudFoundry;ASPNET Core;Spring;Spring Cloud</PackageTags>
|
||||
|
|
|
@ -279,7 +279,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer
|
|||
// Get the request message
|
||||
var request = GetRequestMessage(requestUri);
|
||||
|
||||
#if NET46
|
||||
#if NET452
|
||||
// If certificate validation is disabled, inject a callback to handle properly
|
||||
RemoteCertificateValidationCallback prevValidator = null;
|
||||
if (!_settings.ValidateCertificates)
|
||||
|
@ -322,7 +322,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer
|
|||
_logger?.LogError("Config Server exception: {0}, path: {1}", e, requestUri);
|
||||
throw;
|
||||
}
|
||||
#if NET46
|
||||
#if NET452
|
||||
finally
|
||||
{
|
||||
ServicePointManager.ServerCertificateValidationCallback = prevValidator;
|
||||
|
@ -423,7 +423,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer
|
|||
protected static HttpClient GetHttpClient(ConfigServerClientSettings settings)
|
||||
{
|
||||
HttpClient client = null;
|
||||
#if NET46
|
||||
#if NET452
|
||||
client = new HttpClient();
|
||||
#else
|
||||
if (settings != null && !settings.ValidateCertificates)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<VersionPrefix>$(SteeltoeVersion)</VersionPrefix>
|
||||
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
|
||||
<Authors>Pivotal;dtillman</Authors>
|
||||
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
|
||||
<TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
|
||||
<AssemblyName>Steeltoe.Extensions.Configuration.ConfigServer</AssemblyName>
|
||||
<PackageId>Steeltoe.Extensions.Configuration.ConfigServer</PackageId>
|
||||
<PackageTags>ASPNET Core;Spring;Spring Cloud;Spring Cloud Config Server</PackageTags>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<Import Project="..\..\config\versions.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
|
||||
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<Import Project="..\..\config\versions.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
|
||||
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
|
||||
<!-- Next two lines needed due to https://github.com/aspnet/Hosting/issues/926 -->
|
||||
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<Import Project="..\..\config\versions.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
|
||||
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
|
||||
<!-- Next two lines needed due to https://github.com/aspnet/Hosting/issues/926 -->
|
||||
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
|
|
Загрузка…
Ссылка в новой задаче