mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix HostFXR in dotnet-dev package

Browse source
This commit is contained in:
Bryan Thornbury 2016-06-14 13:33:06 -07:00
parent f4a8df3a56
commit 638e4c7d00
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
build_projects/dotnet-cli-build/PackageTargets.cs
View file

@ -28,6 +28,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(PackageTargets.CopyCLISDKLayout), [Target(nameof(PackageTargets.CopyCLISDKLayout),
nameof(PackageTargets.CopySharedHostLayout), nameof(PackageTargets.CopySharedHostLayout),
nameof(PackageTargets.CopyHostFxrLayout),
nameof(PackageTargets.CopySharedFxLayout), nameof(PackageTargets.CopySharedFxLayout),
nameof(PackageTargets.CopyCombinedFrameworkSDKHostLayout), nameof(PackageTargets.CopyCombinedFrameworkSDKHostLayout),
nameof(PackageTargets.CopyCombinedFrameworkSDKLayout))] nameof(PackageTargets.CopyCombinedFrameworkSDKLayout))]
@ -103,6 +104,23 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
[Target]
public static BuildTargetResult CopyHostFxrLayout(BuildTargetContext c)
{
var hostFxrRoot = Path.Combine(Dirs.Output, "obj", "hostFxr");
if (Directory.Exists(hostFxrRoot))
{
Utils.DeleteDirectory(hostFxrRoot);
}
Directory.CreateDirectory(hostFxrRoot);
Utils.CopyDirectoryRecursively(Path.Combine(Dirs.Stage2, "host"), hostFxrRoot, true);
FixPermissions(hostFxrRoot);
c.BuildContext["HostFxrPublishRoot"] = hostFxrRoot;
return c.Success();
}
[Target] [Target]
public static BuildTargetResult CopySharedFxLayout(BuildTargetContext c) public static BuildTargetResult CopySharedFxLayout(BuildTargetContext c)
{ {
@ -138,6 +156,9 @@ namespace Microsoft.DotNet.Cli.Build
string sharedHostPublishRoot = c.BuildContext.Get<string>("SharedHostPublishRoot"); string sharedHostPublishRoot = c.BuildContext.Get<string>("SharedHostPublishRoot");
Utils.CopyDirectoryRecursively(sharedHostPublishRoot, combinedRoot); Utils.CopyDirectoryRecursively(sharedHostPublishRoot, combinedRoot);
string hostFxrPublishRoot = c.BuildContext.Get<string>("HostFxrPublishRoot");
Utils.CopyDirectoryRecursively(hostFxrPublishRoot, combinedRoot);
c.BuildContext["CombinedFrameworkSDKHostRoot"] = combinedRoot; c.BuildContext["CombinedFrameworkSDKHostRoot"] = combinedRoot;
return c.Success(); return c.Success();
} }