Migrate tests, tools and samples to portable
This commit is contained in:
parent
31732c3d91
commit
6aca37fe5e
|
|
@ -6,12 +6,15 @@
|
|||
"version": "1.0.0-*"
|
||||
},
|
||||
"Microsoft.AspNetCore.Testing": "1.0.0-*",
|
||||
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||
"xunit": "2.1.0"
|
||||
},
|
||||
"frameworks": {
|
||||
"netstandardapp1.5": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.0.0-*",
|
||||
"type": "platform"
|
||||
},
|
||||
"dotnet-test-xunit": "1.0.0-dev-*",
|
||||
"System.Diagnostics.Process": "4.1.0-*"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,12 +4,15 @@
|
|||
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*",
|
||||
"Microsoft.AspNetCore.DataProtection.Test.Shared": "1.0.0-*",
|
||||
"Microsoft.AspNetCore.Testing": "1.0.0-*",
|
||||
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||
"xunit": "2.1.0"
|
||||
},
|
||||
"frameworks": {
|
||||
"netstandardapp1.5": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.0.0-*",
|
||||
"type": "platform"
|
||||
},
|
||||
"dotnet-test-xunit": "1.0.0-dev-*",
|
||||
"System.Diagnostics.Process": "4.1.0-*"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,15 +3,19 @@
|
|||
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*",
|
||||
"Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*",
|
||||
"Microsoft.AspNetCore.Testing": "1.0.0-*",
|
||||
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||
"xunit": "2.1.0"
|
||||
},
|
||||
"frameworks": {
|
||||
"netstandardapp1.5": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.0.0-*",
|
||||
"type": "platform"
|
||||
},
|
||||
"moq.netcore": "4.4.0-beta8",
|
||||
"dotnet-test-xunit": "1.0.0-dev-*",
|
||||
"System.Diagnostics.Process": "4.1.0-*"
|
||||
"System.Diagnostics.Process": "4.1.0-*",
|
||||
"System.Diagnostics.TraceSource": "4.0.0-*"
|
||||
},
|
||||
"imports": [
|
||||
"dnxcore50",
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.DataProtection
|
|||
});
|
||||
}
|
||||
|
||||
#if !NETSTANDARDAPP1_5 // [[ISSUE60]] Remove this #ifdef when Core CLR gets support for EncryptedXml
|
||||
#if !NETCOREAPP1_0 // [[ISSUE60]] Remove this #ifdef when Core CLR gets support for EncryptedXml
|
||||
[ConditionalFact]
|
||||
[ConditionalRunTestOnlyIfLocalAppDataAvailable]
|
||||
[ConditionalRunTestOnlyOnWindows]
|
||||
|
|
|
|||
|
|
@ -7,15 +7,19 @@
|
|||
"version": "1.0.0-*"
|
||||
},
|
||||
"Microsoft.AspNetCore.Testing": "1.0.0-*",
|
||||
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||
"xunit": "2.1.0"
|
||||
},
|
||||
"frameworks": {
|
||||
"netstandardapp1.5": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.0.0-*",
|
||||
"type": "platform"
|
||||
},
|
||||
"moq.netcore": "4.4.0-beta8",
|
||||
"dotnet-test-xunit": "1.0.0-dev-*",
|
||||
"System.Diagnostics.Process": "4.1.0-*"
|
||||
"System.Diagnostics.Process": "4.1.0-*",
|
||||
"System.Diagnostics.TraceSource": "4.0.0-*"
|
||||
},
|
||||
"imports": [
|
||||
"dnxcore50",
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.DataProtection.Repositories
|
|||
|
||||
private static string GetLocalApplicationData()
|
||||
{
|
||||
#if NETSTANDARDAPP1_5
|
||||
#if NETCOREAPP1_0
|
||||
return Environment.GetEnvironmentVariable("LOCALAPPDATA");
|
||||
#else
|
||||
return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
|
||||
|
|
|
|||
|
|
@ -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 !NETSTANDARDAPP1_5
|
||||
#if !NETCOREAPP1_0
|
||||
using System;
|
||||
using System.Security.Cryptography;
|
||||
using System.Security.Cryptography.Xml;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.DataProtection.XmlEncryption
|
|||
XmlAssert.Equal(originalXml, roundTrippedElement);
|
||||
}
|
||||
|
||||
#if !NETSTANDARDAPP1_5
|
||||
#if !NETCOREAPP1_0
|
||||
[ConditionalFact]
|
||||
[ConditionalRunTestOnlyOnWindows]
|
||||
public void Encrypt_CurrentUser_Decrypt_ImpersonatedAsAnonymous_Fails()
|
||||
|
|
|
|||
|
|
@ -7,15 +7,19 @@
|
|||
},
|
||||
"Microsoft.AspNetCore.Testing": "1.0.0-*",
|
||||
"Microsoft.Extensions.DependencyInjection": "1.0.0-*",
|
||||
"Microsoft.NETCore.Platforms": "1.0.1-*",
|
||||
"xunit": "2.1.0"
|
||||
},
|
||||
"frameworks": {
|
||||
"netstandardapp1.5": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.0.0-*",
|
||||
"type": "platform"
|
||||
},
|
||||
"moq.netcore": "4.4.0-beta8",
|
||||
"dotnet-test-xunit": "1.0.0-dev-*",
|
||||
"System.Diagnostics.Process": "4.1.0-*"
|
||||
"System.Diagnostics.Process": "4.1.0-*",
|
||||
"System.Diagnostics.TraceSource": "4.0.0-*"
|
||||
},
|
||||
"imports": [
|
||||
"dnxcore50",
|
||||
|
|
|
|||
Loading…
Reference in New Issue