Skip to content

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

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

Merged
dotnet-maestro merged 2 commits into from
May 18, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
776702a
Backflow from https://github.com/dotnet/dotnet / 3a62cc8 build 314618
dotnet-maestro[bot] May 18, 2026
98b8390
Update dependencies from build 314618
dotnet-maestro[bot] May 18, 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
5 changes: 5 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
</PropertyGroup>

<PropertyGroup>
<!-- Pin to 1.22.0 until efcore migrates to xunit v3; 1.27.0 crashes with xunit v2 -->
<XUnitAnalyzersVersion>1.22.0</XUnitAnalyzersVersion>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<Import
Expand Down
34 changes: 17 additions & 17 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.5.26258.110</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-preview.5.26258.110</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-preview.5.26258.110</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.5.26258.110</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.5.26258.110</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26266.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26266.103</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26266.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.5.26266.103</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26266.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26266.103</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-preview.5.26266.103</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-preview.5.26266.103</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.5.26266.103</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.5.26266.103</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
70 changes: 35 additions & 35 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168" BarId="313660" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="3a62cc842c76761d4742f1d103892f19fd06dd3a" BarId="314618" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.5.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26266.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>3a62cc842c76761d4742f1d103892f19fd06dd3a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
5 changes: 5 additions & 0 deletions eng/common/AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# `eng/common`

Files under `eng/common` come from [Arcade](https://github.com/dotnet/arcade).
Edits in `eng/common` will be overwritten by automation unless the changes are made directly in the Arcade repository.
For more information, see the [Arcade documentation](https://github.com/dotnet/arcade/tree/main/Documentation).
3 changes: 3 additions & 0 deletions eng/common/core-templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ parameters:
GitHubOrg: dotnet
MirrorRepo: ''
MirrorBranch: main
xLocCustomPowerShellScript: ''
condition: ''
JobNameSuffix: ''
is1ESPipeline: ''
Expand Down Expand Up @@ -97,6 +98,8 @@ jobs:
gitHubOrganization: ${{ parameters.GitHubOrg }}
mirrorRepo: ${{ parameters.MirrorRepo }}
mirrorBranch: ${{ parameters.MirrorBranch }}
${{ if ne(parameters.xLocCustomPowerShellScript, '') }}:
xLocCustomPowerShellScript: ${{ parameters.xLocCustomPowerShellScript }}
condition: ${{ parameters.condition }}

# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
Expand Down
2 changes: 0 additions & 2 deletions eng/common/core-templates/steps/publish-logs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ steps:
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
'$(akams-client-id)'
'$(microsoft-symbol-server-pat)'
'$(symweb-symbol-server-pat)'
'$(dnceng-symbol-server-pat)'
'$(dn-bot-all-orgs-build-rw-code-rw)'
'$(System.AccessToken)'
Expand Down
Loading
Loading