Remove the shared runtime folder from the CLI
This commit is contained in:
parent
34b0b688f7
commit
528b32ddc5
5 changed files with 1 additions and 80 deletions
|
@ -31,11 +31,7 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
|
|
||||||
public static readonly string[] FilesToClean = new[]
|
public static readonly string[] FilesToClean = new[]
|
||||||
{
|
{
|
||||||
"README.md",
|
"README.md"
|
||||||
"Microsoft.DotNet.Runtime.exe",
|
|
||||||
"Microsoft.DotNet.Runtime.dll",
|
|
||||||
"Microsoft.DotNet.Runtime.deps",
|
|
||||||
"Microsoft.DotNet.Runtime.pdb"
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public static readonly string[] ProjectsToPack = new[]
|
public static readonly string[] ProjectsToPack = new[]
|
||||||
|
@ -161,10 +157,8 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
|
|
||||||
var configuration = c.BuildContext.Get<string>("Configuration");
|
var configuration = c.BuildContext.Get<string>("Configuration");
|
||||||
var binDir = Path.Combine(outputDir, "bin");
|
var binDir = Path.Combine(outputDir, "bin");
|
||||||
var runtimeOutputDir = Path.Combine(outputDir, "runtime", "coreclr");
|
|
||||||
|
|
||||||
Mkdirp(binDir);
|
Mkdirp(binDir);
|
||||||
Mkdirp(runtimeOutputDir);
|
|
||||||
|
|
||||||
foreach (var project in ProjectsToPublish)
|
foreach (var project in ProjectsToPublish)
|
||||||
{
|
{
|
||||||
|
@ -179,31 +173,8 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
.EnsureSuccessful();
|
.EnsureSuccessful();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Publish the runtime
|
|
||||||
dotnet.Publish(
|
|
||||||
"--output",
|
|
||||||
runtimeOutputDir,
|
|
||||||
"--configuration",
|
|
||||||
configuration,
|
|
||||||
Path.Combine(c.BuildContext.BuildDirectory, "src", "Microsoft.DotNet.Runtime"))
|
|
||||||
.Execute()
|
|
||||||
.EnsureSuccessful();
|
|
||||||
|
|
||||||
// Clean bogus files
|
|
||||||
foreach (var fileToClean in FilesToClean)
|
|
||||||
{
|
|
||||||
var pathToClean = Path.Combine(runtimeOutputDir, fileToClean);
|
|
||||||
if (File.Exists(pathToClean))
|
|
||||||
{
|
|
||||||
File.Delete(pathToClean);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FixModeFlags(outputDir);
|
FixModeFlags(outputDir);
|
||||||
|
|
||||||
// Copy the whole runtime local to the tools
|
|
||||||
CopyRecursive(runtimeOutputDir, binDir);
|
|
||||||
|
|
||||||
// Copy corehost
|
// Copy corehost
|
||||||
File.Copy(Path.Combine(Dirs.Corehost, $"corehost{Constants.ExeSuffix}"), Path.Combine(binDir, $"corehost{Constants.ExeSuffix}"), overwrite: true);
|
File.Copy(Path.Combine(Dirs.Corehost, $"corehost{Constants.ExeSuffix}"), Path.Combine(binDir, $"corehost{Constants.ExeSuffix}"), overwrite: true);
|
||||||
File.Copy(Path.Combine(Dirs.Corehost, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), Path.Combine(binDir, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), overwrite: true);
|
File.Copy(Path.Combine(Dirs.Corehost, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), Path.Combine(binDir, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), overwrite: true);
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>db29f219-dc92-4af7-a2ee-e89ffbb3f5f0</ProjectGuid>
|
|
||||||
<RootNamespace>Microsoft.DotNet.Runtime</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
|
@ -1,14 +0,0 @@
|
||||||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
|
||||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
|
||||||
using System;
|
|
||||||
namespace Microsoft.DotNet.Runtime
|
|
||||||
{
|
|
||||||
public class Program
|
|
||||||
{
|
|
||||||
public static int Main(string[] args)
|
|
||||||
{
|
|
||||||
// Temporary and bogus. Just needed so we can publish this
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,3 +0,0 @@
|
||||||
# Microsoft.DotNet.Runtime
|
|
||||||
|
|
||||||
This is a utility project that brings the CoreCLR down and lets us publish it as though it were an app. Do NOT add any C# code to it! It is not designed to actually be compiled as an assembly, it's just used for its dependencies.
|
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"compilationOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.0.0-rc2-23811"
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"dnxcore50": {
|
|
||||||
"imports": "portable-net45+win8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue