Skip to content

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

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
T-Gro merged 4 commits into from
Nov 24, 2025
+12 −4
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db7c297
Backflow from https://github.com/dotnet/dotnet / cc7f6e8 build 291900
dotnet-maestro[bot] Nov 22, 2025
24b5e76
Merge main into darc-main-64f5a853-28cd-4cf8-85e2-00049374995e
dotnet-maestro[bot] Nov 22, 2025
7ec0bec
Update dependencies from https://github.com/dotnet/dotnet build 291900
dotnet-maestro[bot] Nov 22, 2025
e6ecc82
Merge branch 'main' into darc-main-64f5a853-28cd-4cf8-85e2-00049374995e
T-Gro Nov 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
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="fsharp" Sha="01abb3ec5c4cbffec5b33e02156bd3d2a8913b04" BarId="286825" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="cc7f6e84d8dae36ad9ea51a5112627b8235982cc" BarId="291900" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25515-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
14 changes: 11 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<Project>
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />

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

<!-- Arcade features-->
<PropertyGroup>
<!-- opt-out properties -->
<UsingToolXUnit>false</UsingToolXUnit>
<!-- opt-in properties -->
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<UsingToolVSSDK>true</UsingToolVSSDK>
</PropertyGroup>

<!-- Version number computation -->
<PropertyGroup>
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
Expand Down Expand Up @@ -53,6 +55,7 @@
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
<FSProductVersion>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion).$(FSToolsRevisionVersion)</FSProductVersion>
</PropertyGroup>

<PropertyGroup>
<!-- These have to be in sync with latest release branch -->
<VSMajorVersion>18</VSMajorVersion>
Expand All @@ -61,11 +64,13 @@
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
</PropertyGroup>

<!-- version number assignment -->
<PropertyGroup Condition="'$(UseFSharpPackageVersion)' == 'true'">
<VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
<AssemblyVersion>$(FSCoreVersion)</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(UseFSharpPackageVersion)' != 'true'">
<VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
<VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersionPrefix)</VersionPrefix>
Expand All @@ -74,6 +79,7 @@
<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
<!-- PR builds should explicitly specify a version number -->
</PropertyGroup>

<!-- Dependencies from maintenance-packages, source-build specific -->
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
Expand All @@ -86,6 +92,7 @@
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
</PropertyGroup>

<PropertyGroup>
<!-- System.* packages -->
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
Expand Down Expand Up @@ -161,4 +168,5 @@
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>
<!-- -->
</PropertyGroup>

</Project>
Loading