Skip to content

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

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 4 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d293055
Backflow from https://github.com/dotnet/dotnet / 5f66bab build 314998
dotnet-maestro[bot] May 19, 2026
9ba5c3b
Update dependencies from build 314998
dotnet-maestro[bot] May 19, 2026
4cc530c
Updating test dependencies to avoid failures during test runs (#11655)
dipeshmsft May 21, 2026
8cf8730
User/dipesh/fixing test dependencies v2 (#11658)
dipeshmsft May 21, 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
7 changes: 0 additions & 7 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,3 @@ extends:
publishAssetsImmediately: true
isAssetlessBuild: true
enableTelemetry: true
enableSourceIndex: true
sourceIndexParams:
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
binlogPath: artifacts/log/Debug/x86/Build.binlog
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
44 changes: 22 additions & 22 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
<!-- dotnet-dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-preview.5.26229.113</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26229.113</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26229.113</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-preview.5.26229.113</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26269.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26269.105</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26269.105</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26269.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-preview.5.26269.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26269.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26269.105</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-preview.5.26269.105</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.5.26229.113</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.5.26229.113</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-preview.5.26229.113</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-preview.5.26229.113</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-preview.5.26229.113</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.5.26229.113</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-preview.5.26229.113</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-preview.5.26229.113</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.5.26229.113</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.5.26229.113</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.5.26229.113</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-preview.5.26229.113</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.5.26229.113</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26229.113</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.5.26269.105</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.5.26269.105</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-preview.5.26269.105</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-preview.5.26269.105</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-preview.5.26269.105</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.5.26269.105</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-preview.5.26269.105</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-preview.5.26269.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.5.26269.105</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.5.26269.105</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.5.26269.105</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-preview.5.26269.105</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.5.26269.105</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26269.105</SystemWindowsExtensionsPackageVersion>
<!-- dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26262.2</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
Expand Down
90 changes: 45 additions & 45 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="4c4e7f410fc876590f219fc6022b6c18d6f6a475" BarId="312461" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="5f66bab627b918f4a101caea5eebbe9321fbf9fe" BarId="314998" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-preview.5.26229.113">
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-preview.5.26229.113">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26229.113">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26262.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>0f3efdfc3b5fe2e9ff10112b632914d6c26b230b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26229.113">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.DirectoryServices" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.IO.Packaging" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Security.Permissions" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Drawing.Common" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,21 +84,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26229.113">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26229.113">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26229.113">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26229.113">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -109,9 +109,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-preview.5.26229.113">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-preview.5.26269.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<Sha>5f66bab627b918f4a101caea5eebbe9321fbf9fe</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<!-- XUnit-related (not extensions) -->
<PropertyGroup>
<XUnitStaFactPackageVersion>3.0.13</XUnitStaFactPackageVersion>
<XUnitStaFactPackageVersion>4.0.5-beta</XUnitStaFactPackageVersion>
</PropertyGroup>

<!-- Test related -->
Expand All @@ -81,7 +81,7 @@

<!-- Code Coverage -->
<PropertyGroup>
<MicrosoftTestingExtensionsCodeCoverageVersion>17.14.2</MicrosoftTestingExtensionsCodeCoverageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>18.7.0</MicrosoftTestingExtensionsCodeCoverageVersion>
<CodecovVersion>1.12.3</CodecovVersion>
<ReportGeneratorVersion>5.2.0</ReportGeneratorVersion>
</PropertyGroup>
Expand Down
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