Skip to content

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

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
nohwnd merged 5 commits into from
Aug 14, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1e0e8d
Merge main into darc-main-bbe6e59f-3278-42aa-be99-c087548dd687
dotnet-maestro[bot] Aug 13, 2025
2986973
Update dependencies from https://github.com/dotnet/dotnet build 278961
dotnet-maestro[bot] Aug 13, 2025
f4dc252
Backflow from https://github.com/dotnet/dotnet / adfea8e build 279079
dotnet-maestro[bot] Aug 14, 2025
f8228d7
Merge main into darc-main-bbe6e59f-3278-42aa-be99-c087548dd687
dotnet-maestro[bot] Aug 14, 2025
1a5ded1
Update dependencies from https://github.com/dotnet/dotnet build 279079
dotnet-maestro[bot] Aug 14, 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
13 changes: 0 additions & 13 deletions eng/DotNetBuild.props
View file
Open in desktop

This file was deleted.

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 @@ -9,7 +9,7 @@ This file should be imported by eng/Versions.props
<!-- _git/vs-code-coverage dependencies -->
<MicrosoftInternalCodeCoveragePackageVersion>18.0.0-preview.25408.1</MicrosoftInternalCodeCoveragePackageVersion>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25410.101</MicrosoftDiagnosticsNETCoreClientPackageVersion>
<MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25413.101</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="8c7b3dcd2bd657c11b12973f1214e7c3c616b174" BarId="278647" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="adfea8e331724cfd46007dfefec405b5e5faad1d" BarId="279079" />
<ProductDependencies>
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="18.0.0-preview.25408.1">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>5877eadeb2d78c45d3bb1996f74b8a96f2e4a1da</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25410.101">
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25413.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c7b3dcd2bd657c11b12973f1214e7c3c616b174</Sha>
<Sha>adfea8e331724cfd46007dfefec405b5e5faad1d</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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<MicrosoftCodeCoverageIOVersion>17.7.0</MicrosoftCodeCoverageIOVersion>
<MicrosoftFakesVersion>18.0.0-beta.25411.3</MicrosoftFakesVersion>
<MicrosoftFakesVersion>18.0.0-beta.25364.2</MicrosoftFakesVersion>
<!--
Make sure you are taking a version from a release branch (rel/d*) in VS. Otherwise there won't be symbols for the dlls in package,
a and it will create a symcheck bug on re-insertion into VS.
Expand Down