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

[main] Update dependencies from dotnet/runtime dotnet/efcore #48014

Merged
merged 16 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5ea1e00
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 2, 2023
a0e3261
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 2, 2023
04b5649
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 2, 2023
abb1ed0
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 3, 2023
38b69bb
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 3, 2023
4fc4a4d
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 3, 2023
ed86d27
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 3, 2023
26186fd
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] May 4, 2023
3c266f8
Rename IndexOfAnyValues to SearchValues (#48067)
MihaZupan May 4, 2023
46368c4
Make parameterless constructors on SafeHandle-derived types public.
jkoritzinsky May 4, 2023
25c6aea
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] May 4, 2023
ae91643
Add IL compiler package conditional on PublishAot.
mitchdenny May 4, 2023
918c7ff
fixup! Add IL compiler package conditional on PublishAot.
RussKie May 5, 2023
1ab869c
Suppress reference warning for ILCompiler package.
mitchdenny May 5, 2023
7836adf
Merge branch 'darc-main-6d293505-ab46-4893-aaa8-3f1828bbdebf' of http…
mitchdenny May 5, 2023
708cbc9
Update Directory.Build.props.in
mitchdenny May 5, 2023
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
280 changes: 140 additions & 140 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions eng/Versions.props

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions eng/tools/GenerateFiles/Directory.Build.props.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
<ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
<TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
<LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>

<!-- Temporarily hardcoded to true -->
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
</PropertyGroup>
</Project>
8 changes: 6 additions & 2 deletions eng/tools/GenerateFiles/Directory.Build.targets.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
RuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />

<PackageReference Include="Microsoft.Dotnet.ILCompiler"
Condition=" '$(PublishAot)' == 'true' "
Version="${MicrosoftNETCoreAppRuntimeVersion}" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -121,8 +125,8 @@
<Warning Text="Requested Microsoft.AspNetCore.App v${MicrosoftAspNetCoreAppRuntimeVersion} does not exist."
Condition=" !EXISTS('$(_DotNetRoot)shared\Microsoft.AspNetCore.App\${MicrosoftAspNetCoreAppRuntimeVersion}') " />
</Target>
<!--

<!--
Make a netstandard2.1 copy of the .net ILLinkPack to work around a trimming issue.
See https://github.com/dotnet/linker/issues/3175
-->
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Components/src/Routing/TemplateParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Components.Routing;
// * Catch-all parameters (Like /blog/{*slug})
internal sealed class TemplateParser
{
private static readonly IndexOfAnyValues<char> _invalidParameterNameCharacters = IndexOfAnyValues.Create("{}=.");
private static readonly SearchValues<char> _invalidParameterNameCharacters = SearchValues.Create("{}=.");

internal static RouteTemplate ParseTemplate(string template)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles;
internal sealed unsafe class BCryptAlgorithmHandle : BCryptHandle
{
// Called by P/Invoke when returning SafeHandles
private BCryptAlgorithmHandle() { }
public BCryptAlgorithmHandle() { }

/// <summary>
/// Creates an unkeyed hash handle from this hash algorithm.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal sealed unsafe class BCryptHashHandle : BCryptHandle
private BCryptAlgorithmHandle? _algProviderHandle;

// Called by P/Invoke when returning SafeHandles
private BCryptHashHandle() { }
public BCryptHashHandle() { }

/// <summary>
/// Duplicates this hash handle, including any existing hashed state.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal sealed class BCryptKeyHandle : BCryptHandle
private BCryptAlgorithmHandle? _algProviderHandle;

// Called by P/Invoke when returning SafeHandles
private BCryptKeyHandle() { }
public BCryptKeyHandle() { }

// Do not provide a finalizer - SafeHandle's critical finalizer will call ReleaseHandle for you.
protected override bool ReleaseHandle()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles;
internal class LocalAllocHandle : SafeHandleZeroOrMinusOneIsInvalid
{
// Called by P/Invoke when returning SafeHandles
protected LocalAllocHandle()
public LocalAllocHandle()
: base(ownsHandle: true) { }

// Do not provide a finalizer - SafeHandle's critical finalizer will call ReleaseHandle for you.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles;

internal sealed unsafe class NCryptDescriptorHandle : SafeHandleZeroOrMinusOneIsInvalid
{
private NCryptDescriptorHandle()
public NCryptDescriptorHandle()
: base(ownsHandle: true)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles;
internal sealed unsafe partial class SafeLibraryHandle : SafeHandleZeroOrMinusOneIsInvalid
{
// Called by P/Invoke when returning SafeHandles
private SafeLibraryHandle()
public SafeLibraryHandle()
: base(ownsHandle: true)
{ }

Expand Down
4 changes: 2 additions & 2 deletions src/Http/Headers/src/ContentDispositionHeaderValue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class ContentDispositionHeaderValue

// attr-char definition from RFC5987
// Same as token except ( "*" / "'" / "%" )
private static readonly IndexOfAnyValues<char> AttrChar =
IndexOfAnyValues.Create("!#$&+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~");
private static readonly SearchValues<char> AttrChar =
SearchValues.Create("!#$&+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~");

private static readonly HttpHeaderParser<ContentDispositionHeaderValue> Parser
= new GenericHeaderParser<ContentDispositionHeaderValue>(false, GetDispositionTypeLength);
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Routing/src/Patterns/RoutePatternParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal static class RoutePatternParser
private const char QuestionMark = '?';
private const string PeriodString = ".";

internal static readonly IndexOfAnyValues<char> InvalidParameterNameChars = IndexOfAnyValues.Create("/{}?*");
internal static readonly SearchValues<char> InvalidParameterNameChars = SearchValues.Create("/{}?*");

public static RoutePattern Parse(string pattern)
{
Expand Down
12 changes: 6 additions & 6 deletions src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ public class ForwardedHeadersMiddleware
private IList<StringSegment>? _allowedHosts;

// RFC 3986 scheme = ALPHA * (ALPHA / DIGIT / "+" / "-" / ".")
private static readonly IndexOfAnyValues<char> SchemeChars =
IndexOfAnyValues.Create("+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
private static readonly SearchValues<char> SchemeChars =
SearchValues.Create("+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");

// Host Matches Http.Sys and Kestrel
// Host Matches RFC 3986 except "*" / "+" / "," / ";" / "=" and "%" HEXDIG HEXDIG which are not allowed by Http.Sys
private static readonly IndexOfAnyValues<char> HostChars =
IndexOfAnyValues.Create("!$&'()-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~");
private static readonly SearchValues<char> HostChars =
SearchValues.Create("!$&'()-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~");

// 0-9 / A-F / a-f / ":" / "."
private static readonly IndexOfAnyValues<char> Ipv6HostChars =
IndexOfAnyValues.Create(".0123456789:ABCDEFabcdef");
private static readonly SearchValues<char> Ipv6HostChars =
SearchValues.Create(".0123456789:ABCDEFabcdef");

/// <summary>
/// Create a new <see cref="ForwardedHeadersMiddleware"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys;
// This class is a wrapper for Http.sys V2 request queue handle.
internal sealed class HttpRequestQueueV2Handle : SafeHandleZeroOrMinusOneIsInvalid
{
private HttpRequestQueueV2Handle()
public HttpRequestQueueV2Handle()
: base(true)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys;
internal sealed unsafe partial class SafeLibraryHandle : SafeHandleZeroOrMinusOneIsInvalid
{
// Called by P/Invoke when returning SafeHandles
private SafeLibraryHandle()
public SafeLibraryHandle()
: base(ownsHandle: true)
{
}
Expand Down
4 changes: 2 additions & 2 deletions src/Shared/HttpRuleParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ internal static class HttpRuleParser
{
// token = 1*<any CHAR except CTLs or separators>
// CTL = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
private static readonly IndexOfAnyValues<char> TokenChars =
IndexOfAnyValues.Create("!#$%&'*+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~");
private static readonly SearchValues<char> TokenChars =
SearchValues.Create("!#$%&'*+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~");

private const int MaxNestedCount = 5;
private static readonly string[] DateFormats = new string[]
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/HttpSys/NativeInterop/HeapAllocHandle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal sealed class HeapAllocHandle : SafeHandleZeroOrMinusOneIsInvalid
private static readonly IntPtr ProcessHeap = UnsafeNclNativeMethods.GetProcessHeap();

// Called by P/Invoke when returning SafeHandles
private HeapAllocHandle()
public HeapAllocHandle()
: base(ownsHandle: true)
{
}
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/HttpSys/NativeInterop/SafeLocalMemHandle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.HttpSys.Internal;

internal sealed class SafeLocalMemHandle : SafeHandleZeroOrMinusOneIsInvalid
{
internal SafeLocalMemHandle()
public SafeLocalMemHandle()
: base(true)
{
}
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/HttpSys/NativeInterop/SafeNativeOverlapped.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal sealed class SafeNativeOverlapped : SafeHandle
internal static readonly SafeNativeOverlapped Zero = new SafeNativeOverlapped();
private readonly ThreadPoolBoundHandle? _boundHandle;

internal SafeNativeOverlapped()
public SafeNativeOverlapped()
: base(IntPtr.Zero, true)
{
}
Expand Down
12 changes: 6 additions & 6 deletions src/Shared/ServerInfrastructure/HttpCharacters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ internal static class HttpCharacters
// 127.0.0.1
// [email protected]
// user:[email protected]
private static readonly IndexOfAnyValues<byte> _allowedAuthorityBytes = IndexOfAnyValues.Create(":.-[]@0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8);
private static readonly SearchValues<byte> _allowedAuthorityBytes = SearchValues.Create(":.-[]@0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8);

// Matches Http.Sys
// Matches RFC 3986 except "*" / "+" / "," / ";" / "=" and "%" HEXDIG HEXDIG which are not allowed by Http.Sys
private static readonly IndexOfAnyValues<char> _allowedHostChars = IndexOfAnyValues.Create("!$&'()-._~" + AlphaNumeric);
private static readonly SearchValues<char> _allowedHostChars = SearchValues.Create("!$&'()-._~" + AlphaNumeric);

// tchar https://tools.ietf.org/html/rfc7230#appendix-B
private static readonly IndexOfAnyValues<char> _allowedTokenChars = IndexOfAnyValues.Create("!#$%&'*+-.^_`|~" + AlphaNumeric);
private static readonly IndexOfAnyValues<byte> _allowedTokenBytes = IndexOfAnyValues.Create("!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8);
private static readonly SearchValues<char> _allowedTokenChars = SearchValues.Create("!#$%&'*+-.^_`|~" + AlphaNumeric);
private static readonly SearchValues<byte> _allowedTokenBytes = SearchValues.Create("!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8);

// field-value https://tools.ietf.org/html/rfc7230#section-3.2
// HTAB, [VCHAR, SP]
private static readonly IndexOfAnyValues<char> _allowedFieldChars = IndexOfAnyValues.Create("\t !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" + AlphaNumeric);
private static readonly SearchValues<char> _allowedFieldChars = SearchValues.Create("\t !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" + AlphaNumeric);

// Values are [0x00, 0x1F] without 0x09 (HTAB) and with 0x7F.
private static readonly IndexOfAnyValues<char> _invalidFieldChars = IndexOfAnyValues.Create(
private static readonly SearchValues<char> _invalidFieldChars = SearchValues.Create(
"\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u000A\u000B\u000C\u000D\u000E\u000F\u0010" +
"\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\u007F");

Expand Down