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

Merge branch 'merge/release/2.2-to-master'

This commit is contained in:
James Newton-King 2018-07-26 11:43:49 +12:00
parent c4bc628aa6 c68c5befc7
commit 259ccd29e5
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
5 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
View File

@ -34,8 +34,6 @@ namespace Microsoft.AspNetCore.Routing
_lock = new object();
}
public override IChangeToken ChangeToken => GetChangeToken();
public override IChangeToken GetChangeToken()
{
EnsureInitialized();

2
src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
View File

@ -23,8 +23,6 @@ namespace Microsoft.AspNetCore.Routing
_endpoints.AddRange(endpoints);
}
public override IChangeToken ChangeToken => GetChangeToken();
public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
public override IReadOnlyList<Endpoint> Endpoints => _endpoints;

10
src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs
View File

@ -8,15 +8,7 @@ namespace Microsoft.AspNetCore.Routing
{
public abstract class EndpointDataSource
{
public virtual IChangeToken ChangeToken { get; }
// Plan is to replace ChangeToken property with GetChangeToken
// Temporarily have both to avoid breaking MVC
// https://github.com/aspnet/Routing/issues/634
public virtual IChangeToken GetChangeToken()
{
return ChangeToken;
}
public abstract IChangeToken GetChangeToken();
public abstract IReadOnlyList<Endpoint> Endpoints { get; }
}

1
test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
View File

@ -174,7 +174,6 @@ namespace Microsoft.AspNetCore.Routing
}
public override IChangeToken GetChangeToken() => _token;
public override IChangeToken ChangeToken => GetChangeToken();
public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>();
}
}

2
test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
View File

@ -25,8 +25,6 @@ namespace Microsoft.AspNetCore.Routing.TestObjects
public override IChangeToken GetChangeToken() => _changeToken;
public override IChangeToken ChangeToken => GetChangeToken();
public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
// Trigger change