Skip to content

Commit

Permalink
hard-code FSharp.Core that ships with legacy project templates (#6611)
Browse files Browse the repository at this point in the history
  • Loading branch information
brettfo authored Apr 22, 2019
1 parent d1cc85e commit 69539f2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
12 changes: 0 additions & 12 deletions eng/targets/NuGet.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,4 @@
<NuspecProperty Include="Owners=$(Authors)" />
</ItemGroup>

<Target Name="_GeneratePackGroupOutput"
DependsOnTargets="_GetOutputItemsFromPack;Pack">
<ItemGroup>
<PackGroupOutput Include="@(_OutputPackItems->'%(FullPath)')" Condition="'%(_OutputPackItems.Extension)' == '.nupkg'" />
</ItemGroup>
</Target>

<Target Name="PackOutputGroup"
Outputs="@(PackGroupOutput)"
DependsOnTargets="_GeneratePackGroupOutput">
</Target>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
<Link>packages\System.ValueTuple.4.4.0.nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="$(NuGetPackageRoot)\FSharp.Core\4.6.2\FSharp.Core.4.6.2.nupkg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>packages\FSharp.Core.4.6.2.nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="Source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core.nuget\FSharp.Core.nuget.csproj">
<VSIXSubPath>packages</VSIXSubPath>
<IncludeOutputGroupsInVSIX>PackOutputGroup%3b</IncludeOutputGroupsInVSIX>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<!-- must include a shipped version in the VSIX, not what's currently in source -->
<PackageReference Include="FSharp.Core" Version="4.6.2" ExcludeAssets="all" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 69539f2

Please sign in to comment.