Skip to content

[main] Source code updates from dotnet/dotnet #67642

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

Open
dotnet-maestro wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[main] Source code updates from dotnet/dotnet #67642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7538560
Backflow from https://github.com/dotnet/dotnet / 80e087c build 321713
dotnet-maestro[bot] Jul 7, 2026
77d3282
Update dependencies from build 321713
dotnet-maestro[bot] Jul 7, 2026
e06d726
Suppress NuGet audit warnings in project file
wtgodbe Jul 7, 2026
3841281
Add NU1903 warning suppression to InteropClient.csproj
wtgodbe Jul 7, 2026
c812125
Give source-build (Managed) leg a clang toolchain for NativeAOT tools
wtgodbe Jul 7, 2026
f3dd71f
Merge branch 'main' into darc-main-88dfb818-85d8-407c-b1ac-a3e61ab7fa66
DeagleGross Jul 8, 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: 6 additions & 2 deletions .azure/pipelines/ci-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,11 +694,15 @@ stages:
parameters:
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64'
# NativeAOT tools (dotnet-dev-certs / dotnet-user-secrets / dotnet-user-jwts) now publish
# AOT in source-build, which needs a clang toolchain + sysroot, so run in the azurelinux
# cross-prereq container and pass ROOTFS_DIR + /p:CrossBuild=true.
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-amd64'
buildScript: './eng/build.sh'
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
buildArguments: '--source-build -p:CrossBuild=true $(_InternalRuntimeDownloadArgs)'
jobProperties:
timeoutInMinutes: 120
variables:
# Log environment variables in binary logs to ease debugging
MSBUILDLOGALLENVIRONMENTVARIABLES: true
ROOTFS_DIR: /crossrootfs/x64
10 changes: 8 additions & 2 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-arm
azureLinuxCrossArm64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-arm64
azureLinuxCrossX64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-amd64
azureLinuxCrossX64Musl:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-amd64-musl
azureLinuxCrossArmMusl:
Expand Down Expand Up @@ -724,14 +726,18 @@ extends:
enableInternalSources: true
platform:
name: 'Managed'
container: azureLinuxBuildAmd64
# NativeAOT tools (dotnet-dev-certs / dotnet-user-secrets / dotnet-user-jwts) now publish
# AOT in source-build, which needs a clang toolchain + sysroot, so run in the azurelinux
# cross-prereq container and pass ROOTFS_DIR + /p:CrossBuild=true.
container: azureLinuxCrossX64
buildScript: './eng/build.sh'
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
buildArguments: '--source-build -p:CrossBuild=true $(_InternalRuntimeDownloadArgs)'
jobProperties:
timeoutInMinutes: 120
variables:
# Log environment variables in binary logs to ease debugging
MSBUILDLOGALLENVIRONMENTVARIABLES: true
ROOTFS_DIR: /crossrootfs/x64

# Publish to the BAR. Wait until everything else is done.
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@
<disabledPackageSources>
<clear />
</disabledPackageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://data.nuget.org/v3/index.json" />
</auditSources>
</configuration>
2 changes: 1 addition & 1 deletion eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
<DotNetProjects Include="$(RepoRoot)src\Tools\NativeAot\aspnetcoretools\aspnetcoretools.csproj"
Exclude="@(ProjectToBuild);@(ProjectToExclude);$(RepoRoot)**\bin\**\*;$(RepoRoot)**\obj\**\*"
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true' " />
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' " />
<!-- Only build the composite R2R runtime pack when we will actually ship it -->
<DotNetProjects Include="$(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime-composite.proj"
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' and '$(TargetOsName)' != 'win' " />
Expand Down
5 changes: 4 additions & 1 deletion eng/Npm.Workspace.nodeproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,11 @@
<Target Name="Restore" Inputs="@(NpmInputFiles)" Outputs="@(NpmOutputFiles)">
<Message Text="Restoring NPM packages..." Importance="high" />

<!-- Run 'npm ci' through a retry wrapper to tolerate transient network
failures (e.g. ECONNRESET) that npm's built-in fetch-retries does not
reliably recover from. -->
<Exec
Command="npm ci"
Command="node $(MSBuildThisFileDirectory)scripts/npm/npm-ci-retry.mjs"
WorkingDirectory="$(NpmWorkspaceRoot)"
EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)"
/>
Expand Down
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
Loading
Loading