Skip to content

[rel/18.0] Source code updates from dotnet/dotnet #15288

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
Jakub Jareš (nohwnd) merged 3 commits into from
Nov 10, 2025
Merged

[rel/18.0] Source code updates from dotnet/dotnet #15288

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c90748d
Merge rel/18.0 into darc-rel/18.0-8d5be576-a44c-479b-aefd-c4e8b3b67048
dotnet-maestro[bot] Oct 3, 2025
a392502
Update dependencies from https://github.com/dotnet/dotnet build 285185
dotnet-maestro[bot] Oct 3, 2025
2e17cbf
Pin version of CC and .net client
nohwnd Nov 10, 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
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- _git/vs-code-coverage dependencies -->
<MicrosoftInternalCodeCoveragePackageVersion>18.0.4</MicrosoftInternalCodeCoveragePackageVersion>
<MicrosoftInternalCodeCoveragePackageVersion>18.0.0-preview.25469.1</MicrosoftInternalCodeCoveragePackageVersion>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25476.104</MicrosoftDiagnosticsNETCoreClientPackageVersion>
<MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25479.115</MicrosoftDiagnosticsNETCoreClientPackageVersion>
<!-- dotnet/runtime dependencies -->
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
<SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
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,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="e1eaf1bbd9702e9b6ee9b10dbc94105732e07896" BarId="284895" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="e72b5bbe719d747036ce9c36582a205df9f1c361" BarId="285185" />
<ProductDependencies>
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="18.0.0-preview.25469.1">

@premun Přemek Vysoký (premun) Oct 7, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Jakub Jareš (@nohwnd) the value was most likely taken from here because the other file is generated automatically always.
I see this change 740c683 that only changed the auto-generated file (see its header)

What is your goal with this? Do you wish to lock this dependency at 18.0.4?

I'd suggest changing the V.D.xml file as well.

@nohwnd Jakub Jareš (nohwnd) Oct 7, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

yes, locking the dependency to that version.

@premun Přemek Vysoký (premun) Oct 7, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

If you do have other subscriptions that might override this, you can put Pinned="true" in V.D.xml for this dependency.
Or you can alternatively set SkipProperty="true" which will stop generating it in V.D.props and then define it in Versions.props where it will stay.

<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>957aa737e42290c129a620df7129f03189743dd1</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25476.104">
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25479.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e1eaf1bbd9702e9b6ee9b10dbc94105732e07896</Sha>
<Sha>e72b5bbe719d747036ce9c36582a205df9f1c361</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
Expand Down