Skip to content

Commit a31ef88

Browse files
authored
[main] Source code updates from dotnet/dotnet (#12521)
> [!NOTE] > This is a codeflow update. It may contain both source code changes from > [the VMR](https://github.com/dotnet/dotnet) > as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:ef36a9a7-7cd9-4ecc-b11e-f73940dcf559) ## From https://github.com/dotnet/dotnet - **Subscription**: [ef36a9a7-7cd9-4ecc-b11e-f73940dcf559](https://maestro.dot.net/subscriptions?search=ef36a9a7-7cd9-4ecc-b11e-f73940dcf559) - **Build**: [20251121.9](https://dev.azure.com/dnceng/internal/_build/results?buildId=2844548) ([291900](https://maestro.dot.net/channel/8298/github:dotnet:dotnet/build/291900)) - **Date Produced**: November 21, 2025 10:37:52 PM UTC - **Commit**: [cc7f6e84d8dae36ad9ea51a5112627b8235982cc](dotnet/dotnet@cc7f6e8) - **Commit Diff**: [1bdc5cd...cc7f6e8](dotnet/dotnet@1bdc5cd...cc7f6e8) - **Branch**: [main](https://github.com/dotnet/dotnet/tree/main) [marker]: <> (End:ef36a9a7-7cd9-4ecc-b11e-f73940dcf559) [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@488413f...c1926cf - dotnet/aspnetcore@cf40577...913ff28 - dotnet/cecil@2a768f2...f015d3e - dotnet/command-line-api@0b4618b...c7cc2a9 - dotnet/deployment-tools@c0c5287...84ccc05 - dotnet/diagnostics@297a926...73f1fdc - dotnet/efcore@efc6ddc...fe9cccd - dotnet/emsdk@aead567...9340262 - dotnet/fsharp@6a50577...9298780 - dotnet/msbuild@5e273cc...7085356 - c87ceed...2d8783f - dotnet/runtime@4f50696...efb3990 - dotnet/scenario-tests@0823590...21ded7e - dotnet/sdk@da83df9...65384c6 - dotnet/source-build-reference-packages@0eed3a9...a3edc67 - dotnet/sourcelink@9b949ee...25fdaee - dotnet/symreader@ee968d4...2255aa6 - dotnet/templating@3077da6...f38b39e - dotnet/windowsdesktop@9f2ae28...9d90f3f - dotnet/winforms@e53fd35...e237b3c - dotnet/wpf@5194680...92841b9 - dotnet/xdt@ec08678...a37116d <!-- To diff the source repo and PR branch contents locally, run: darc vmr diff --name-only https://github.com/dotnet/dotnet:cc7f6e84d8dae36ad9ea51a5112627b8235982cc..https://github.com/dotnet/razor:darc-main-2e4d8a65-7e10-47a1-97d1-1f64afd18e31 --> [marker]: <> (End:Footer:CodeFlow PR)
2 parents c4dd223 + eba8311 commit a31ef88

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="1bdc5cdcf4cf408e00aa3c60f58520083bf2474f" BarId="287856" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="cc7f6e84d8dae36ad9ea51a5112627b8235982cc" BarId="291900" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25567.17">
66
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
1-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
3-
<!-- Opt-in arcade features -->
1+
<Project>
2+
3+
<Import Project="Version.Details.props" />
4+
5+
<!-- Arcade features -->
46
<PropertyGroup>
57
<UsingToolVSSDK>true</UsingToolVSSDK>
68
<MicrosoftVSSDKBuildToolsVersion>17.3.2094</MicrosoftVSSDKBuildToolsVersion>
79
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
810
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
911
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
10-
</PropertyGroup>
11-
<!-- Opt out Arcade features -->
12-
<PropertyGroup>
1312
<UsingToolXliff>true</UsingToolXliff>
1413
</PropertyGroup>
14+
1515
<!-- Versioning for assemblies/packages -->
1616
<PropertyGroup>
1717
<MajorVersion>10</MajorVersion>
1818
<MinorVersion>0</MinorVersion>
1919
<PatchVersion>0</PatchVersion>
2020
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
21-
<!--
22-
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
23-
-->
24-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
25-
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
21+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
22+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
2623
</PropertyGroup>
24+
2725
<!--
2826
Versioning for tooling releases.
2927
@@ -37,11 +35,8 @@
3735
<AddinVersion Condition="'$(OfficialBuildId)' != ''">$(AddinVersion).$(OfficialBuildId)</AddinVersion>
3836
<AddinVersion Condition="'$(OfficialBuildId)' == ''">$(AddinVersion).42424242.42</AddinVersion>
3937
</PropertyGroup>
40-
<!--
41-
Versions below this comment are not managed by automation and can be changed as needed.
42-
-->
43-
<PropertyGroup Label="Manual">
44-
<!-- dotnet/runtime packages -->
38+
39+
<PropertyGroup>
4540
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion>
4641
<!--
4742
These are properties that control the versions of the various packages that are used in arcade. They control
@@ -50,6 +45,7 @@
5045
<XUnitVersion>2.9.2</XUnitVersion>
5146
<XUnitAnalyzersVersion>1.7.0</XUnitAnalyzersVersion>
5247
</PropertyGroup>
48+
5349
<!-- The maintenance-packages dependency versions need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
5450
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
5551
<MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
@@ -59,4 +55,5 @@
5955
<MicrosoftIORedistVersion>6.1.3</MicrosoftIORedistVersion>
6056
<SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
6157
</PropertyGroup>
58+
6259
</Project>

0 commit comments

Comments
 (0)