diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e25257d9e067..f24057eb0f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,291 +9,291 @@ --> - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/efcore - 02c91806cb8cdc5d762aaad7bd5e61a811001d76 + f8800f1642c7cad484ba47bcf2ebf469effa1257 - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e https://github.com/dotnet/source-build-externals cb598bcb90efd58d99305c9e1efd09513e667c00 - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e https://github.com/dotnet/xdt @@ -326,9 +326,9 @@ - + https://github.com/dotnet/runtime - 25f09dea3cebc63ef4d780daa90943fcaaacdd35 + 3232ad36a791b7b8dce81c3358cd6cec4e42c06e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index c13edce5ba0d..6352444dad49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,78 +63,78 @@ --> - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 - 8.0.0-preview.5.23251.1 - 8.0.0-preview.5.23251.1 + 8.0.0-preview.5.23254.1 + 8.0.0-preview.5.23254.1 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 - 8.0.0-preview.5.23229.3 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 + 8.0.0-preview.5.23254.6 4.4.0-4.22520.2 4.4.0-4.22520.2 diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in index 13205d2f4961..619ec1ded3d9 100644 --- a/eng/tools/GenerateFiles/Directory.Build.props.in +++ b/eng/tools/GenerateFiles/Directory.Build.props.in @@ -4,5 +4,8 @@ ${ArtifactsShippingPackagesDir} true ${LibNetHostAppPackVersion} + + + true diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index 2764eb1a609e..a6d483dd22fa 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -36,6 +36,10 @@ Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' " RuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" /> + + @@ -121,8 +125,8 @@ - - diff --git a/src/Components/Components/src/Routing/TemplateParser.cs b/src/Components/Components/src/Routing/TemplateParser.cs index 778e5b55b6e4..560420b273ea 100644 --- a/src/Components/Components/src/Routing/TemplateParser.cs +++ b/src/Components/Components/src/Routing/TemplateParser.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Components.Routing; // * Catch-all parameters (Like /blog/{*slug}) internal sealed class TemplateParser { - private static readonly IndexOfAnyValues _invalidParameterNameCharacters = IndexOfAnyValues.Create("{}=."); + private static readonly SearchValues _invalidParameterNameCharacters = SearchValues.Create("{}=."); internal static RouteTemplate ParseTemplate(string template) { diff --git a/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptAlgorithmHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptAlgorithmHandle.cs index 85fc3378bf1c..e7130e3d82c6 100644 --- a/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptAlgorithmHandle.cs +++ b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptAlgorithmHandle.cs @@ -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() { } /// /// Creates an unkeyed hash handle from this hash algorithm. diff --git a/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHashHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHashHandle.cs index 6fcf47c06702..2f9efa021bb3 100644 --- a/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHashHandle.cs +++ b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHashHandle.cs @@ -10,7 +10,7 @@ internal sealed unsafe class BCryptHashHandle : BCryptHandle private BCryptAlgorithmHandle? _algProviderHandle; // Called by P/Invoke when returning SafeHandles - private BCryptHashHandle() { } + public BCryptHashHandle() { } /// /// Duplicates this hash handle, including any existing hashed state. diff --git a/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptKeyHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptKeyHandle.cs index b217b9b29d25..511adef7f688 100644 --- a/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptKeyHandle.cs +++ b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptKeyHandle.cs @@ -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() diff --git a/src/DataProtection/Cryptography.Internal/src/SafeHandles/LocalAllocHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/LocalAllocHandle.cs index 64f97860f92d..cc8b9c3b4b99 100644 --- a/src/DataProtection/Cryptography.Internal/src/SafeHandles/LocalAllocHandle.cs +++ b/src/DataProtection/Cryptography.Internal/src/SafeHandles/LocalAllocHandle.cs @@ -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. diff --git a/src/DataProtection/Cryptography.Internal/src/SafeHandles/NCryptDescriptorHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/NCryptDescriptorHandle.cs index e1dbb277273d..2e51a129233f 100644 --- a/src/DataProtection/Cryptography.Internal/src/SafeHandles/NCryptDescriptorHandle.cs +++ b/src/DataProtection/Cryptography.Internal/src/SafeHandles/NCryptDescriptorHandle.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles; internal sealed unsafe class NCryptDescriptorHandle : SafeHandleZeroOrMinusOneIsInvalid { - private NCryptDescriptorHandle() + public NCryptDescriptorHandle() : base(ownsHandle: true) { } diff --git a/src/DataProtection/Cryptography.Internal/src/SafeHandles/SafeLibraryHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/SafeLibraryHandle.cs index 98e70e084c4d..dfb93d2180c1 100644 --- a/src/DataProtection/Cryptography.Internal/src/SafeHandles/SafeLibraryHandle.cs +++ b/src/DataProtection/Cryptography.Internal/src/SafeHandles/SafeLibraryHandle.cs @@ -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) { } diff --git a/src/Http/Headers/src/ContentDispositionHeaderValue.cs b/src/Http/Headers/src/ContentDispositionHeaderValue.cs index dd4647ec5ee6..31b88417b603 100644 --- a/src/Http/Headers/src/ContentDispositionHeaderValue.cs +++ b/src/Http/Headers/src/ContentDispositionHeaderValue.cs @@ -37,8 +37,8 @@ public class ContentDispositionHeaderValue // attr-char definition from RFC5987 // Same as token except ( "*" / "'" / "%" ) - private static readonly IndexOfAnyValues AttrChar = - IndexOfAnyValues.Create("!#$&+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~"); + private static readonly SearchValues AttrChar = + SearchValues.Create("!#$&+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~"); private static readonly HttpHeaderParser Parser = new GenericHeaderParser(false, GetDispositionTypeLength); diff --git a/src/Http/Routing/src/Patterns/RoutePatternParser.cs b/src/Http/Routing/src/Patterns/RoutePatternParser.cs index 5fa61727f3b2..268aee537973 100644 --- a/src/Http/Routing/src/Patterns/RoutePatternParser.cs +++ b/src/Http/Routing/src/Patterns/RoutePatternParser.cs @@ -16,7 +16,7 @@ internal static class RoutePatternParser private const char QuestionMark = '?'; private const string PeriodString = "."; - internal static readonly IndexOfAnyValues InvalidParameterNameChars = IndexOfAnyValues.Create("/{}?*"); + internal static readonly SearchValues InvalidParameterNameChars = SearchValues.Create("/{}?*"); public static RoutePattern Parse(string pattern) { diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs index b9c3cbbda3fe..9b7651e74a7c 100644 --- a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs +++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs @@ -25,17 +25,17 @@ public class ForwardedHeadersMiddleware private IList? _allowedHosts; // RFC 3986 scheme = ALPHA * (ALPHA / DIGIT / "+" / "-" / ".") - private static readonly IndexOfAnyValues SchemeChars = - IndexOfAnyValues.Create("+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); + private static readonly SearchValues 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 HostChars = - IndexOfAnyValues.Create("!$&'()-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"); + private static readonly SearchValues HostChars = + SearchValues.Create("!$&'()-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"); // 0-9 / A-F / a-f / ":" / "." - private static readonly IndexOfAnyValues Ipv6HostChars = - IndexOfAnyValues.Create(".0123456789:ABCDEFabcdef"); + private static readonly SearchValues Ipv6HostChars = + SearchValues.Create(".0123456789:ABCDEFabcdef"); /// /// Create a new . diff --git a/src/Servers/HttpSys/src/NativeInterop/HttpRequestQueueV2Handle.cs b/src/Servers/HttpSys/src/NativeInterop/HttpRequestQueueV2Handle.cs index 9f81792bb6e6..d792748c8934 100644 --- a/src/Servers/HttpSys/src/NativeInterop/HttpRequestQueueV2Handle.cs +++ b/src/Servers/HttpSys/src/NativeInterop/HttpRequestQueueV2Handle.cs @@ -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) { } diff --git a/src/Servers/HttpSys/src/NativeInterop/SafeLibraryHandle.cs b/src/Servers/HttpSys/src/NativeInterop/SafeLibraryHandle.cs index 1f90207dee9e..821a2b7c389b 100644 --- a/src/Servers/HttpSys/src/NativeInterop/SafeLibraryHandle.cs +++ b/src/Servers/HttpSys/src/NativeInterop/SafeLibraryHandle.cs @@ -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) { } diff --git a/src/Shared/HttpRuleParser.cs b/src/Shared/HttpRuleParser.cs index e5b8a56d2725..e171db6ca266 100644 --- a/src/Shared/HttpRuleParser.cs +++ b/src/Shared/HttpRuleParser.cs @@ -13,8 +13,8 @@ internal static class HttpRuleParser { // token = 1* // CTL = - private static readonly IndexOfAnyValues TokenChars = - IndexOfAnyValues.Create("!#$%&'*+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~"); + private static readonly SearchValues TokenChars = + SearchValues.Create("!#$%&'*+-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz|~"); private const int MaxNestedCount = 5; private static readonly string[] DateFormats = new string[] diff --git a/src/Shared/HttpSys/NativeInterop/HeapAllocHandle.cs b/src/Shared/HttpSys/NativeInterop/HeapAllocHandle.cs index b449a76d1f18..68c3b26ccb7c 100644 --- a/src/Shared/HttpSys/NativeInterop/HeapAllocHandle.cs +++ b/src/Shared/HttpSys/NativeInterop/HeapAllocHandle.cs @@ -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) { } diff --git a/src/Shared/HttpSys/NativeInterop/SafeLocalMemHandle.cs b/src/Shared/HttpSys/NativeInterop/SafeLocalMemHandle.cs index 492e342e22bb..049f8abc00fa 100644 --- a/src/Shared/HttpSys/NativeInterop/SafeLocalMemHandle.cs +++ b/src/Shared/HttpSys/NativeInterop/SafeLocalMemHandle.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.HttpSys.Internal; internal sealed class SafeLocalMemHandle : SafeHandleZeroOrMinusOneIsInvalid { - internal SafeLocalMemHandle() + public SafeLocalMemHandle() : base(true) { } diff --git a/src/Shared/HttpSys/NativeInterop/SafeNativeOverlapped.cs b/src/Shared/HttpSys/NativeInterop/SafeNativeOverlapped.cs index e2b5304ade96..df975315c305 100644 --- a/src/Shared/HttpSys/NativeInterop/SafeNativeOverlapped.cs +++ b/src/Shared/HttpSys/NativeInterop/SafeNativeOverlapped.cs @@ -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) { } diff --git a/src/Shared/ServerInfrastructure/HttpCharacters.cs b/src/Shared/ServerInfrastructure/HttpCharacters.cs index 799c240a5bc5..473e57f76280 100644 --- a/src/Shared/ServerInfrastructure/HttpCharacters.cs +++ b/src/Shared/ServerInfrastructure/HttpCharacters.cs @@ -19,22 +19,22 @@ internal static class HttpCharacters // 127.0.0.1 // user@host.com // user:password@host.com - private static readonly IndexOfAnyValues _allowedAuthorityBytes = IndexOfAnyValues.Create(":.-[]@0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8); + private static readonly SearchValues _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 _allowedHostChars = IndexOfAnyValues.Create("!$&'()-._~" + AlphaNumeric); + private static readonly SearchValues _allowedHostChars = SearchValues.Create("!$&'()-._~" + AlphaNumeric); // tchar https://tools.ietf.org/html/rfc7230#appendix-B - private static readonly IndexOfAnyValues _allowedTokenChars = IndexOfAnyValues.Create("!#$%&'*+-.^_`|~" + AlphaNumeric); - private static readonly IndexOfAnyValues _allowedTokenBytes = IndexOfAnyValues.Create("!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8); + private static readonly SearchValues _allowedTokenChars = SearchValues.Create("!#$%&'*+-.^_`|~" + AlphaNumeric); + private static readonly SearchValues _allowedTokenBytes = SearchValues.Create("!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"u8); // field-value https://tools.ietf.org/html/rfc7230#section-3.2 // HTAB, [VCHAR, SP] - private static readonly IndexOfAnyValues _allowedFieldChars = IndexOfAnyValues.Create("\t !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" + AlphaNumeric); + private static readonly SearchValues _allowedFieldChars = SearchValues.Create("\t !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" + AlphaNumeric); // Values are [0x00, 0x1F] without 0x09 (HTAB) and with 0x7F. - private static readonly IndexOfAnyValues _invalidFieldChars = IndexOfAnyValues.Create( + private static readonly SearchValues _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");