Skip to content

Commit 9c5cb49

Browse files
[main] Source code updates from dotnet/dotnet (#19172)
* Backflow from https://github.com/dotnet/dotnet / a8faa5e build 295176 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 295176 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 295229 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 295411 No dependency updates to commit --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 741f5d5 commit 9c5cb49

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
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="fsharp" Sha="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="5661a2c0a84a3fd32916395b254ce50e5ad7e9fe" BarId="295411" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25515-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>

src/FSharp.Build/Microsoft.FSharp.NetSdk.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
7070
<RestoreAdditionalProjectSources Condition="Exists('$(_FSharpCoreLibraryPacksFolder)')">$(RestoreAdditionalProjectSources);$(_FSharpCoreLibraryPacksFolder)</RestoreAdditionalProjectSources>
7171
</PropertyGroup>
7272

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

8181
<Target Name="PackageFSharpDesignTimeTools" AfterTargets="ResolveReferences">
82-
<CallTarget Targets="_GetFrameworkAssemblyReferences" Condition="'@(ReferencePath)' == ''" />
8382
<PropertyGroup>
8483
<FSharpDesignTimeProtocol Condition = " '$(FSharpDesignTimeProtocol)' == '' ">fsharp41</FSharpDesignTimeProtocol>
8584
<FSharpToolsDirectory Condition = " '$(FSharpToolsDirectory)' == '' ">tools</FSharpToolsDirectory>

0 commit comments

Comments
 (0)