From dabd3463ba51e239d94dee8f3546793788193f1b Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Wed, 16 Jan 2019 14:46:39 -0800
Subject: [PATCH] few extra conflicts

---
 src/Http/Routing/src/DataSourceDependentCache.cs             | 3 ---
 .../AuthSamples.FunctionalTests.csproj                       | 2 +-
 src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs        | 5 -----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Http/Routing/src/DataSourceDependentCache.cs b/src/Http/Routing/src/DataSourceDependentCache.cs
index cfd41cf15b..2f08da69cb 100644
--- a/src/Http/Routing/src/DataSourceDependentCache.cs
+++ b/src/Http/Routing/src/DataSourceDependentCache.cs
@@ -22,9 +22,6 @@ namespace Microsoft.AspNetCore.Routing
         private IDisposable _disposable;
         private bool _disposed;
 
-        private IDisposable _disposable;
-        private bool _disposed;
-
         public DataSourceDependentCache(EndpointDataSource dataSource, Func<IReadOnlyList<Endpoint>, T> initialize)
         {
             if (dataSource == null)
diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
index 3f0cea150a..2f3e6efb97 100644
--- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
+++ b/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>
diff --git a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs
index fa899baac8..96e230fd64 100644
--- a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs
+++ b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs
@@ -739,12 +739,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
             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]