Skip to content

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

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
dotnet-maestro wants to merge 4 commits into
base: main
Choose a base branch
from
+2 −3
Open

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

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
57efa60
Backflow from https://github.com/dotnet/dotnet / a8faa5e build 295176
dotnet-maestro[bot] Dec 19, 2025
6427896
Update dependencies from https://github.com/dotnet/dotnet build 295176
dotnet-maestro[bot] Dec 19, 2025
60ffee1
Update dependencies from https://github.com/dotnet/dotnet build 295229
dotnet-maestro[bot] Dec 20, 2025
03e7d52
Update dependencies from https://github.com/dotnet/dotnet build 295411
dotnet-maestro[bot] Dec 21, 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="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="5661a2c0a84a3fd32916395b254ce50e5ad7e9fe" BarId="295411" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25515-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
3 changes: 1 addition & 2 deletions src/FSharp.Build/Microsoft.FSharp.NetSdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<RestoreAdditionalProjectSources Condition="Exists('$(_FSharpCoreLibraryPacksFolder)')">$(RestoreAdditionalProjectSources);$(_FSharpCoreLibraryPacksFolder)</RestoreAdditionalProjectSources>
</PropertyGroup>

<Target Name="CollectFSharpDesignTimeTools" BeforeTargets="BeforeCompile" DependsOnTargets="_GetFrameworkAssemblyReferences">
<Target Name="CollectFSharpDesignTimeTools" BeforeTargets="BeforeCompile" DependsOnTargets="ResolveReferences">
<ItemGroup>
<PropertyNames Include = "Pkg$([System.String]::Copy('%(PackageReference.FileName)').Replace('.','_'))" Condition = " '%(PackageReference.IsFSharpDesignTimeProvider)' == 'true' and '%(PackageReference.Extension)' == '' "/>
<PropertyNames Include = "Pkg$([System.String]::Copy('%(PackageReference.FileName)%(PackageReference.Extension)').Replace('.','_'))" Condition = " '%(PackageReference.IsFSharpDesignTimeProvider)' == 'true' and '%(PackageReference.Extension)' != '' "/>
Expand All @@ -79,7 +79,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
</Target>

<Target Name="PackageFSharpDesignTimeTools" AfterTargets="ResolveReferences">
<CallTarget Targets="_GetFrameworkAssemblyReferences" Condition="'@(ReferencePath)' == ''" />
<PropertyGroup>
<FSharpDesignTimeProtocol Condition = " '$(FSharpDesignTimeProtocol)' == '' ">fsharp41</FSharpDesignTimeProtocol>
<FSharpToolsDirectory Condition = " '$(FSharpToolsDirectory)' == '' ">tools</FSharpToolsDirectory>
Expand Down
Loading