Updating to netcoreapp1.1
This commit is contained in:
parent
01e9377eff
commit
f3a6083c9c
|
|
@ -15,7 +15,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"imports": [
|
"imports": [
|
||||||
"portable-net45+win8+wp8+wpa81"
|
"portable-net45+win8+wp8+wpa81"
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"Microsoft.Extensions.Logging.Console": "1.1.0-*"
|
"Microsoft.Extensions.Logging.Console": "1.1.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.DataProtection
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !NETCOREAPP1_0 // [[ISSUE60]] Remove this #ifdef when Core CLR gets support for EncryptedXml
|
#if !NETCOREAPP1_1 // [[ISSUE60]] Remove this #ifdef when Core CLR gets support for EncryptedXml
|
||||||
[ConditionalFact]
|
[ConditionalFact]
|
||||||
[ConditionalRunTestOnlyIfLocalAppDataAvailable]
|
[ConditionalRunTestOnlyIfLocalAppDataAvailable]
|
||||||
[ConditionalRunTestOnlyOnWindows]
|
[ConditionalRunTestOnlyOnWindows]
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.DataProtection.Repositories
|
||||||
|
|
||||||
private static string GetLocalApplicationData()
|
private static string GetLocalApplicationData()
|
||||||
{
|
{
|
||||||
#if NETCOREAPP1_0
|
#if NETCOREAPP1_1
|
||||||
return Environment.GetEnvironmentVariable("LOCALAPPDATA");
|
return Environment.GetEnvironmentVariable("LOCALAPPDATA");
|
||||||
#else
|
#else
|
||||||
return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
|
return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// Copyright (c) .NET Foundation. All rights reserved.
|
// 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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
#if !NETCOREAPP1_0
|
#if !NETCOREAPP1_1
|
||||||
using System;
|
using System;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Security.Cryptography.Xml;
|
using System.Security.Cryptography.Xml;
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.DataProtection.XmlEncryption
|
||||||
XmlAssert.Equal(originalXml, roundTrippedElement);
|
XmlAssert.Equal(originalXml, roundTrippedElement);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !NETCOREAPP1_0
|
#if !NETCOREAPP1_1
|
||||||
[ConditionalFact]
|
[ConditionalFact]
|
||||||
[ConditionalRunTestOnlyOnWindows]
|
[ConditionalRunTestOnlyOnWindows]
|
||||||
public void Encrypt_CurrentUser_Decrypt_ImpersonatedAsAnonymous_Fails()
|
public void Encrypt_CurrentUser_Decrypt_ImpersonatedAsAnonymous_Fails()
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"xunit": "2.2.0-*"
|
"xunit": "2.2.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.1": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.1.0-*",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue