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

Merge branch 'release/2.2' 

\n\nCommit migrated from 34204b6bc4
This commit is contained in:
Nate McMaster 2018-10-30 17:16:51 -07:00
parent 45b0b83997
commit 5c9701e0b6
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Shared/BenchmarkRunner/DefaultCoreConfig.cs
View File

@ -31,7 +31,7 @@ namespace BenchmarkDotNet.Attributes
#if NETCOREAPP2_1 #if NETCOREAPP2_1
.With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) .With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21))
#else #else
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp2.2", null, ".NET Core 2.2"))) .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
#endif #endif
.With(new GcMode { Server = true }) .With(new GcMode { Server = true })
.With(RunStrategy.Throughput)); .With(RunStrategy.Throughput));

8
src/Shared/CertificateGeneration/CertificateManager.cs
View File

@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation
private const string MacOSSystemKeyChain = "/Library/Keychains/System.keychain"; private const string MacOSSystemKeyChain = "/Library/Keychains/System.keychain";
private static readonly string MacOSUserKeyChain = Environment.GetEnvironmentVariable("HOME") + "/Library/Keychains/login.keychain-db"; private static readonly string MacOSUserKeyChain = Environment.GetEnvironmentVariable("HOME") + "/Library/Keychains/login.keychain-db";
private const string MacOSFindCertificateCommandLine = "security"; private const string MacOSFindCertificateCommandLine = "security";
#if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 #if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0
private static readonly string MacOSFindCertificateCommandLineArgumentsFormat = "find-certificate -c {0} -a -Z -p " + MacOSSystemKeyChain; private static readonly string MacOSFindCertificateCommandLineArgumentsFormat = "find-certificate -c {0} -a -Z -p " + MacOSSystemKeyChain;
#endif #endif
private const string MacOSFindCertificateOutputRegex = "SHA-1 hash: ([0-9A-Z]+)"; private const string MacOSFindCertificateOutputRegex = "SHA-1 hash: ([0-9A-Z]+)";
@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation
private const string MacOSDeleteCertificateCommandLine = "sudo"; private const string MacOSDeleteCertificateCommandLine = "sudo";
private const string MacOSDeleteCertificateCommandLineArgumentsFormat = "security delete-certificate -Z {0} {1}"; private const string MacOSDeleteCertificateCommandLineArgumentsFormat = "security delete-certificate -Z {0} {1}";
private const string MacOSTrustCertificateCommandLine = "sudo"; private const string MacOSTrustCertificateCommandLine = "sudo";
#if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 #if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0
private static readonly string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " "; private static readonly string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " ";
#endif #endif
private const int UserCancelledErrorCode = 1223; private const int UserCancelledErrorCode = 1223;
@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation
} }
} }
#if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 #if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0
public X509Certificate2 CreateAspNetCoreHttpsDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter, string subjectOverride, DiagnosticInformation diagnostics = null) public X509Certificate2 CreateAspNetCoreHttpsDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter, string subjectOverride, DiagnosticInformation diagnostics = null)
{ {
@ -948,4 +948,4 @@ namespace Microsoft.AspNetCore.Certificates.Generation
} }
} }
} }
} }

4
src/Shared/CertificateGeneration/EnsureCertificateResult.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 NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 #if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0
namespace Microsoft.AspNetCore.Certificates.Generation namespace Microsoft.AspNetCore.Certificates.Generation
{ {
@ -17,4 +17,4 @@ namespace Microsoft.AspNetCore.Certificates.Generation
} }
} }
#endif #endif

4
src/Shared/test/Shared.Tests/CertificateManagerTests.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 NETCOREAPP2_2 #if NETCOREAPP3_0
using System; using System;
using System.IO; using System.IO;
@ -285,4 +285,4 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
} }
} }
#endif #endif

2
src/Shared/test/Shared.Tests/DotNetMuxerTests.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 NETCOREAPP2_2 #if NETCOREAPP3_0
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Xunit; using Xunit;

4
src/Testing/test/ConditionalFactTest.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Testing
Assert.True(false, "This test should always be skipped."); Assert.True(false, "This test should always be skipped.");
} }
#if NETCOREAPP2_2 #if NETCOREAPP3_0
[ConditionalFact] [ConditionalFact]
[FrameworkSkipCondition(RuntimeFrameworks.CLR)] [FrameworkSkipCondition(RuntimeFrameworks.CLR)]
public void ThisTestMustRunOnCoreCLR() public void ThisTestMustRunOnCoreCLR()
@ -57,4 +57,4 @@ namespace Microsoft.AspNetCore.Testing
} }
} }
} }
} }

2
src/Testing/test/ConditionalTheoryTest.cs
View File

@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Testing
Assert.True(true); Assert.True(true);
} }
#if NETCOREAPP2_2 #if NETCOREAPP3_0
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.CLR)] [FrameworkSkipCondition(RuntimeFrameworks.CLR)]
[MemberData(nameof(GetInts))] [MemberData(nameof(GetInts))]