Skip to content

Commit 69539f2

Browse files
authored
hard-code FSharp.Core that ships with legacy project templates (#6611)
1 parent d1cc85e commit 69539f2

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

eng/targets/NuGet.targets

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,4 @@
55
<NuspecProperty Include="Owners=$(Authors)" />
66
</ItemGroup>
77

8-
<Target Name="_GeneratePackGroupOutput"
9-
DependsOnTargets="_GetOutputItemsFromPack;Pack">
10-
<ItemGroup>
11-
<PackGroupOutput Include="@(_OutputPackItems->'%(FullPath)')" Condition="'%(_OutputPackItems.Extension)' == '.nupkg'" />
12-
</ItemGroup>
13-
</Target>
14-
15-
<Target Name="PackOutputGroup"
16-
Outputs="@(PackGroupOutput)"
17-
DependsOnTargets="_GeneratePackGroupOutput">
18-
</Target>
19-
208
</Project>

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@
1515
<Link>packages\System.ValueTuple.4.4.0.nupkg</Link>
1616
<IncludeInVSIX>true</IncludeInVSIX>
1717
</Content>
18+
<Content Include="$(NuGetPackageRoot)\FSharp.Core\4.6.2\FSharp.Core.4.6.2.nupkg">
19+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
20+
<Link>packages\FSharp.Core.4.6.2.nupkg</Link>
21+
<IncludeInVSIX>true</IncludeInVSIX>
22+
</Content>
1823
<None Include="Source.extension.vsixmanifest">
1924
<SubType>Designer</SubType>
2025
</None>
2126
</ItemGroup>
2227

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

3133
<ItemGroup>

0 commit comments

Comments
 (0)