From 528b32ddc5fcb47bcf1d264adf000137a3f2ae80 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Tue, 16 Feb 2016 12:23:17 -0800
Subject: [PATCH] Remove the shared runtime folder from the CLI

---
 scripts/dotnet-cli-build/CompileTargets.cs    | 31 +------------------
 .../Microsoft.DotNet.Runtime.xproj            | 19 ------------
 src/Microsoft.DotNet.Runtime/Program.cs       | 14 ---------
 src/Microsoft.DotNet.Runtime/README.md        |  3 --
 src/Microsoft.DotNet.Runtime/project.json     | 14 ---------
 5 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Runtime/Microsoft.DotNet.Runtime.xproj
 delete mode 100644 src/Microsoft.DotNet.Runtime/Program.cs
 delete mode 100644 src/Microsoft.DotNet.Runtime/README.md
 delete mode 100644 src/Microsoft.DotNet.Runtime/project.json

diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs
index ae89b80b4..15b01561c 100644
--- a/scripts/dotnet-cli-build/CompileTargets.cs
+++ b/scripts/dotnet-cli-build/CompileTargets.cs
@@ -31,11 +31,7 @@ namespace Microsoft.DotNet.Cli.Build
 
         public static readonly string[] FilesToClean = new[]
         {
-            "README.md",
-            "Microsoft.DotNet.Runtime.exe",
-            "Microsoft.DotNet.Runtime.dll",
-            "Microsoft.DotNet.Runtime.deps",
-            "Microsoft.DotNet.Runtime.pdb"
+            "README.md"
         };
 
         public static readonly string[] ProjectsToPack = new[]
@@ -161,10 +157,8 @@ namespace Microsoft.DotNet.Cli.Build
 
             var configuration = c.BuildContext.Get<string>("Configuration");
             var binDir = Path.Combine(outputDir, "bin");
-            var runtimeOutputDir = Path.Combine(outputDir, "runtime", "coreclr");
 
             Mkdirp(binDir);
-            Mkdirp(runtimeOutputDir);
 
             foreach (var project in ProjectsToPublish)
             {
@@ -179,31 +173,8 @@ namespace Microsoft.DotNet.Cli.Build
                     .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);
 
-            // Copy the whole runtime local to the tools
-            CopyRecursive(runtimeOutputDir, binDir);
-
             // 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, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), Path.Combine(binDir, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), overwrite: true);
diff --git a/src/Microsoft.DotNet.Runtime/Microsoft.DotNet.Runtime.xproj b/src/Microsoft.DotNet.Runtime/Microsoft.DotNet.Runtime.xproj
deleted file mode 100644
index 3d21ee9b4..000000000
--- a/src/Microsoft.DotNet.Runtime/Microsoft.DotNet.Runtime.xproj
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Runtime/Program.cs b/src/Microsoft.DotNet.Runtime/Program.cs
deleted file mode 100644
index 1ed282518..000000000
--- a/src/Microsoft.DotNet.Runtime/Program.cs
+++ /dev/null
@@ -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;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Runtime/README.md b/src/Microsoft.DotNet.Runtime/README.md
deleted file mode 100644
index 5124493f8..000000000
--- a/src/Microsoft.DotNet.Runtime/README.md
+++ /dev/null
@@ -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.
diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json
deleted file mode 100644
index cca2c5c83..000000000
--- a/src/Microsoft.DotNet.Runtime/project.json
+++ /dev/null
@@ -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"
-        }
-    }
-}
\ No newline at end of file