Skip to content

[release/11.0-preview6] Source code updates from dotnet/dotnet #67439

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.

Sign up for GitHub

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

Closed
dotnet-maestro wants to merge 15 commits into from
Closed

[release/11.0-preview6] Source code updates from dotnet/dotnet #67439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8230809
Backflow from https://github.com/dotnet/dotnet / a512c3a build 320350
dotnet-maestro[bot] Jun 26, 2026
a0b134e
Update dependencies from build 320350
dotnet-maestro[bot] Jun 26, 2026
0e669b8
Update dependencies from build 320483
dotnet-maestro[bot] Jun 27, 2026
b49f377
Update dependencies from build 320530
dotnet-maestro[bot] Jun 28, 2026
6894cce
Update dependencies from build 320581
dotnet-maestro[bot] Jun 28, 2026
853e3e5
Work around preview6 runtime-async InvalidProgramException in Validat…
wtgodbe Jun 30, 2026
66bbccf
Update dependencies from build 320883
dotnet-maestro[bot] Jun 30, 2026
769013e
Revert "Work around preview6 runtime-async InvalidProgramException in…
wtgodbe Jun 30, 2026
a20ea51
Update dependencies from build 320956
dotnet-maestro[bot] Jun 30, 2026
8d68b69
Update dependencies from build 321002
dotnet-maestro[bot] Jul 1, 2026
cd2aecf
Update dependencies from build 321078
dotnet-maestro[bot] Jul 1, 2026
3fde912
Update dependencies from build 321144
dotnet-maestro[bot] Jul 2, 2026
36a4f4d
Update dependencies from build 321197
dotnet-maestro[bot] Jul 2, 2026
322df09
Merge release/11.0-preview6 into darc-release/11.0-preview6-be327bd0-…
dotnet-maestro[bot] Jul 3, 2026
c1c812a
Update dependencies from build 321289
dotnet-maestro[bot] Jul 3, 2026
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
8 changes: 8 additions & 0 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
<FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="Mono.Cecil.Pdb.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Api.ProviderBuilderExtensions.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Api.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Extensions.Hosting.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Instrumentation.AspNetCore.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Instrumentation.Http.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.Instrumentation.Runtime.dll" CertificateName="3PartySHA2" />
<FileSignInfo Include="OpenTelemetry.dll" CertificateName="3PartySHA2" />
</ItemGroup>

<ItemGroup>
Expand Down
184 changes: 92 additions & 92 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26319.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26319.105",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26319.105",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26352.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26352.105",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26352.105",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4"
Expand Down
7 changes: 6 additions & 1 deletion src/Components/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />

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

<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Components/test/testassets/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\..\, Directory.Build.props))\Directory.Build.props" />

<PropertyGroup>
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
<!-- TypeScript here is built via npm/rollup; block the MSBuild TypeScript toolchain. -->
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/Components/test/testassets/LazyTestContentPackage/LazyTestContentPackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
<StaticWebAssetBasePath>_content/TestContentPackage</StaticWebAssetBasePath>
</PropertyGroup>

<PropertyGroup>
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
</PropertyGroup>

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Components" />
<Reference Include="Microsoft.AspNetCore.Components.Web" />
Expand Down
4 changes: 0 additions & 4 deletions src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
<StaticWebAssetBasePath>_content/TestContentPackage</StaticWebAssetBasePath>
</PropertyGroup>

<PropertyGroup>
<EnableTypeScriptNuGetTarget>true</EnableTypeScriptNuGetTarget>
</PropertyGroup>

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Components" />
<Reference Include="Microsoft.AspNetCore.Components.Authorization" />
Expand Down
2 changes: 1 addition & 1 deletion src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ protected IdentityUserContext() { }

private sealed class PersonalDataConverter : ValueConverter<string, string>
{
public PersonalDataConverter(IPersonalDataProtector protector) : base(s => protector.Protect(s), s => protector.Unprotect(s), default)
public PersonalDataConverter(IPersonalDataProtector protector) : base(s => protector.Protect(s), s => protector.Unprotect(s))
{ }
}

Expand Down
1 change: 1 addition & 0 deletions src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Quic" />
Expand Down
Loading