Skip to content

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

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
merged 8 commits into from
Jun 24, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0dc36f3
Update dependencies from https://github.com/dotnet/dotnet build 271975
dotnet-maestro[bot] Jun 17, 2025
bc4a6ae
Update dependencies from https://github.com/dotnet/dotnet build 272212
dotnet-maestro[bot] Jun 18, 2025
df196ff
Update dependencies from https://github.com/dotnet/dotnet build 272322
dotnet-maestro[bot] Jun 19, 2025
10e78fa
Merging main into darc-main-22d1478e-999c-48c3-b654-9bf09b6a2186
dotnet-maestro[bot] Jun 20, 2025
7e60d3a
Update dependencies from https://github.com/dotnet/dotnet build 272389
dotnet-maestro[bot] Jun 20, 2025
034a4d6
Update dependencies from https://github.com/dotnet/dotnet build 272596
dotnet-maestro[bot] Jun 21, 2025
ca026a2
Update dependencies from https://github.com/dotnet/dotnet build 272656
dotnet-maestro[bot] Jun 22, 2025
2350039
Update dependencies from https://github.com/dotnet/dotnet build 272780
dotnet-maestro[bot] Jun 24, 2025
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
94 changes: 47 additions & 47 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="0b99617c5b5a95c9da470ab9cd38f4a39753bf41" BarId="272780" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25315.102">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25315.102">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25315.102">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.6.25280.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>5a079d0b04213669793487f309e2d0eb1d146d25</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25315.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25315.102">
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.7.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25315.102">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25315.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25315.102">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25315.102">
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25315.102">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25323.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
<Sha>0b99617c5b5a95c9da470ab9cd38f4a39753bf41</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
42 changes: 21 additions & 21 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,33 @@
dotnet/winforms is handling versions for the analyzers.
-->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25315.102</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25315.102</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25315.102</MicrosoftSourceLinkGitHubVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25323.102</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25323.102</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25323.102</MicrosoftSourceLinkGitHubVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25315.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25315.102</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>10.0.0-preview.6.25315.102</SystemDrawingCommonVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.7.25323.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>10.0.0-preview.7.25323.102</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>10.0.0-preview.7.25323.102</SystemDrawingCommonVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25315.102</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25315.102</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25315.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25315.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25315.102</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesVersion>10.0.0-preview.6.25315.102</SystemDirectoryServicesVersion>
<SystemFormatsNrbfVersion>10.0.0-preview.6.25315.102</SystemFormatsNrbfVersion>
<SystemIOPackagingVersion>10.0.0-preview.6.25315.102</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25315.102</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25323.102</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25323.102</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.7.25323.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25323.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.7.25323.102</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesVersion>10.0.0-preview.7.25323.102</SystemDirectoryServicesVersion>
<SystemFormatsNrbfVersion>10.0.0-preview.7.25323.102</SystemFormatsNrbfVersion>
<SystemIOPackagingVersion>10.0.0-preview.7.25323.102</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25323.102</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25315.102</SystemResourcesExtensionsVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25315.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25315.102</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25315.102</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25315.102</SystemWindowsExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>10.0.0-preview.7.25323.102</SystemResourcesExtensionsVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25323.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.7.25323.102</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.7.25323.102</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25323.102</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
Expand All @@ -59,7 +59,7 @@
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25315.102</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25323.102</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Sourcelink -->
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions eng/common/core-templates/steps/install-microbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ steps:
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
useEsrpCli: true
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
Expand Down
6 changes: 0 additions & 6 deletions eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi

baseRidArgs=
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
fi

portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
Expand All @@ -55,7 +50,6 @@ steps:
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
$baseRidArgs \
$portableBuildArgs \
displayName: Build

Expand Down
18 changes: 18 additions & 0 deletions eng/common/templates/vmr-build-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
#
# It will run a full set of verification jobs defined in:
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
#
# For repos that do not need to run the full set, you would do the following:
#
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
#
# 2. Add `verifications` parameter to VMR template reference
#
# Examples:
# - For source-build stage 1 verification, add the following:
# verifications: [ "source-build-stage1" ]
#
# - For Windows only verifications, add the following:
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]

trigger: none
pr: none

Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-preview.6.25302.104",
"dotnet": "10.0.100-preview.6.25315.102",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCorePlatformsVersion)"
Expand All @@ -14,12 +14,12 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25315.102",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25323.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25323.102",
"Microsoft.Build.NoTargets": "3.7.56"
},
"sdk": {
"version": "10.0.100-preview.6.25302.104"
"version": "10.0.100-preview.6.25315.102"
},
"native-tools": {
"strawberry-perl": "5.38.0.1",
Expand Down