Skip to content

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

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1da1083
Backflow from https://github.com/dotnet/dotnet / 619d563 build 280198
dotnet-maestro[bot] Aug 27, 2025
1343fdc
Merge main into darc-main-52e96718-722c-435a-b02a-3f773f6088b7
dotnet-maestro[bot] Aug 27, 2025
b818ce5
Update dependencies from https://github.com/dotnet/dotnet build 280198
dotnet-maestro[bot] Aug 27, 2025
f6b6980
Backflow from https://github.com/dotnet/dotnet / 39ec54d build 281059
dotnet-maestro[bot] Aug 28, 2025
aa99da0
Update dependencies from https://github.com/dotnet/dotnet build 281059
dotnet-maestro[bot] Aug 28, 2025
c40312d
Backflow from https://github.com/dotnet/dotnet / 7ac1ca6 build 281128
dotnet-maestro[bot] Aug 29, 2025
71fc787
Merge main into darc-main-52e96718-722c-435a-b02a-3f773f6088b7
dotnet-maestro[bot] Aug 29, 2025
5211d8f
Update dependencies from https://github.com/dotnet/dotnet build 281128
dotnet-maestro[bot] Aug 29, 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
1 change: 0 additions & 1 deletion eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is auto-generated by the Maestro dependency flow system.
Do not edit it manually, as it will get overwritten by automation.
Expand Down
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="adfea8e331724cfd46007dfefec405b5e5faad1d" BarId="279079" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3" BarId="281128" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25278-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PropertyGroup>
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
<FSharpPreReleaseIteration>7</FSharpPreReleaseIteration>
<PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<FSharpPreReleaseIteration>2</FSharpPreReleaseIteration>
<PreReleaseVersionLabel>rc$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<!-- These have to be in sync with latest release branch -->
<!-- F# Version components -->
<FSMajorVersion>10</FSMajorVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/AheadOfTime/Trimming/check.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.
CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9154048

# Check net9.0 trimmed assemblies with F# metadata resources removed
CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7607296
CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7601152

Loading