Merge branch 'release/2.2'

\n\nCommit migrated from 34204b6bc4

src/Shared/BenchmarkRunner/DefaultCoreConfig.cs

@@ -31,7 +31,7 @@ namespace BenchmarkDotNet.Attributes
 #if NETCOREAPP2_1
                 .With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21))
 #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
                 .With(new GcMode { Server = true })
                 .With(RunStrategy.Throughput));

src/Shared/CertificateGeneration/CertificateManager.cs

@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation
         private const string MacOSSystemKeyChain = "/Library/Keychains/System.keychain";
         private static readonly string MacOSUserKeyChain = Environment.GetEnvironmentVariable("HOME") + "/Library/Keychains/login.keychain-db";
         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;
 #endif
         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 MacOSDeleteCertificateCommandLineArgumentsFormat = "security delete-certificate -Z {0} {1}";
         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 + " ";
 #endif
         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)
         {
@@ -948,4 +948,4 @@ namespace Microsoft.AspNetCore.Certificates.Generation
             }
         }
     }
-}
+}

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

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

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

src/Testing/test/ConditionalFactTest.cs

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

src/Testing/test/ConditionalTheoryTest.cs

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