Skip to content

Merge master to release/dev16.8 #9817

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

Merged
cartermp merged 2 commits into from
Jul 29, 2020
Merged

Merge master to release/dev16.8 #9817

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25d7304
Remove duplicate typeprovider target (#9815)
baronfel Jul 28, 2020
8267c59
Fix for FS0874 error text (#9813)
Lanayx Jul 28, 2020
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
Next Next commit
Remove duplicate typeprovider target (#9815) 
The NetSdk.targets had a duplicate `CollectFSharpDesignTimeTools` target, and so now they don't.
  • Loading branch information
@baronfel
baronfel authored Jul 28, 2020
commit 25d73049a58718f54e10eff45a638b1bd4b78b73
9 changes: 0 additions & 9 deletions src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,4 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

</ItemGroup>
</Target>

<Target Name="CollectFSharpDesignTimeTools" BeforeTargets="BeforeCompile" DependsOnTargets="_GetFrameworkAssemblyReferences">
<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)' != '' "/>
<FscCompilerTools Include = "$(%(PropertyNames.Identity))" />
</ItemGroup>
</Target>

</Project>