Skip to content

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

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
dotnet-maestro merged 3 commits into from
Jul 24, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f317b28
[VMR] Codeflow 63bb7cb-63bb7cb
dotnet-maestro[bot] Jul 24, 2025
19f0f82
Merge main into darc-main-8a68415f-3e1c-42d7-bfca-06210c9cc9f6
dotnet-maestro[bot] Jul 24, 2025
3227471
Update dependencies from https://github.com/dotnet/dotnet build 276450
dotnet-maestro[bot] Jul 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
19 changes: 17 additions & 2 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
<!--
During PR Validation we only need to publish symbols with Arcade,
since our packages are published separately to the CoreXT feed.

Also, do not publish any symbols packages in source-only builds.
-->
<Target Name="_ResolvePublishRoslynNuGetPackages"
DependsOnTargets="BeforePublish"
BeforeTargets="PublishToAzureDevOpsArtifacts"
Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' or '$(DotNetBuildSourceOnly)' == 'true' ">

<ItemGroup>
<!-- Determine all NuGet packages being published -->
<_NuGetPackagesToPush Include="@(ItemsToPushToBlobFeed)"
Expand All @@ -30,13 +33,25 @@
<!-- Determine all symbol packages being published -->
<_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
Condition="$([System.String]::Copy(%(FullPath)).EndsWith('.symbols.nupkg'))" />
<_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
Condition="$([System.String]::Copy(%(FullPath)).Contains('.Symbols.'))" />
</ItemGroup>

<ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
<!-- Remove all NuGet packages from being published -->
<ItemsToPushToBlobFeed Remove="@(_NuGetPackagesToPush)" />
</ItemGroup>

<ItemGroup Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
<!-- Remove all symbols packages from being published -->
<ItemsToPushToBlobFeed Remove="@(_SymbolPackagesToPush)" />
</ItemGroup>

<!-- Include symbol packages for publishing -->
<ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' and '$(DotNetBuildSourceOnly)' != 'true' ">
<!-- Include symbol packages for publishing-->
<ItemsToPushToBlobFeed Include="@(_SymbolPackagesToPush)" />
</ItemGroup>

</Target>

</Project>
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,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="96ac952a7886b565e83acc4c9cef656954ed0686" BarId="276277" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="c0e325f90fb79db0da6be5128dc292f2aabb264f" BarId="276450" />
<ProductDependencies>
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25372.103">
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25373.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>c0e325f90fb79db0da6be5128dc292f2aabb264f</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.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 @@ -48,7 +48,7 @@
Versions managed by Arcade (see Versions.Details.xml)
-->
<PropertyGroup>
<SystemCommandLineVersion>2.0.0-beta7.25372.103</SystemCommandLineVersion>
<SystemCommandLineVersion>2.0.0-beta7.25373.104</SystemCommandLineVersion>
<SystemCompositionVersion>9.0.0</SystemCompositionVersion>
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>9.0.0</SystemDiagnosticsEventLogVersion>
Expand Down