From 6aca37fe5e99292d10cd7202cff591cbdd9b75d9 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 18 Apr 2016 08:37:56 -0700 Subject: [PATCH] Migrate tests, tools and samples to portable --- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 10 +++++++--- .../DataProtectionProviderTests.cs | 2 +- .../project.json | 10 +++++++--- .../Repositories/FileSystemXmlRepositoryTests.cs | 2 +- .../XmlEncryption/CertificateXmlEncryptionTests.cs | 2 +- .../XmlEncryption/DpapiXmlEncryptionTests.cs | 2 +- .../project.json | 10 +++++++--- 9 files changed, 35 insertions(+), 17 deletions(-) diff --git a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json index 1eac69a003..3d065ea62a 100644 --- a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json +++ b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json @@ -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-*" }, diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json index 8a78b832fd..8110093833 100644 --- a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json +++ b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json @@ -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-*" }, diff --git a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json index 2452daa441..157464c18f 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json @@ -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", diff --git a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs index baf03a742f..3f1080188a 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs @@ -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] diff --git a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json index a030268267..b2c2f7f57e 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json @@ -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", diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs b/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs index 2ed3f84d0a..0213d96b59 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs @@ -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); diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs b/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs index 4655d87138..ea8c939b5b 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs @@ -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; diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs b/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs index 775c63b3eb..128e563403 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs @@ -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() diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Test/project.json index d57f47f5f7..1fea59f981 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Test/project.json @@ -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",