Update last few projects to target netcoreapp3.0

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/TypeForwardingActivatorTests.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/XmlEncryption/DpapiXmlEncryptionTests.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/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj

@@ -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/test/Microsoft.AspNetCore.JsonPatch.Tests.csproj

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

src/Http/Http/src/StreamPipeReader.cs

@@ -8,7 +8,6 @@
 using System.IO.Pipelines;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -227,18 +226,7 @@ public override async ValueTask<ReadResult> ReadAsync(CancellationToken cancella
                 try
                 {
                     AllocateReadTail();
-#if NETCOREAPP3_0
                     var length = await _readingStream.ReadAsync(_readTail.AvailableMemory.Slice(_readTail.End), tokenSource.Token);
-#elif NETSTANDARD2_0
-                    if (!MemoryMarshal.TryGetArray<byte>(_readTail.AvailableMemory.Slice(_readTail.End), out var arraySegment))
-                    {
-                        ThrowHelper.CreateInvalidOperationException_NoArrayFromMemory();
-                    }
-
-                    var length = await _readingStream.ReadAsync(arraySegment.Array, arraySegment.Offset, arraySegment.Count, tokenSource.Token);
-#else
-#error Target frameworks need to be updated.
-#endif
                     Debug.Assert(length + _readTail.End <= _readTail.AvailableMemory.Length);
 
                     _readTail.End += length;

src/Http/Http/src/StreamPipeWriter.cs

@@ -8,14 +8,13 @@
 using System.IO.Pipelines;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.Http
 {
     /// <summary>
-    /// Implements PipeWriter using a underlying stream. 
+    /// Implements PipeWriter using a underlying stream.
     /// </summary>
     public class StreamPipeWriter : PipeWriter, IDisposable
     {
@@ -50,7 +49,7 @@ private CancellationTokenSource InternalTokenSource
         }
 
         /// <summary>
-        /// Creates a new StreamPipeWrapper 
+        /// Creates a new StreamPipeWrapper
         /// </summary>
         /// <param name="writingStream">The stream to write to</param>
         public StreamPipeWriter(Stream writingStream) : this(writingStream, 4096)
@@ -174,14 +173,7 @@ private async ValueTask<FlushResult> FlushAsyncInternal(CancellationToken cancel
                         for (var i = 0; i < count; i++)
                         {
                             var segment = _completedSegments[0];
-#if NETCOREAPP3_0
                             await _writingStream.WriteAsync(segment.Buffer.Slice(0, segment.Length), localToken);
-#elif NETSTANDARD2_0
-                            MemoryMarshal.TryGetArray<byte>(segment.Buffer, out var arraySegment);
-                            await _writingStream.WriteAsync(arraySegment.Array, 0, segment.Length, localToken);
-#else
-#error Target frameworks need to be updated.
-#endif
                             _bytesWritten -= segment.Length;
                             segment.Return();
                             _completedSegments.RemoveAt(0);
@@ -190,14 +182,7 @@ private async ValueTask<FlushResult> FlushAsyncInternal(CancellationToken cancel
 
                     if (!_currentSegment.IsEmpty)
                     {
-#if NETCOREAPP3_0
                         await _writingStream.WriteAsync(_currentSegment.Slice(0, _position), localToken);
-#elif NETSTANDARD2_0
-                        MemoryMarshal.TryGetArray<byte>(_currentSegment, out var arraySegment);
-                        await _writingStream.WriteAsync(arraySegment.Array, 0, _position, localToken);
-#else
-#error Target frameworks need to be updated.
-#endif
                         _bytesWritten -= _position;
                         _position = 0;
                     }

src/Http/Http/test/StreamPipeReaderTests.cs

@@ -565,14 +565,6 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
                 await Task.Yield();
                 return await base.ReadAsync(buffer, offset, count, cancellationToken);
             }
-
-#if NETCOREAPP2_2
-            public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
-            {
-                await Task.Yield();
-                return await base.ReadAsync(buffer, cancellationToken);
-            }
-#endif
         }
     }
 }

src/Http/Http/test/StreamPipeWriterTests.cs

@@ -311,13 +311,6 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             await Task.Delay(30000, cancellationToken);
             return 0;
         }
-#if NETCOREAPP2_2
-        public override async ValueTask<int> ReadAsync(Memory<byte> destination, CancellationToken cancellationToken = default)
-        {
-            await Task.Delay(30000, cancellationToken);
-            return 0;
-        }
-#endif
     }
 
     internal class SingleWriteStream : MemoryStream
@@ -326,28 +319,6 @@ internal class SingleWriteStream : MemoryStream
 
         public bool AllowAllWrites { get; set; }
 
-
-#if NETCOREAPP2_2
-        public override async ValueTask WriteAsync(ReadOnlyMemory<byte> source, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                if (_shouldNextWriteFail && !AllowAllWrites)
-                {
-                    await Task.Delay(30000, cancellationToken);
-                }
-                else
-                {
-                    await base.WriteAsync(source, cancellationToken);
-                }
-            }
-            finally
-            {
-                _shouldNextWriteFail = !_shouldNextWriteFail;
-            }
-        }
-#endif
-
         public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
             try

src/PackageArchive/ZipManifestGenerator/ZipManifestGenerator.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>