huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrate tests, tools and samples to portable

This commit is contained in:
Pavel Krymets 2016-04-18 08:37:56 -07:00
parent 31732c3d91
commit 6aca37fe5e
9 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
View File

@ -6,12 +6,15 @@
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-dev-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },

7
test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
View File

@ -4,12 +4,15 @@
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*",
"Microsoft.AspNetCore.DataProtection.Test.Shared": "1.0.0-*", "Microsoft.AspNetCore.DataProtection.Test.Shared": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-dev-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },

10
test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json
View File

@ -3,15 +3,19 @@
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*",
"Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*", "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": [ "imports": [
"dnxcore50", "dnxcore50",

2
test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs
View File

@ -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] [ConditionalFact]
[ConditionalRunTestOnlyIfLocalAppDataAvailable] [ConditionalRunTestOnlyIfLocalAppDataAvailable]
[ConditionalRunTestOnlyOnWindows] [ConditionalRunTestOnlyOnWindows]

10
test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
View File

@ -7,15 +7,19 @@
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*", "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": [ "imports": [
"dnxcore50", "dnxcore50",

2
test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs
View File

@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.DataProtection.Repositories
private static string GetLocalApplicationData() private static string GetLocalApplicationData()
{ {
#if NETSTANDARDAPP1_5 #if NETCOREAPP1_0
return Environment.GetEnvironmentVariable("LOCALAPPDATA"); return Environment.GetEnvironmentVariable("LOCALAPPDATA");
#else #else
return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);

2
test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs
View File

@ -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 !NETSTANDARDAPP1_5 #if !NETCOREAPP1_0
using System; using System;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Security.Cryptography.Xml; using System.Security.Cryptography.Xml;

2
test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.DataProtection.XmlEncryption
XmlAssert.Equal(originalXml, roundTrippedElement); XmlAssert.Equal(originalXml, roundTrippedElement);
} }
#if !NETSTANDARDAPP1_5 #if !NETCOREAPP1_0
[ConditionalFact] [ConditionalFact]
[ConditionalRunTestOnlyOnWindows] [ConditionalRunTestOnlyOnWindows]
public void Encrypt_CurrentUser_Decrypt_ImpersonatedAsAnonymous_Fails() public void Encrypt_CurrentUser_Decrypt_ImpersonatedAsAnonymous_Fails()

10
test/Microsoft.AspNetCore.DataProtection.Test/project.json
View File

@ -7,15 +7,19 @@
}, },
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*", "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": [ "imports": [
"dnxcore50", "dnxcore50",