Skip to content

Commit a4ea68a

Browse files
authored
Merge pull request #26306 from marcin-krystianc/dev-marcink-20220628-referenceassemblies
Removing default ProduceReferenceAssembly value for F#
2 parents e024602 + aa6dc54 commit a4ea68a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharp.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,4 @@ Copyright (c) .NET Foundation. All rights reserved.
2828
</PropertyGroup>
2929
<Import Condition=" '$(UseBundledFSharpTargets)' == 'true' and Exists('$(FSharpPropsShim)') " Project="$(FSharpPropsShim)" />
3030

31-
<PropertyGroup>
32-
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
33-
</PropertyGroup>
34-
3531
</Project>

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ Copyright (c) .NET Foundation. All rights reserved.
233233
</PropertyGroup>
234234

235235
<PropertyGroup>
236-
<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) and ('$(ProduceOnlyReferenceAssembly)' != 'true')" >true</ProduceReferenceAssembly>
236+
<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) and ('$(ProduceOnlyReferenceAssembly)' != 'true') and '$(MSBuildProjectExtension)' != '.fsproj'" >true</ProduceReferenceAssembly>
237+
<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 7.0)) and ('$(ProduceOnlyReferenceAssembly)' != 'true') and '$(MSBuildProjectExtension)' == '.fsproj'" >true</ProduceReferenceAssembly>
237238
</PropertyGroup>
238239

239240
<!--

0 commit comments

Comments
 (0)