SteeltoeOSS
/
Configuration
зеркало из https://github.com/SteeltoeOSS/Configuration.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move back to net452 from net46

This commit is contained in:
Dave Tillman 2017-04-27 13:29:52 -06:00
Родитель a4b4a24bd0
Коммит 2762d0e12f
6 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/Steeltoe.Extensions.Configuration.CloudFoundry/Steeltoe.Extensions.Configuration.CloudFoundry.csproj
Просмотреть файл

@ -7,7 +7,7 @@
<VersionPrefix>$(SteeltoeVersion)</VersionPrefix> <VersionPrefix>$(SteeltoeVersion)</VersionPrefix>
<VersionSuffix>$(VersionSuffix)</VersionSuffix> <VersionSuffix>$(VersionSuffix)</VersionSuffix>
<Authors>Pivotal;dtillman</Authors> <Authors>Pivotal;dtillman</Authors>
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks> <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
<AssemblyName>Steeltoe.Extensions.Configuration.CloudFoundry</AssemblyName> <AssemblyName>Steeltoe.Extensions.Configuration.CloudFoundry</AssemblyName>
<PackageId>Steeltoe.Extensions.Configuration.CloudFoundry</PackageId> <PackageId>Steeltoe.Extensions.Configuration.CloudFoundry</PackageId>
<PackageTags>CloudFoundry;ASPNET Core;Spring;Spring Cloud</PackageTags> <PackageTags>CloudFoundry;ASPNET Core;Spring;Spring Cloud</PackageTags>

6
src/Steeltoe.Extensions.Configuration.ConfigServer/ConfigServerConfigurationProvider.cs
Просмотреть файл

@ -279,7 +279,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer
// Get the request message // Get the request message
var request = GetRequestMessage(requestUri); var request = GetRequestMessage(requestUri);
#if NET46 #if NET452
// If certificate validation is disabled, inject a callback to handle properly // If certificate validation is disabled, inject a callback to handle properly
RemoteCertificateValidationCallback prevValidator = null; RemoteCertificateValidationCallback prevValidator = null;
if (!_settings.ValidateCertificates) if (!_settings.ValidateCertificates)
@ -322,7 +322,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer
_logger?.LogError("Config Server exception: {0}, path: {1}", e, requestUri); _logger?.LogError("Config Server exception: {0}, path: {1}", e, requestUri);
throw; throw;
} }
#if NET46 #if NET452
finally finally
{ {
ServicePointManager.ServerCertificateValidationCallback = prevValidator; ServicePointManager.ServerCertificateValidationCallback = prevValidator;
@ -423,7 +423,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer
protected static HttpClient GetHttpClient(ConfigServerClientSettings settings) protected static HttpClient GetHttpClient(ConfigServerClientSettings settings)
{ {
HttpClient client = null; HttpClient client = null;
#if NET46 #if NET452
client = new HttpClient(); client = new HttpClient();
#else #else
if (settings != null && !settings.ValidateCertificates) if (settings != null && !settings.ValidateCertificates)

2
src/Steeltoe.Extensions.Configuration.ConfigServer/Steeltoe.Extensions.Configuration.ConfigServer.csproj
Просмотреть файл

@ -7,7 +7,7 @@
<VersionPrefix>$(SteeltoeVersion)</VersionPrefix> <VersionPrefix>$(SteeltoeVersion)</VersionPrefix>
<VersionSuffix>$(VersionSuffix)</VersionSuffix> <VersionSuffix>$(VersionSuffix)</VersionSuffix>
<Authors>Pivotal;dtillman</Authors> <Authors>Pivotal;dtillman</Authors>
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks> <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
<AssemblyName>Steeltoe.Extensions.Configuration.ConfigServer</AssemblyName> <AssemblyName>Steeltoe.Extensions.Configuration.ConfigServer</AssemblyName>
<PackageId>Steeltoe.Extensions.Configuration.ConfigServer</PackageId> <PackageId>Steeltoe.Extensions.Configuration.ConfigServer</PackageId>
<PackageTags>ASPNET Core;Spring;Spring Cloud;Spring Cloud Config Server</PackageTags> <PackageTags>ASPNET Core;Spring;Spring Cloud;Spring Cloud Config Server</PackageTags>

2
test/Steeltoe.Extensions.Configuration.CloudFoundry.Test/Steeltoe.Extensions.Configuration.CloudFoundry.Test.csproj
Просмотреть файл

@ -3,7 +3,7 @@
<Import Project="..\..\config\versions.props" /> <Import Project="..\..\config\versions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
test/Steeltoe.Extensions.Configuration.ConfigServer.ITest/Steeltoe.Extensions.Configuration.ConfigServer.ITest.csproj
Просмотреть файл

@ -3,7 +3,7 @@
<Import Project="..\..\config\versions.props" /> <Import Project="..\..\config\versions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<!-- Next two lines needed due to https://github.com/aspnet/Hosting/issues/926 --> <!-- Next two lines needed due to https://github.com/aspnet/Hosting/issues/926 -->
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

2
test/Steeltoe.Extensions.Configuration.ConfigServer.Test/Steeltoe.Extensions.Configuration.ConfigServer.Test.csproj
Просмотреть файл

@ -3,7 +3,7 @@
<Import Project="..\..\config\versions.props" /> <Import Project="..\..\config\versions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<!-- Next two lines needed due to https://github.com/aspnet/Hosting/issues/926 --> <!-- Next two lines needed due to https://github.com/aspnet/Hosting/issues/926 -->
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>