Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #9952

Merged
merged 14 commits into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
348 changes: 174 additions & 174 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

174 changes: 87 additions & 87 deletions eng/Versions.props

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Hosting/TestHost/test/ClientHandlerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Task ExpectedKeysAreAvailable()
var handler = new ClientHandler(new PathString("/A/Path/"), new DummyApplication(context =>
{
// TODO: Assert.True(context.RequestAborted.CanBeCanceled);
Assert.Equal("HTTP/2.0", context.Request.Protocol);
Assert.Equal("HTTP/1.1", context.Request.Protocol);
Assert.Equal("GET", context.Request.Method);
Assert.Equal("https", context.Request.Scheme);
Assert.Equal("/A/Path", context.Request.PathBase.Value);
Expand All @@ -55,7 +55,7 @@ public Task ExpectedKeysAreInFeatures()
var handler = new ClientHandler(new PathString("/A/Path/"), new InspectingApplication(features =>
{
// TODO: Assert.True(context.RequestAborted.CanBeCanceled);
Assert.Equal("HTTP/2.0", features.Get<IHttpRequestFeature>().Protocol);
Assert.Equal("HTTP/1.1", features.Get<IHttpRequestFeature>().Protocol);
Assert.Equal("GET", features.Get<IHttpRequestFeature>().Method);
Assert.Equal("https", features.Get<IHttpRequestFeature>().Scheme);
Assert.Equal("/A/Path", features.Get<IHttpRequestFeature>().PathBase);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public ApiResourceCollection(System.Collections.Generic.IList<IdentityServer4.Mo
public void AddApiResource(string name, System.Action<Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder> configure) { }
public void AddIdentityServerJwt(string name, System.Action<Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ApiResourceBuilder> configure) { }
public void AddRange(params IdentityServer4.Models.ApiResource[] resources) { }
public void AddRange(System.Collections.Generic.IEnumerable<IdentityServer4.Models.ApiResource> resources) { }
}
public static partial class ApplicationProfiles
{
Expand Down Expand Up @@ -84,7 +83,6 @@ public ClientCollection(System.Collections.Generic.IList<IdentityServer4.Models.
public void AddIdentityServerSPA(string clientId, System.Action<Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder> configure) { }
public void AddNativeApp(string clientId, System.Action<Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder> configure) { }
public void AddRange(params IdentityServer4.Models.Client[] clients) { }
public void AddRange(System.Collections.Generic.IEnumerable<IdentityServer4.Models.Client> clients) { }
public void AddSPA(string clientId, System.Action<Microsoft.AspNetCore.ApiAuthorization.IdentityServer.ClientBuilder> configure) { }
}
[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("*", Attributes="[asp-apiauth-parameters]")]
Expand Down Expand Up @@ -129,7 +127,6 @@ public void AddPhone(System.Action<Microsoft.AspNetCore.ApiAuthorization.Identit
public void AddProfile() { }
public void AddProfile(System.Action<Microsoft.AspNetCore.ApiAuthorization.IdentityServer.IdentityResourceBuilder> configure) { }
public void AddRange(params IdentityServer4.Models.IdentityResource[] identityResources) { }
public void AddRange(System.Collections.Generic.IEnumerable<IdentityServer4.Models.IdentityResource> identityResources) { }
}
public partial class IdentityServerJwtConstants
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// 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.

using System;
Expand Down Expand Up @@ -51,18 +51,6 @@ public ApiResource this[string key]
}
}

/// <summary>
/// Adds the resources in <paramref name="resources"/> to the collection.
/// </summary>
/// <param name="resources">The list of <see cref="ApiResource"/> to add.</param>
public void AddRange(IEnumerable<ApiResource> resources)
{
foreach (var resource in resources)
{
Add(resource);
}
}

/// <summary>
/// Adds the resources in <paramref name="resources"/> to the collection.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@ public Client this[string key]
}
}

/// <summary>
/// Adds the clients in <paramref name="clients"/> to the collection.
/// </summary>
/// <param name="clients">The list of <see cref="Client"/> to add.</param>
public void AddRange(IEnumerable<Client> clients)
{
foreach (var client in clients)
{
Add(client);
}
}

/// <summary>
/// Adds the clients in <paramref name="clients"/> to the collection.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// 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.

using IdentityServer4.Models;
Expand Down Expand Up @@ -51,18 +51,6 @@ public IdentityResource this[string key]
}
}

/// <summary>
/// Adds the identity resources in <paramref name="identityResources"/> to the collection.
/// </summary>
/// <param name="identityResources">The list of <see cref="IdentityResource"/> to add.</param>
public void AddRange(IEnumerable<IdentityResource> identityResources)
{
foreach (var resource in identityResources)
{
Add(resource);
}
}

/// <summary>
/// Adds the identity resources in <paramref name="identityResources"/> to the collection.
/// </summary>
Expand Down
14 changes: 6 additions & 8 deletions src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
{
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "Curl requires a custom install to support HTTP/2, see https://askubuntu.com/questions/884899/how-do-i-install-curl-with-http2-support")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
public class HandshakeTests : LoggedTest
{
Expand All @@ -30,14 +29,13 @@ public class HandshakeTests : LoggedTest

public HandshakeTests()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Client = new HttpClient(new HttpClientHandler
{
// We don't want the default SocketsHttpHandler, it doesn't support HTTP/2 yet.
Client = new HttpClient(new WinHttpHandler
{
ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
});
}
ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
})
{
DefaultRequestVersion = new Version(2, 0),
};
}

[ConditionalFact]
Expand Down
15 changes: 7 additions & 8 deletions src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// 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.

using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
Expand All @@ -21,7 +22,6 @@
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
{
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "Curl requires a custom install to support HTTP/2, see https://askubuntu.com/questions/884899/how-do-i-install-curl-with-http2-support")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
{
Expand All @@ -32,14 +32,13 @@ public class ShutdownTests : TestApplicationErrorLoggerLoggedTest

public ShutdownTests()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Client = new HttpClient(new HttpClientHandler
{
// We don't want the default SocketsHttpHandler, it doesn't support HTTP/2 yet.
Client = new HttpClient(new WinHttpHandler
{
ServerCertificateValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
});
}
ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
})
{
DefaultRequestVersion = new Version(2, 0),
};
}

[ConditionalFact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<Reference Include="Microsoft.Internal.AspNetCore.H2Spec.All" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Newtonsoft.Json" />
<Reference Include="System.Net.Http.WinHttpHandler" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
Expand All @@ -21,7 +21,6 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Newtonsoft.Json" />
<Reference Include="System.Net.Http.WinHttpHandler" />
</ItemGroup>

</Project>