Skip to content

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

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
davidwengier merged 3 commits into from
Nov 22, 2025
Merged

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

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
827463b
Backflow from https://github.com/dotnet/dotnet / cc7f6e8 build 291900
dotnet-maestro[bot] Nov 22, 2025
2dcae8b
Merge main into darc-main-2e4d8a65-7e10-47a1-97d1-1f64afd18e31
dotnet-maestro[bot] Nov 22, 2025
eba8311
Update dependencies from https://github.com/dotnet/dotnet build 291900
dotnet-maestro[bot] Nov 22, 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
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="razor" Sha="1bdc5cdcf4cf408e00aa3c60f58520083bf2474f" BarId="287856" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="cc7f6e84d8dae36ad9ea51a5112627b8235982cc" BarId="291900" />
<ProductDependencies>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25567.17">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
29 changes: 13 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
<!-- Opt-in arcade features -->
<Project>

<Import Project="Version.Details.props" />

<!-- Arcade features -->
<PropertyGroup>
<UsingToolVSSDK>true</UsingToolVSSDK>
<MicrosoftVSSDKBuildToolsVersion>17.3.2094</MicrosoftVSSDKBuildToolsVersion>
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
<!-- Opt out Arcade features -->
<PropertyGroup>
<UsingToolXliff>true</UsingToolXliff>
</PropertyGroup>

<!-- Versioning for assemblies/packages -->
<PropertyGroup>
<MajorVersion>10</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>
</PropertyGroup>

<!--
Versioning for tooling releases.

Expand All @@ -37,11 +35,8 @@
<AddinVersion Condition="'$(OfficialBuildId)' != ''">$(AddinVersion).$(OfficialBuildId)</AddinVersion>
<AddinVersion Condition="'$(OfficialBuildId)' == ''">$(AddinVersion).42424242.42</AddinVersion>
</PropertyGroup>
<!--
Versions below this comment are not managed by automation and can be changed as needed.
-->
<PropertyGroup Label="Manual">
<!-- dotnet/runtime packages -->

<PropertyGroup>
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion>
<!--
These are properties that control the versions of the various packages that are used in arcade. They control
Expand All @@ -50,6 +45,7 @@
<XUnitVersion>2.9.2</XUnitVersion>
<XUnitAnalyzersVersion>1.7.0</XUnitAnalyzersVersion>
</PropertyGroup>

<!-- The maintenance-packages dependency versions need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
Expand All @@ -59,4 +55,5 @@
<MicrosoftIORedistVersion>6.1.3</MicrosoftIORedistVersion>
<SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
</PropertyGroup>

</Project>