few extra conflicts

Author: jkotalik

src/Http/Routing/src/DataSourceDependentCache.cs

@@ -22,9 +22,6 @@ internal sealed class DataSourceDependentCache<T> : IDisposable where T : class
         private IDisposable _disposable;
         private bool _disposed;
 
-        private IDisposable _disposable;
-        private bool _disposed;
-
         public DataSourceDependentCache(EndpointDataSource dataSource, Func<IReadOnlyList<Endpoint>, T> initialize)
         {
             if (dataSource == null)

src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsSampleProject>false</IsSampleProject>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>

src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs

@@ -739,12 +739,7 @@ public void RequestAbortedTokenIsFullyUsableAfterCancellation()
             Assert.True(originalToken.WaitHandle.WaitOne(TestConstants.DefaultTimeout));
             Assert.True(_http1Connection.RequestAborted.WaitHandle.WaitOne(TestConstants.DefaultTimeout));
 
-#if NETCOREAPP2_2
             Assert.Equal(originalToken, originalRegistration.Token);
-#elif NET461
-#else
-#error Target framework needs to be updated
-#endif
         }
 
         [Fact]