Skip to content

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

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
AlesProkop merged 2 commits into from
Jul 30, 2026
Merged

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

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
e8726f3
Backflow from https://github.com/dotnet/dotnet / 813f634 build 324908
dotnet-maestro[bot] Jul 30, 2026
3118218
Update dependencies from build 324908
dotnet-maestro[bot] Jul 30, 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
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="ecc427bc7d7b4ee32b943f71196ab377f67c1105" BarId="322911" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="813f634ceb016018f5acc9bd3c2b16e17dff4686" BarId="324908" />
<ProductDependencies>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.CodeDom" Version="10.0.10">
Expand Down
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 @@ -19,8 +19,8 @@

<!-- Arcade features -->
<PropertyGroup>
<UsingToolIbcOptimization>true</UsingToolIbcOptimization>
<UsingToolVisualStudioIbcTraining>true</UsingToolVisualStudioIbcTraining>
<UsingToolIbcOptimization Condition="'$(DotNetBuild)' != 'true'">true</UsingToolIbcOptimization>
<UsingToolVisualStudioIbcTraining Condition="'$(DotNetBuild)' != 'true'">true</UsingToolVisualStudioIbcTraining>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<UsingToolVSSDK>true</UsingToolVSSDK>
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
Expand Down
5 changes: 3 additions & 2 deletions src/Framework/Microsoft.Build.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,12 @@
EngineServices.Version must be bumped, otherwise engine and task hosts of different versions negotiate
incorrectly. Runs only in CI pull-request builds (the AzDO variable SYSTEM_PULLREQUEST_TARGETBRANCH is
set) and diffs the file against the PR target branch. This replaces the former Check-RequiredVersionBumps
function in eng/build.ps1 by colocating the check with the file it protects.
function in eng/build.ps1 by colocating the check with the file it protects. Disable inside VMR as git
versions are vastly different therer and might be lacking support.
-->
<Target Name="CheckEngineServicesVersionBump"
BeforeTargets="Build"
Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(SYSTEM_PULLREQUEST_TARGETBRANCH)' != ''">
Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(SYSTEM_PULLREQUEST_TARGETBRANCH)' != '' and '$(DotNetBuildFromVMR)' != 'true'">
<PropertyGroup>
<!-- Some PRs specify the bare target branch (e.g. "main"), some prefix it with "refs/heads/". Normalize both. -->
<_EngineServicesTargetBranch>refs/remotes/origin/$(SYSTEM_PULLREQUEST_TARGETBRANCH.Replace('refs/heads/', ''))</_EngineServicesTargetBranch>
Expand Down
Loading