Skip to content

Commit

Permalink
F# now supports reference assemblies
Browse files Browse the repository at this point in the history
Generation of reference assemblies for F# was disabled previously (dotnet#13085) because the F# compiler didn't support them.
Now both, the F# compiler (dotnet/fsharp#12334) and the FCS task (dotnet/fsharp#13263) support reference assemblies. Also, the bug around the copying of F# ref assemblies was fixed (dotnet/fsharp#13266) so it is time to enable the generation of ref assemblies for F#.
  • Loading branch information
v-wuzhai authored and marcin-krystianc committed Jul 1, 2022
2 parents 2947726 + 98f65ab commit bc17c7c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22329-01">
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22330-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>77c72dd0f1758e994cf2ebd2ddd6d1ada695d261</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.3.0-preview-22329-01">
<Dependency Name="Microsoft.Build.Localization" Version="17.3.0-preview-22330-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>77c72dd0f1758e994cf2ebd2ddd6d1ada695d261</Sha>
</Dependency>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.3.0-preview-22329-01</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.3.0-preview-22330-02</MicrosoftBuildPackageVersion>
<!-- .NET Framework-targeted tasks will need to run in an MSBuild that is older than the very latest,
so target one that matches the version in minimumMSBuildVersion.
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
<MicrosoftBuildPackageVersion Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETFramework' ">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.3.0-preview-22329-01</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.3.0-preview-22330-02</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,4 @@ Copyright (c) .NET Foundation. All rights reserved.
</PropertyGroup>
<Import Condition=" '$(UseBundledFSharpTargets)' == 'true' and Exists('$(FSharpPropsShim)') " Project="$(FSharpPropsShim)" />

<PropertyGroup>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>

</Project>

0 comments on commit bc17c7c

Please sign in to comment.