Update last few projects to target netcoreapp3.0 (#5128)

- #3754
- remove `#if`'s for multi-targeting where source is never multi-targeted
- left `StreamPipeReader`, `StreamPipeWriter` and their test classes alone because they're moving to CoreFx

Author: dougbu

src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs

@@ -1,9 +1,6 @@
 // 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 NETCOREAPP3_0
-// Rfc2898DeriveBytes in .NET Standard 2.0 only supports SHA1
-
 using System;
 using System.Diagnostics;
 using System.Security.Cryptography;
@@ -64,8 +61,3 @@ private static byte[] DeriveKeyImpl(string password, byte[] salt, KeyDerivationP
         }
     }
 }
-
-#elif NETSTANDARD2_0
-#else
-#error Update target frameworks
-#endif

src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs

@@ -25,22 +25,12 @@ private static IPbkdf2Provider GetPbkdf2Provider()
                 // acceptable implementation
                 return new Win7Pbkdf2Provider();
             }
-#if NETCOREAPP3_0
             else
             {
                 // fastest implementation on .NET Core for Linux/macOS.
                 // Not supported on .NET Framework
                 return new NetCorePbkdf2Provider();
             }
-#elif NETSTANDARD2_0
-            else
-            {
-                // slowest implementation
-                return new ManagedPbkdf2Provider();
-            }
-#else
-#error Update target frameworks
-#endif
         }
     }
 }

src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs

@@ -12,9 +12,6 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation
 {
     public class Pbkdf2Tests
     {
-
-#if NET461
-#elif NETCOREAPP3_0
         // The 'numBytesRequested' parameters below are chosen to exercise code paths where
         // this value straddles the digest length of the PRF. We only use 5 iterations so
         // that our unit tests are fast.
@@ -60,9 +57,6 @@ public void RunTest_WithLongPassword_NetCore()
             var salt = Encoding.UTF8.GetBytes("abcdefghijkl");
             RunTest_WithLongPassword_Impl<NetCorePbkdf2Provider>(salt, "NGJtFzYUaaSxu+3ZsMeZO5d/qPJDUYW4caLkFlaY0cLSYdh1PN4+nHUVp4pUUubJWu3UeXNMnHKNDfnn8GMfnDVrAGTv1lldszsvUJ0JQ6p4+daQEYBc//Tj/ejuB3luwW0IinyE7U/ViOQKbfi5pCZFMQ0FFx9I+eXRlyT+I74=");
         }
-#else
-#error Update target framework
-#endif
 
         // The 'numBytesRequested' parameters below are chosen to exercise code paths where
         // this value straddles the digest length of the PRF. We only use 5 iterations so

src/DataProtection/DataProtection/test/AnonymousImpersonation.cs

@@ -103,21 +103,7 @@ public void CreateInstance_DoesNotForwardingTypesExternalTypes(Type type)
         [MemberData(nameof(AssemblyVersions))]
         public void CreateInstance_ForwardsAcrossVersionChanges(Version version)
         {
-#if NET461
-            // run this test in an appdomain without testhost's custom assembly resolution hooks
-            var setupInfo = new AppDomainSetup
-            {
-                ApplicationBase = AppDomain.CurrentDomain.BaseDirectory,
-                ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile,
-            };
-            var domain = AppDomain.CreateDomain("TestDomain", null, setupInfo);
-            var wrappedTestClass = (TypeForwardingActivatorTests)domain.CreateInstanceAndUnwrap(GetType().Assembly.FullName, typeof(TypeForwardingActivatorTests).FullName);
-            wrappedTestClass.CreateInstance_ForwardsAcrossVersionChangesImpl(version);
-#elif NETCOREAPP3_0
             CreateInstance_ForwardsAcrossVersionChangesImpl(version);
-#else
-#error Target framework should be updated
-#endif
         }
 
         private void CreateInstance_ForwardsAcrossVersionChangesImpl(Version newVersion)

src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs

@@ -33,29 +33,5 @@ public void Encrypt_CurrentUserOrLocalMachine_Decrypt_RoundTrips(bool protectToL
             var roundTrippedElement = decryptor.Decrypt(encryptedXmlInfo.EncryptedElement);
             XmlAssert.Equal(originalXml, roundTrippedElement);
         }
-
-#if NET461
-        [ConditionalFact]
-        [ConditionalRunTestOnlyOnWindows]
-        public void Encrypt_CurrentUser_Decrypt_ImpersonatedAsAnonymous_Fails()
-        {
-            // Arrange
-            var originalXml = XElement.Parse(@"<mySecret value='265ee4ea-ade2-43b1-b706-09b259e58b6b' />");
-            var encryptor = new DpapiXmlEncryptor(protectToLocalMachine: false, loggerFactory: NullLoggerFactory.Instance);
-            var decryptor = new DpapiXmlDecryptor();
-
-            // Act & assert - run through encryptor and make sure we get back an obfuscated element
-            var encryptedXmlInfo = encryptor.Encrypt(originalXml);
-            Assert.Equal(typeof(DpapiXmlDecryptor), encryptedXmlInfo.DecryptorType);
-            Assert.DoesNotContain("265ee4ea-ade2-43b1-b706-09b259e58b6b", encryptedXmlInfo.EncryptedElement.ToString(), StringComparison.OrdinalIgnoreCase);
-
-            // Act & assert - run through decryptor (while impersonated as anonymous) and verify failure
-            ExceptionAssert2.ThrowsCryptographicException(() =>
-                AnonymousImpersonation.Run(() => decryptor.Decrypt(encryptedXmlInfo.EncryptedElement)));
-        }
-#elif NETCOREAPP3_0
-#else
-#error Target framework needs to be updated
-#endif
     }
 }

src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core support for JSON PATCH.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;json;jsonpatch</PackageTags>

src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Features/JsonPatch/test/Microsoft.AspNetCore.JsonPatch.Tests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <SignAssembly>false</SignAssembly>
     <LangVersion>7.1</LangVersion>
     <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>

src/PackageArchive/ZipManifestGenerator/ZipManifestGenerator.csproj

@@ -32,18 +32,14 @@ internal class CertificateManager
         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 || 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]+)";
         private const string MacOSRemoveCertificateTrustCommandLine = "sudo";
         private const string MacOSRemoveCertificateTrustCommandLineArgumentsFormat = "security remove-trusted-cert -d {0}";
         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 || NETCOREAPP3_0
         private static readonly string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " ";
-#endif
         private const int UserCancelledErrorCode = 1223;
 
         public IList<X509Certificate2> ListCertificates(
@@ -153,8 +149,6 @@ private static void DisposeCertificates(IEnumerable<X509Certificate2> disposable
             }
         }
 
-#if NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0
-
         public X509Certificate2 CreateAspNetCoreHttpsDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter, string subjectOverride, DiagnosticInformation diagnostics = null)
         {
             var subject = new X500DistinguishedName(subjectOverride ?? LocalhostHttpsDistinguishedName);
@@ -739,7 +733,7 @@ public EnsureCertificateResult EnsureValidCertificateExists(
             return result;
         }
 
-        // This is just to avoid breaking changes across repos. 
+        // This is just to avoid breaking changes across repos.
         // Will be renamed back to EnsureAspNetCoreHttpsDevelopmentCertificate once updates are made elsewhere.
         public DetailedEnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate2(
             DateTimeOffset notBefore,
@@ -893,7 +887,6 @@ internal class DetailedEnsureCertificateResult
             public EnsureCertificateResult ResultCode { get; set; }
             public DiagnosticInformation Diagnostics { get; set; } = new DiagnosticInformation();
         }
-#endif
 
         internal class DiagnosticInformation
         {

src/Shared/CertificateGeneration/CertificateManager.cs

@@ -1,8 +1,6 @@
 // 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 || NETCOREAPP3_0
-
 namespace Microsoft.AspNetCore.Certificates.Generation
 {
     internal enum EnsureCertificateResult
@@ -16,5 +14,3 @@ internal enum EnsureCertificateResult
         UserCancelledTrustStep
     }
 }
-
-#endif

src/Shared/CertificateGeneration/EnsureCertificateResult.cs

@@ -1,8 +1,6 @@
 // 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 NETCOREAPP3_0
-
 using System;
 using System.IO;
 using System.Linq;
@@ -284,5 +282,3 @@ public void EnsureAspNetCoreHttpsDevelopmentCertificate_CanRemoveCertificates()
         }
     }
 }
-
-#endif