Skip to content

Commit c9982af

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/11.0-preview6] Source code updates from dotnet/dotnet (#67717)
* Backflow from https://github.com/dotnet/dotnet / ba53d0e build 322330 Diff: https://github.com/dotnet/dotnet/compare/1d9446325283193006b1f7acd2744514663c3ca1..ba53d0ed335bed4ab7bfd01988c8e3953ee5ffbe From: dotnet/dotnet@1d94463 To: dotnet/dotnet@ba53d0e [[ commit created by automation ]] * Update dependencies from build 322330 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting (Version 11.0.0-preview.6.26319.105 -> 11.0.0-preview.6.26359.118) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 11.0.0-beta.26319.105 -> 11.0.0-beta.26359.118) Microsoft.Web.Xdt (Version 3.3.0-preview.6.26319.105 -> 3.3.0-preview.6.26359.118) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.9.0-rc.32005 -> 7.9.0-rc.36018) [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 4316d23 commit c9982af

10 files changed

Lines changed: 298 additions & 291 deletions

File tree

‎eng/Signing.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
<FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />
1616
<FileSignInfo Include="Mono.Cecil.Pdb.dll" CertificateName="3PartySHA2" />
1717
<FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
18+
<FileSignInfo Include="OpenTelemetry.Api.ProviderBuilderExtensions.dll" CertificateName="3PartySHA2" />
19+
<FileSignInfo Include="OpenTelemetry.Api.dll" CertificateName="3PartySHA2" />
20+
<FileSignInfo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.dll" CertificateName="3PartySHA2" />
21+
<FileSignInfo Include="OpenTelemetry.Extensions.Hosting.dll" CertificateName="3PartySHA2" />
22+
<FileSignInfo Include="OpenTelemetry.Instrumentation.AspNetCore.dll" CertificateName="3PartySHA2" />
23+
<FileSignInfo Include="OpenTelemetry.Instrumentation.Http.dll" CertificateName="3PartySHA2" />
24+
<FileSignInfo Include="OpenTelemetry.Instrumentation.Runtime.dll" CertificateName="3PartySHA2" />
25+
<FileSignInfo Include="OpenTelemetry.dll" CertificateName="3PartySHA2" />
1826
</ItemGroup>
1927

2028
<ItemGroup>

‎eng/Version.Details.props‎

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml‎

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"jdk": "latest"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26319.105",
26-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26319.105",
27-
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26319.105",
25+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26359.118",
26+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26359.118",
27+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26359.118",
2828
"Microsoft.Build.NoTargets": "3.7.0",
2929
"Microsoft.Build.Traversal": "3.4.0",
3030
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4"

‎src/Components/Directory.Build.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
33

44
<PropertyGroup>
5-
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
5+
<!--
6+
TypeScript in this tree is compiled via npm/rollup (e.g. Interop\ -> dist\), not by the
7+
MSBuild TypeScript toolchain. Block the SDK's TypeScript compilation so neither the
8+
VS-installed targets nor the StaticWebAssets TypeScript target try to compile our .ts files.
9+
-->
10+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
611
</PropertyGroup>
712

813
<PropertyGroup>

‎src/Components/test/testassets/Directory.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\..\, Directory.Build.props))\Directory.Build.props" />
33

44
<PropertyGroup>
5-
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
5+
<!-- TypeScript here is built via npm/rollup; block the MSBuild TypeScript toolchain. -->
6+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
67
</PropertyGroup>
78

89
<PropertyGroup>

‎src/Components/test/testassets/LazyTestContentPackage/LazyTestContentPackage.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
<StaticWebAssetBasePath>_content/TestContentPackage</StaticWebAssetBasePath>
77
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
11-
</PropertyGroup>
12-
139
<ItemGroup>
1410
<Reference Include="Microsoft.AspNetCore.Components" />
1511
<Reference Include="Microsoft.AspNetCore.Components.Web" />

‎src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
<StaticWebAssetBasePath>_content/TestContentPackage</StaticWebAssetBasePath>
77
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
11-
</PropertyGroup>
12-
139
<ItemGroup>
1410
<Reference Include="Microsoft.AspNetCore.Components" />
1511
<Reference Include="Microsoft.AspNetCore.Components.Authorization" />

‎src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected IdentityUserContext() { }
142142

143143
private sealed class PersonalDataConverter : ValueConverter<string, string>
144144
{
145-
public PersonalDataConverter(IPersonalDataProtector protector) : base(s => protector.Protect(s), s => protector.Unprotect(s), default)
145+
public PersonalDataConverter(IPersonalDataProtector protector) : base(s => protector.Protect(s), s => protector.Unprotect(s))
146146
{ }
147147
}
148148

‎src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<Reference Include="Microsoft.AspNetCore.Hosting" />
1515
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
1616
<Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />
17+
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
1718
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
1819
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes" />
1920
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Quic" />

0 commit comments

Comments
 (0)