Skip to content

[release/10.0.3xx] Source code updates from dotnet/dotnet #9754

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

Closed
dotnet-maestro wants to merge 11 commits into from
Closed

[release/10.0.3xx] Source code updates from dotnet/dotnet #9754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d96eff
Update dependencies
dotnet-maestro[bot] Jan 21, 2026
15eaf9f
Update dependencies
dotnet-maestro[bot] Jan 22, 2026
7542fdd
Merge branch 'release/10.0.3xx' into darc-release/10.0.3xx-95c4fe45-7…
DonnaChen888 Jan 23, 2026
cc328d5
Update dependencies
dotnet-maestro[bot] Jan 23, 2026
fffdc02
Merge release/10.0.3xx into darc-release/10.0.3xx-95c4fe45-7bdf-4be2-…
dotnet-maestro[bot] Jan 26, 2026
7a38381
Update dependencies
dotnet-maestro[bot] Jan 26, 2026
64573c5
Merge branch 'release/10.0.3xx' into darc-release/10.0.3xx-95c4fe45-7…
DonnaChen888 Jan 29, 2026
6c21930
Merge branch 'release/10.0.3xx' into darc-release/10.0.3xx-95c4fe45-7…
DonnaChen888 Jan 30, 2026
bbbb2e6
Merge branch 'release/10.0.3xx' into darc-release/10.0.3xx-95c4fe45-7…
DonnaChen888 Jan 30, 2026
967e76a
Merge branch 'release/10.0.3xx' into darc-release/10.0.3xx-95c4fe45-7…
DonnaChen888 Feb 4, 2026
f23392e
Merge branch 'release/10.0.3xx' into darc-release/10.0.3xx-95c4fe45-7…
DonnaChen888 Feb 5, 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.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26070.115</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26076.108</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="f962f7efe8b17a25dde3403b7d2abd5c239fcbac" BarId="298120" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="3b3cc2b93b356d46a6fb36768479ea53515fc2cd" BarId="298863" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26070.115">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26076.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f962f7efe8b17a25dde3403b7d2abd5c239fcbac</Sha>
<Sha>3b3cc2b93b356d46a6fb36768479ea53515fc2cd</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="10.0.1">
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2004.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: Azure-Linux-3-Amd64
image: 1es-mariner-2
Copy link
Member

@MiYanni MiYanni Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break the build. We need to wait until the Arcade version in the 10 version of Arcade properly flows to the VMR and then back into this PR. CC @MichaelSimons

Copy link
Member

@dsplaisted dsplaisted Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break the build. We need to wait until the Arcade version in the 10 version of Arcade properly flows to the VMR and then back into this PR

@MichaelSimons @MiYanni Has this happened? Can we merge this PR?

Copy link
Member

@MiYanni MiYanni Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, you cannot run 1es-mariner-2 in CI currently (for this repo). There was a separate discussion on it, but Sean ended up hotfixing it here to fix the build: #9736

But this change has occurred in Arcade at this point. But we cannot merge this PR reverting that hotfix or CI builds will immediately stop working. VMR needs the right Arcade version to flow to it so it can flow here, so this hotfix won't be reverted.

Copy link
Member

@MiYanni MiYanni Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it is correct in release/10.0 for Arcade here: https://github.com/dotnet/arcade/blob/release/10.0/eng/common/core-templates/job/source-build.yml#L66

It has to be that value/version that flows to the VMR and then flows back here.

Copy link
Member

@marcpopMSFT marcpopMSFT Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MichaelSimons we disabled source build in main. Can we do all 10+ branches as well?

I know we still need these for 8/9.

Copy link
Member

@MiYanni MiYanni Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcpopMSFT Why is it taking so long for Arcade 10 updates to flow into this PR? Is something wrong with the flow from Arcade 10 to VMR to templating? The change we need is over 3 weeks old...
image

Copy link
Member

@marcpopMSFT marcpopMSFT Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying darc trigger-subscriptions --id bbf9aa7e-217b-4275-99d1-5f23eb747967 --force to see if that helps.

Copy link
Member

@marcpopMSFT marcpopMSFT Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@premun even after a force on the subscription, no new flows came through. Is there a bug in maestro or is this PR out of sync somehow blocking the backflow?

Copy link
Member

@premun premun Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcpopMSFT I will have a look. Force-triggering should work. In the meantime, it's also possible to close this one and let a new one re-open (if there are no manual changes which I don't see here)

Copy link
Member

@premun premun Feb 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem seems to be that the --force does not override the block described in #9754 (comment). I logged dotnet/arcade-services#5908 and I would suggest closing here and re-triggering.

os: linux
${{ else }}:
pool:
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dotnet": "10.0.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.115"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108"
}
}