Skip to content

Include Setup Manifests Before Computing Hashes #1667

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
OmarTawfik merged 1 commit into from
Oct 27, 2016
Merged

Include Setup Manifests Before Computing Hashes #1667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions setup/Swix/Microsoft.FSharp.vsmanproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" DefaultTargets="Build" InitialTargets="IncludeFSharpManifests" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="..\FSharp.Setup.props" />

Expand All @@ -13,7 +13,7 @@

<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />

<Target Name="IncludeManifests" BeforeTargets="MergeManifests">
<Target Name="IncludeFSharpManifests">
<ItemGroup>
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Core.json" />
<MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json" />
Expand Down