Merge branch 'release' into dev
This commit is contained in:
Brice Lambson
Коммит
6f1cd0319d
|
|
@ -5,23 +5,10 @@
|
|||
"frameworks": {
|
||||
"net45": { },
|
||||
"dnx451": { },
|
||||
"dnxcore50": {
|
||||
"dotnet": {
|
||||
"dependencies": {
|
||||
"System.Linq": "4.0.0-beta-*"
|
||||
}
|
||||
},
|
||||
".NETPortable,Version=v4.5,Profile=Profile7": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Collections": "",
|
||||
"System.Diagnostics.Debug": "",
|
||||
"System.Globalization": "",
|
||||
"System.Linq": "",
|
||||
"System.Reflection": "",
|
||||
"System.Resources.ResourceManager": "",
|
||||
"System.Runtime": "",
|
||||
"System.Runtime.Extensions": "",
|
||||
"System.Runtime.InteropServices": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,19 +8,6 @@
|
|||
"frameworks": {
|
||||
"net45": { },
|
||||
"dnx451": { },
|
||||
"dnxcore50": { },
|
||||
".NETPortable,Version=v4.5,Profile=Profile7": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Collections": "",
|
||||
"System.Diagnostics.Debug": "",
|
||||
"System.Globalization": "",
|
||||
"System.Linq": "",
|
||||
"System.Reflection": "",
|
||||
"System.Resources.ResourceManager": "",
|
||||
"System.Runtime": "",
|
||||
"System.Runtime.Extensions": "",
|
||||
"System.Runtime.InteropServices": ""
|
||||
}
|
||||
}
|
||||
"dotnet": { }
|
||||
}
|
||||
}
|
||||
|
|
@ -8,6 +8,6 @@
|
|||
"frameworks": {
|
||||
"net45": { },
|
||||
"dnx451": { },
|
||||
"dnxcore50": { }
|
||||
"dotnet": { }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,12 +30,10 @@ namespace Microsoft.Framework.Configuration.EnvironmentVariables
|
|||
_prefix = string.Empty;
|
||||
}
|
||||
|
||||
#if NET45 || DNX451 || DNXCORE50
|
||||
public override void Load()
|
||||
{
|
||||
Load(Environment.GetEnvironmentVariables());
|
||||
}
|
||||
#endif
|
||||
|
||||
internal void Load(IDictionary envVariables)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
"frameworks": {
|
||||
"net45": { },
|
||||
"dnx451": { },
|
||||
"dnxcore50": { }
|
||||
"dotnet": { }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ namespace Microsoft.Framework.Configuration
|
|||
{
|
||||
public static class IniConfigurationExtension
|
||||
{
|
||||
#if NET45 || DNX451 || DNXCORE50
|
||||
/// <summary>
|
||||
/// Adds the INI configuration source at <paramref name="path"/> to <paramref name="configuraton"/>.
|
||||
/// </summary>
|
||||
|
|
@ -55,6 +54,5 @@ namespace Microsoft.Framework.Configuration
|
|||
configuration.Add(new IniFileConfigurationSource(fullPath, optional: optional));
|
||||
return configuration;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
// 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 NET45 || DNX451 || DNXCORE50
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
|
@ -144,4 +143,3 @@ namespace Microsoft.Framework.Configuration.Ini
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
"frameworks": {
|
||||
"net45": { },
|
||||
"dnx451": { },
|
||||
"dnxcore50": { }
|
||||
"dotnet": { }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
"frameworks": {
|
||||
"net45": { },
|
||||
"dnx451": { },
|
||||
"dnxcore50": {
|
||||
"dotnet": {
|
||||
"dependencies": {
|
||||
"System.Dynamic.Runtime": "4.0.10-*"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 !DNXCORE50
|
||||
#if !DOTNET
|
||||
using System;
|
||||
using System.Security.Cryptography.Xml;
|
||||
using System.Xml;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ namespace Microsoft.Framework.Configuration
|
|||
/// <summary>
|
||||
/// Accesses the singleton decryptor instance.
|
||||
/// </summary>
|
||||
#if DNXCORE50
|
||||
#if DOTNET
|
||||
public static readonly XmlDocumentDecryptor Instance = new XmlDocumentDecryptor();
|
||||
#else
|
||||
public static readonly XmlDocumentDecryptor Instance = new EncryptedXmlDocumentDecryptor();
|
||||
|
|
@ -30,7 +30,7 @@ namespace Microsoft.Framework.Configuration
|
|||
// us that it did so, so we need to perform a check to see if EncryptedXml
|
||||
// will actually do anything. The below check for an encrypted data blob
|
||||
// is the same one that EncryptedXml would have performed.
|
||||
#if DNXCORE50
|
||||
#if DOTNET
|
||||
var matchingNodes = document.GetElementsByTagName("EncryptedData", "http://www.w3.org/2001/04/xmlenc#");
|
||||
return (matchingNodes != null && matchingNodes.Count > 0);
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
"System.Xml": ""
|
||||
}
|
||||
},
|
||||
"dnxcore50": {
|
||||
"dotnet": {
|
||||
"dependencies": {
|
||||
"System.Xml.XmlDocument": "4.0.0-beta-*",
|
||||
"System.Xml.XmlSerializer": "4.0.10-beta-*"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"frameworks": {
|
||||
"net45": {},
|
||||
"dnx451": {},
|
||||
"dnxcore50": {
|
||||
"dotnet": {
|
||||
"dependencies": {
|
||||
"System.Collections": "4.0.10-beta-*",
|
||||
"System.Diagnostics.Debug": "4.0.10-beta-*",
|
||||
|
|
@ -18,19 +18,6 @@
|
|||
"System.Runtime.Extensions": "4.0.10-beta-*",
|
||||
"System.Runtime.InteropServices": "4.0.20-beta-*"
|
||||
}
|
||||
},
|
||||
".NETPortable,Version=v4.5,Profile=Profile7": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Collections": "",
|
||||
"System.Diagnostics.Debug": "",
|
||||
"System.Globalization": "",
|
||||
"System.Linq": "",
|
||||
"System.Reflection": "",
|
||||
"System.Resources.ResourceManager": "",
|
||||
"System.Runtime": "",
|
||||
"System.Runtime.Extensions": "",
|
||||
"System.Runtime.InteropServices": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче