huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

few extra conflicts

This commit is contained in:
Justin Kotalik 2019-01-16 14:46:39 -08:00
parent e6d547a923
commit dabd3463ba
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Http/Routing/src/DataSourceDependentCache.cs
View File

@ -22,9 +22,6 @@ namespace Microsoft.AspNetCore.Routing
private IDisposable _disposable; private IDisposable _disposable;
private bool _disposed; private bool _disposed;
private IDisposable _disposable;
private bool _disposed;
public DataSourceDependentCache(EndpointDataSource dataSource, Func<IReadOnlyList<Endpoint>, T> initialize) public DataSourceDependentCache(EndpointDataSource dataSource, Func<IReadOnlyList<Endpoint>, T> initialize)
{ {
if (dataSource == null) if (dataSource == null)

2
src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
View File

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

5
src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs
View File

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