Родитель
31be258e69
Коммит
23aabd9c39
|
@ -238,7 +238,7 @@ namespace Microsoft.Extensions.Configuration.Binder.Test
|
|||
Assert.Same(config.GetValue("Object", foo), foo);
|
||||
}
|
||||
|
||||
#if !NETCOREAPP1_1 // TypeConverter doesn't support this on DNXCORE
|
||||
#if !NETCOREAPP1_0 // TypeConverter doesn't support this on DNXCORE
|
||||
[Fact]
|
||||
public void GetUri()
|
||||
{
|
||||
|
@ -273,7 +273,7 @@ namespace Microsoft.Extensions.Configuration.Binder.Test
|
|||
[InlineData("2015-12-24T07:34:42-5:00", typeof(DateTime))]
|
||||
[InlineData("12/24/2015 13:44:55 +4", typeof(DateTimeOffset))]
|
||||
[InlineData("99.22:22:22.1234567", typeof(TimeSpan))]
|
||||
#if !NETCOREAPP1_1 // TypeConverter doesn't support this on DNXCORE
|
||||
#if !NETCOREAPP1_0 // TypeConverter doesn't support this on DNXCORE
|
||||
[InlineData("http://www.bing.com", typeof(Uri))]
|
||||
#endif
|
||||
// enum test
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -44,7 +44,7 @@ namespace Microsoft.Extensions.Configuration.Json
|
|||
|
||||
string expectedPath;
|
||||
|
||||
#if NETCOREAPP1_1
|
||||
#if NETCOREAPP1_0
|
||||
expectedPath = AppContext.BaseDirectory;
|
||||
#else
|
||||
expectedPath = Path.GetFullPath(AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") as string ??
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -804,7 +804,7 @@ IniKey1=IniValue2");
|
|||
var builder = new ConfigurationBuilder();
|
||||
string filePath;
|
||||
|
||||
#if NETCOREAPP1_1
|
||||
#if NETCOREAPP1_0
|
||||
filePath = AppContext.BaseDirectory;
|
||||
#else
|
||||
filePath = Path.GetFullPath(AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") as string ??
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
},
|
||||
"testRunner": "xunit",
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
#if !NETCOREAPP1_1
|
||||
#if !NETCOREAPP1_0
|
||||
// These tests only run on desktop CLR.
|
||||
|
||||
using System;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
#if NETCOREAPP1_1
|
||||
#if NETCOREAPP1_0
|
||||
// These tests only run on Core CLR.
|
||||
|
||||
using System;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"xunit": "2.2.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.1": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.1.0-*",
|
||||
|
|
Загрузка…
Ссылка в новой задаче