add script executor

also added a postcompile script to each project to place the outputs in the right folder

fixes #237

scripts/build/place-binary.cmd

@@ -0,0 +1,24 @@
+@echo off
+
+REM Copyright (c) .NET Foundation and contributors. All rights reserved.
+REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+set SRC=%1
+
+set SRC=%SRC:/=\%
+
+pushd %~dp0..\..
+set DST=%CD%\artifacts\win7-x64\stage2\bin
+popd
+
+if not exist "%SRC%" goto end
+if not exist "%DST%" goto skip
+
+xcopy /F /Y /I "%SRC%" "%DST%"
+
+goto end
+
+:skip
+echo The destination "%DST%" does not exist. This script is only designed to update a previous full build!
+
+:end

scripts/build/place-binary.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+SCRIPT_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+REPOROOT="$( cd -P "$DIR/../.." && pwd )"
+
+source "$SCRIPT_DIR/../_common.sh"
+
+echo "Copy From: $1"
+echo "       To: $STAGE2_DIR/bin/"
+
+src=${1//\\//}
+dst=$STAGE2_DIR/bin/
+
+if [ ! -d "$dst" ]; then
+  mkdir -p $dst
+fi
+
+# Copy the files, if they exist
+if ls $src 1> /dev/null 2>&1; then
+    cp $src $dst
+    rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
+fi

src/Microsoft.DotNet.Cli.Utils/Command.cs

@@ -170,6 +170,12 @@ namespace Microsoft.DotNet.Cli.Utils
                 _stdErrCapture?.GetStringBuilder()?.ToString());
         }
 
+        public Command WorkingDirectory(string projectDirectory)
+        {
+            _process.StartInfo.WorkingDirectory = projectDirectory;
+            return this;
+        }
+
         public Command EnvironmentVariable(string name, string value)
         {
             _process.StartInfo.Environment[name] = value;

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Chain.cs

@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal struct Chain<TLeft, TDown>
+    {
+        public Chain(TLeft left, TDown down)
+            : this()
+        {
+            Left = left;
+            Down = down;
+        }
+
+        public readonly TLeft Left;
+        public readonly TDown Down;
+    }
+}

src/Microsoft.DotNet.Cli.Utils/CommandParsing/CommandGrammar.cs

@@ -0,0 +1,62 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal class CommandGrammar : Grammar
+    {
+        private CommandGrammar(Func<string, string> variable, bool preserveSurroundingQuotes)
+        {
+            var environmentVariablePiece = Ch('%').And(Rep(Ch().Not(Ch('%')))).And(Ch('%')).Left().Down().Str()
+                .Build(key => variable(key) ?? "%" + key + "%");
+
+            var escapeSequencePiece =
+                Ch('%').And(Ch('%')).Build(_=>"%")
+                    .Or(Ch('^').And(Ch('^')).Build(_ => "^"))
+                    .Or(Ch('\\').And(Ch('\\')).Build(_ => "\\"))
+                    .Or(Ch('\\').And(Ch('\"')).Build(_ => "\""))
+                ;
+
+            var specialPiece = environmentVariablePiece.Or(escapeSequencePiece);
+
+            var unquotedPiece = Rep1(Ch().Not(specialPiece).Not(Ch(' '))).Str();
+
+            var quotedPiece = Rep1(Ch().Not(specialPiece).Not(Ch('\"'))).Str();
+
+            var unquotedTerm = Rep1(unquotedPiece.Or(specialPiece)).Str();
+
+            var quotedTerm = Ch('\"').And(Rep(quotedPiece.Or(specialPiece)).Str()).And(Ch('\"')).Left().Down();
+            if (preserveSurroundingQuotes)
+            {
+                // Str() value assigned to quotedTerm does not include quotation marks surrounding the quoted or
+                // special piece. Add those quotes back if requested.
+                quotedTerm = quotedTerm.Build(str => "\"" + str + "\"");
+            }
+
+            var whitespace = Rep(Ch(' '));
+
+            var term = whitespace.And(quotedTerm.Or(unquotedTerm)).And(whitespace).Left().Down();
+
+            Parse = Rep(term);
+        }
+
+        public readonly Parser<IList<string>> Parse;
+
+        public static string[] Process(string text, Func<string, string> variables, bool preserveSurroundingQuotes)
+        {
+            var grammar = new CommandGrammar(variables, preserveSurroundingQuotes);
+            var cursor = new Cursor(text, 0, text.Length);
+
+            var result = grammar.Parse(cursor);
+            if (!result.Remainder.IsEnd)
+            {
+                throw new ArgumentException($"Malformed command text '{text}'", nameof(text));
+            }
+            return result.Value.ToArray();
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Cursor.cs

@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal struct Cursor
+    {
+        private readonly string _text;
+        private readonly int _start;
+        private readonly int _end;
+
+        public Cursor(string text, int start, int end)
+        {
+            _text = text;
+            _start = start;
+            _end = end;
+        }
+
+        public bool IsEnd
+        {
+            get { return _start == _end; }
+        }
+
+        public char Peek(int index)
+        {
+            return (index + _start) >= _end ? (char)0 : _text[index + _start];
+        }
+
+        public Result<TValue> Advance<TValue>(TValue result, int length)
+        {
+            return new Result<TValue>(result, new Cursor(_text, _start + length, _end));
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Grammar.cs

@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal class Grammar
+    {
+        protected static Parser<IList<TValue>> Rep1<TValue>(Parser<TValue> parser)
+        {
+            Parser<IList<TValue>> rep = Rep(parser);
+            return pos =>
+            {
+                var result = rep(pos);
+                return result.IsEmpty || !result.Value.Any() ? Result<IList<TValue>>.Empty : result;
+            };
+        }
+
+        protected static Parser<IList<TValue>> Rep<TValue>(Parser<TValue> parser)
+        {
+            return pos =>
+            {
+                var data = new List<TValue>();
+                for (; ; )
+                {
+                    var result = parser(pos);
+                    if (result.IsEmpty) break;
+                    data.Add(result.Value);
+                    pos = result.Remainder;
+                }
+                return new Result<IList<TValue>>(data, pos);
+            };
+        }
+
+        protected static Parser<char> Ch()
+        {
+            return pos => pos.IsEnd ? Result<char>.Empty : pos.Advance(pos.Peek(0), 1);
+        }
+
+        private static Parser<bool> IsEnd()
+        {
+            return pos => pos.IsEnd ? pos.Advance(true, 0) : Result<bool>.Empty;
+        }
+
+        protected static Parser<char> Ch(char ch)
+        {
+            return pos => pos.Peek(0) != ch ? Result<char>.Empty : pos.Advance(ch, 1);
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Parser.cs

@@ -0,0 +1,7 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal delegate Result<TValue> Parser<TValue>(Cursor cursor);
+}

src/Microsoft.DotNet.Cli.Utils/CommandParsing/ParserExtensions.cs

@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal static class ParserExtensions
+    {
+        public static Parser<Chain<T1, T2>> And<T1, T2>(this Parser<T1> parser1,
+            Parser<T2> parser2)
+        {
+            return pos =>
+            {
+                var result1 = parser1(pos);
+                if (result1.IsEmpty) return Result<Chain<T1, T2>>.Empty;
+                var result2 = parser2(result1.Remainder);
+                if (result2.IsEmpty) return Result<Chain<T1, T2>>.Empty;
+                return result2.AsValue(new Chain<T1, T2>(result1.Value, result2.Value));
+            };
+        }
+
+        public static Parser<T1> Or<T1>(this Parser<T1> parser1, Parser<T1> parser2)
+        {
+            return pos =>
+            {
+                var result1 = parser1(pos);
+                if (!result1.IsEmpty) return result1;
+                var result2 = parser2(pos);
+                if (!result2.IsEmpty) return result2;
+                return Result<T1>.Empty;
+            };
+        }
+
+        public static Parser<T1> Not<T1, T2>(this Parser<T1> parser1, Parser<T2> parser2)
+        {
+            return pos =>
+            {
+                var result2 = parser2(pos);
+                if (!result2.IsEmpty) return Result<T1>.Empty;
+                return parser1(pos);
+            };
+        }
+
+        public static Parser<T1> Left<T1, T2>(this Parser<Chain<T1, T2>> parser)
+        {
+            return pos =>
+            {
+                var result = parser(pos);
+                return result.IsEmpty ? Result<T1>.Empty : result.AsValue(result.Value.Left);
+            };
+        }
+
+        public static Parser<T2> Down<T1, T2>(this Parser<Chain<T1, T2>> parser)
+        {
+            return pos =>
+            {
+                var result = parser(pos);
+                return result.IsEmpty ? Result<T2>.Empty : result.AsValue(result.Value.Down);
+            };
+        }
+
+        public static Parser<T2> Build<T1, T2>(this Parser<T1> parser, Func<T1, T2> builder)
+        {
+            return pos =>
+            {
+                var result = parser(pos);
+                if (result.IsEmpty) return Result<T2>.Empty;
+                return result.AsValue(builder(result.Value));
+            };
+        }
+
+        public static Parser<string> Str(this Parser<IList<char>> parser)
+        {
+            return parser.Build(x => new string(x.ToArray()));
+        }
+
+        public static Parser<string> Str(this Parser<IList<string>> parser)
+        {
+            return parser.Build(x => String.Concat(x.ToArray()));
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Result.cs

@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.DotNet.Cli.Utils.CommandParsing
+{
+    internal struct Result<TValue>
+    {
+        public Result(TValue value, Cursor remainder)
+            : this()
+        {
+            Value = value;
+            Remainder = remainder;
+        }
+
+        public readonly TValue Value;
+        public readonly Cursor Remainder;
+
+        public bool IsEmpty
+        {
+            get { return Equals(this, default(Result<TValue>)); }
+        }
+
+        public static Result<TValue> Empty
+        {
+            get { return default(Result<TValue>); }
+        }
+
+        public Result<TValue2> AsValue<TValue2>(TValue2 value2)
+        {
+            return new Result<TValue2>(value2, Remainder);
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/CommandResult.cs

@@ -7,6 +7,8 @@ namespace Microsoft.DotNet.Cli.Utils
 {
     public struct CommandResult
     {
+        public static readonly CommandResult Empty = new CommandResult();
+
         public int ExitCode { get; }
         public string StdOut { get; }
         public string StdErr { get; }

src/Microsoft.DotNet.Cli.Utils/DictionaryExtensions.cs

@@ -0,0 +1,17 @@
+using System.Linq;
+
+namespace System.Collections.Generic
+{
+    internal static class DictionaryExtensions
+    {
+        public static IEnumerable<V> GetOrEmpty<K, V>(this IDictionary<K, IEnumerable<V>> self, K key)
+        {
+            IEnumerable<V> val;
+            if (!self.TryGetValue(key, out val))
+            {
+                return Enumerable.Empty<V>();
+            }
+            return val;
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Microsoft.DotNet.Cli.Utils.CommandParsing;
+using Microsoft.Extensions.ProjectModel;
+
+namespace Microsoft.DotNet.Cli.Utils
+{
+    internal static class ScriptExecutor
+    {
+        public static Command CreateCommandForScript(Project project, string scriptCommandLine, IDictionary<string, string> variables)
+        {
+            return CreateCommandForScript(project, scriptCommandLine, WrapVariableDictionary(variables));
+        }
+
+        public static Command CreateCommandForScript(Project project, string scriptCommandLine, Func<string, string> getVariable)
+        {
+            // Preserve quotation marks around arguments since command is about to be passed to a shell. May need
+            // the quotes to ensure the shell groups arguments correctly.
+            var scriptArguments = CommandGrammar.Process(
+                scriptCommandLine,
+                GetScriptVariable(project, getVariable),
+                preserveSurroundingQuotes: true);
+
+            // Ensure the array won't be empty and the elements won't be null or empty strings.
+            scriptArguments = scriptArguments.Where(argument => !string.IsNullOrEmpty(argument)).ToArray();
+            if (scriptArguments.Length == 0)
+            {
+                return null;
+            }
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // Only forward slashes are used in script blocks. Replace with backslashes to correctly
+                // locate the script. The directory separator is platform-specific.
+                scriptArguments[0] = scriptArguments[0].Replace(
+                    Path.AltDirectorySeparatorChar,
+                    Path.DirectorySeparatorChar);
+
+                // Command-lines on Windows are executed via "cmd /S /C" in order to support batch files, &&,
+                // built-in commands like echo, et cetera. /S allows quoting the command as well as the arguments.
+                // ComSpec is Windows-specific, and contains the full path to cmd.exe
+                var comSpec = Environment.GetEnvironmentVariable("ComSpec");
+                if (!string.IsNullOrEmpty(comSpec))
+                {
+                    scriptArguments =
+                        new[] { comSpec, "/S", "/C", "\"" }
+                        .Concat(scriptArguments)
+                        .Concat(new[] { "\"" })
+                        .ToArray();
+                }
+            }
+            else
+            {
+                // Special-case a script name that, perhaps with added .sh, matches an existing file.
+                var surroundWithQuotes = false;
+                var scriptCandidate = scriptArguments[0];
+                if (scriptCandidate.StartsWith("\"", StringComparison.Ordinal) &&
+                    scriptCandidate.EndsWith("\"", StringComparison.Ordinal))
+                {
+                    // Strip surrounding quotes; they were required in project.json to keep the script name
+                    // together but confuse File.Exists() e.g. "My Script", lacking ./ prefix and .sh suffix.
+                    surroundWithQuotes = true;
+                    scriptCandidate = scriptCandidate.Substring(1, scriptCandidate.Length - 2);
+                }
+
+                if (!scriptCandidate.EndsWith(".sh", StringComparison.Ordinal))
+                {
+                    scriptCandidate = scriptCandidate + ".sh";
+                }
+
+                if (File.Exists(Path.Combine(project.ProjectDirectory, scriptCandidate)))
+                {
+                    // scriptCandidate may be a path relative to the project root. If so, likely will not be found
+                    // in the $PATH; add ./ to let bash know where to look.
+                    var prefix = Path.IsPathRooted(scriptCandidate) ? string.Empty : "./";
+                    var quote = surroundWithQuotes ? "\"" : string.Empty;
+                    scriptArguments[0] = $"{ quote }{ prefix }{ scriptCandidate }{ quote }";
+                }
+
+                // Always use /usr/bin/env bash -c in order to support redirection and so on; similar to Windows case.
+                // Unlike Windows, must escape quotation marks within the newly-quoted string.
+                scriptArguments = new[] { "/usr/bin/env", "bash", "-c", "\"" }
+                    .Concat(scriptArguments.Select(argument => argument.Replace("\"", "\\\"")))
+                    .Concat(new[] { "\"" })
+                    .ToArray();
+            }
+
+            return Command.Create(scriptArguments.FirstOrDefault(), string.Join(" ", scriptArguments.Skip(1)))
+                .WorkingDirectory(project.ProjectDirectory);
+        }
+        private static Func<string, string> WrapVariableDictionary(IDictionary<string, string> contextVariables)
+        {
+            return key =>
+            {
+                string value;
+                contextVariables.TryGetValue(key, out value);
+                return value;
+            };
+        }
+
+        private static Func<string, string> GetScriptVariable(Project project, Func<string, string> getVariable)
+        {
+            var keys = new Dictionary<string, Func<string>>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "project:Directory", () => project.ProjectDirectory },
+                { "project:Name", () => project.Name },
+                { "project:Version", () => project.Version.ToString() },
+            };
+
+            return key =>
+            {
+                // try returning key from dictionary
+                Func<string> valueFactory;
+                if (keys.TryGetValue(key, out valueFactory))
+                {
+                    return valueFactory();
+                }
+
+                // try returning command-specific key
+                var value = getVariable(key);
+                if (!string.IsNullOrEmpty(value))
+                {
+                    return value;
+                }
+
+                // try returning environment variable
+                return Environment.GetEnvironmentVariable(key);
+            };
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/ScriptNames.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.DotNet.Cli.Utils
+{
+    internal static class ScriptNames
+    {
+        public const string PreCompile = "precompile";
+        public const string PostCompile = "postcompile";
+    }
+}

src/Microsoft.DotNet.Cli.Utils/project.json

@@ -4,12 +4,14 @@
     "shared": "**/*.cs",
 
     "dependencies": {
-        "System.AppContext": "4.0.0-beta-23504",
+        "System.AppContext": "4.0.0",
         "System.Console": "4.0.0-beta-23504",
         "System.IO.FileSystem": "4.0.1-beta-23504",
         "System.Threading": "4.0.11-beta-23504",
         "System.Diagnostics.Process": "4.1.0-beta-23504",
-        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504"
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504",
+
+        "Microsoft.DotNet.ProjectModel": { "target": "project" }
     },
     "frameworks": {
         "dnxcore50": { }

src/Microsoft.DotNet.Cli/project.json

@@ -20,5 +20,11 @@
     },
     "frameworks": {
         "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
     }
 }

src/Microsoft.DotNet.Compiler.Common/project.json

@@ -1,14 +1,20 @@
 {
-  "version": "1.0.0-*",
+    "version": "1.0.0-*",
 
-  "dependencies": {
-    "System.CommandLine": "0.1.0-*",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Runtime": "4.0.21-beta-23504",
-    "Microsoft.DotNet.ProjectModel": "1.0.0-*"
-  },
+    "dependencies": {
+        "System.CommandLine": "0.1.0-*",
+        "System.Linq": "4.0.1-beta-23504",
+        "System.Runtime": "4.0.21-beta-23504",
+        "Microsoft.DotNet.ProjectModel": "1.0.0-*"
+    },
 
-  "frameworks": {
-    "dnxcore50": { }
-  }
+    "frameworks": {
+        "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
+    }
 }

src/Microsoft.DotNet.ProjectModel/project.json

@@ -1,30 +1,36 @@
 {
-  "version": "1.0.0-*",
-  "description": "Types to model a .NET Project",
-  "dependencies": {
-    "Microsoft.CSharp": "4.0.1-beta-23504",
-    "System.Collections": "4.0.11-beta-23504",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Threading.Thread": "4.0.0-beta-23504",
-    "System.Runtime.Loader": "4.0.0-beta-23504",
-    "System.Dynamic.Runtime": "4.0.11-beta-23504",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504",
-    "System.Security.Cryptography.Algorithms": "4.0.0-beta-23504",
+    "version": "1.0.0-*",
+    "description": "Types to model a .NET Project",
+    "dependencies": {
+        "Microsoft.CSharp": "4.0.1-beta-23504",
+        "System.Collections": "4.0.11-beta-23504",
+        "System.Linq": "4.0.1-beta-23504",
+        "System.Threading.Thread": "4.0.0-beta-23504",
+        "System.Runtime.Loader": "4.0.0-beta-23504",
+        "System.Dynamic.Runtime": "4.0.11-beta-23504",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504",
+        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23504",
 
-    "NuGet.Packaging": "3.3.0-*",
+        "NuGet.Packaging": "3.3.0-*",
 
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15791",
-    "Microsoft.Extensions.JsonParser.Sources": {
-      "type": "build",
-      "version": "1.0.0-*"
+        "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15791",
+        "Microsoft.Extensions.JsonParser.Sources": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Extensions.HashCodeCombiner.Sources": {
+            "type": "build",
+            "version": "1.0.0-*"
+        }
     },
-    "Microsoft.Extensions.HashCodeCombiner.Sources": {
-      "type": "build",
-      "version": "1.0.0-*"
-    }
-  },
 
-  "frameworks": {
-    "dnxcore50": { }
-  }
+    "frameworks": {
+        "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
+    }
 }

src/Microsoft.DotNet.Tools.Compiler.Csc/project.json

@@ -1,28 +1,34 @@
 {
-  "name": "dotnet-compile-csc",
-  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "System.Console": "4.0.0-beta-23504",
-    "System.Collections": "4.0.11-beta-23504",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Diagnostics.Process": "4.1.0-beta-23504",
-    "System.IO.FileSystem": "4.0.1-beta-23504",
+    "name": "dotnet-compile-csc",
+    "version": "1.0.0-*",
+    "compilationOptions": {
+        "emitEntryPoint": true
+    },
+    "dependencies": {
+        "System.Console": "4.0.0-beta-23504",
+        "System.Collections": "4.0.11-beta-23504",
+        "System.Linq": "4.0.1-beta-23504",
+        "System.Diagnostics.Process": "4.1.0-beta-23504",
+        "System.IO.FileSystem": "4.0.1-beta-23504",
 
-    "Microsoft.DotNet.Cli.Utils": {
-      "type": "build",
-      "version": "1.0.0-*"
+        "Microsoft.DotNet.Cli.Utils": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Extensions.CommandLineUtils.Sources": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
+        "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04"
     },
-    "Microsoft.Extensions.CommandLineUtils.Sources": {
-      "type": "build",
-      "version": "1.0.0-*"
+    "frameworks": {
+        "dnxcore50": { }
     },
-    "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
-    "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04"
-  },
-  "frameworks": {
-    "dnxcore50": { }
-  }
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
+    }
 }

src/Microsoft.DotNet.Tools.Compiler.Native/project.json

@@ -5,12 +5,12 @@
         "emitEntryPoint": true
     },
     "dependencies": {
-	"Microsoft.NETCore.Platforms":"1.0.1-beta-23504",
+        "Microsoft.NETCore.Platforms": "1.0.1-beta-23504",
         "Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
         "System.Console": "4.0.0-beta-23504",
         "System.Collections": "4.0.11-beta-23504",
-      "System.Linq": "4.0.1-beta-23504",
-      "Microsoft.NETCore.TestHost": "1.0.0-beta-23504",
+        "System.Linq": "4.0.1-beta-23504",
+        "Microsoft.NETCore.TestHost": "1.0.0-beta-23504",
         "System.Diagnostics.Process": "4.1.0-beta-23504",
         "System.IO": "4.0.11-beta-23504",
         "System.IO.FileSystem": "4.0.1-beta-23504",
@@ -23,11 +23,17 @@
             "type": "build",
             "version": "1.0.0-*"
         },
-      "Microsoft.DotNet.ILCompiler": "1.0.1-*",
-      "Microsoft.DotNet.ObjectWriter": "1.0.2-*",
-      "Microsoft.DotNet.RyuJit": "1.0.0-*"
+        "Microsoft.DotNet.ILCompiler": "1.0.1-*",
+        "Microsoft.DotNet.ObjectWriter": "1.0.2-*",
+        "Microsoft.DotNet.RyuJit": "1.0.0-*"
     },
     "frameworks": {
         "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
     }
 }

src/Microsoft.DotNet.Tools.Compiler/Program.cs

@@ -230,6 +230,11 @@ namespace Microsoft.DotNet.Tools.Compiler
                 projects.Clear();
             }
 
+            return CompileProject(context, configuration, outputPath, intermediateOutputPath, dependencies);
+        }
+
+        private static bool CompileProject(ProjectContext context, string configuration, string outputPath, string intermediateOutputPath, List<LibraryExport> dependencies)
+        {
             Reporter.Output.WriteLine($"Compiling {context.RootProject.Identity.Name.Yellow()} for {context.TargetFramework.DotNetFrameworkName.Yellow()}");
             var sw = Stopwatch.StartNew();
 
@@ -257,9 +262,7 @@ namespace Microsoft.DotNet.Tools.Compiler
             }
 
             // Dump dependency data
-            // TODO: Turn on only if verbose, we can look at the response
-            // file anyways
-            // ShowDependencyInfo(dependencies);
+            ShowDependencyInfo(dependencies);
 
             // Get compilation options
             var outputName = GetProjectOutput(context.ProjectFile, context.TargetFramework, configuration, outputPath);
@@ -278,7 +281,7 @@ namespace Microsoft.DotNet.Tools.Compiler
                 // Resolve full path to key file
                 compilationOptions.KeyFile = Path.GetFullPath(Path.Combine(context.ProjectFile.ProjectDirectory, compilationOptions.KeyFile));
             }
-            
+
             // Add compilation options to the args
             compilerArgs.AddRange(compilationOptions.SerializeToArgs());
 
@@ -317,33 +320,46 @@ namespace Microsoft.DotNet.Tools.Compiler
             var rsp = Path.Combine(intermediateOutputPath, $"dotnet-compile.{context.ProjectFile.Name}.rsp");
             File.WriteAllLines(rsp, compilerArgs);
 
-            var result = Command.Create($"dotnet-compile-{compilerName}", $"@\"{rsp}\"")
-                                 .OnErrorLine(line =>
-                                 {
-                                     var diagnostic = ParseDiagnostic(context.ProjectDirectory, line);
-                                     if (diagnostic != null)
-                                     {
-                                         diagnostics.Add(diagnostic);
-                                     }
-                                     else
-                                     {
-                                         Reporter.Error.WriteLine(line);
-                                     }
-                                 })
-                                 .OnOutputLine(line =>
-                                 {
-                                     var diagnostic = ParseDiagnostic(context.ProjectDirectory, line);
+            // Run pre-compile event
+            var contextVariables = new Dictionary<string, string>()
+            {
+                { "compile:TargetFramework", context.TargetFramework.DotNetFrameworkName },
+                { "compile:Configuration", configuration },
+                { "compile:OutputFile", outputName },
+                { "compile:OutputDir", outputPath },
+                { "compile:ResponseFile", rsp }
+            };
+            RunScripts(context, ScriptNames.PreCompile, contextVariables);
 
-                                     if (diagnostic != null)
-                                     {
-                                         diagnostics.Add(diagnostic);
-                                     }
-                                     else
-                                     {
-                                         Reporter.Output.WriteLine(line);
-                                     }
-                                 })
-                                 .Execute();
+            var result = Command.Create($"dotnet-compile-{compilerName}", $"@\"{rsp}\"")
+                .OnErrorLine(line =>
+                {
+                    var diagnostic = ParseDiagnostic(context.ProjectDirectory, line);
+                    if (diagnostic != null)
+                    {
+                        diagnostics.Add(diagnostic);
+                    }
+                    else
+                    {
+                        Reporter.Error.WriteLine(line);
+                    }
+                })
+                .OnOutputLine(line =>
+                {
+                    var diagnostic = ParseDiagnostic(context.ProjectDirectory, line);
+                    if (diagnostic != null)
+                    {
+                        diagnostics.Add(diagnostic);
+                    }
+                    else
+                    {
+                        Reporter.Output.WriteLine(line);
+                    }
+                }).Execute();
+
+            // Run post-compile event
+            contextVariables["compile:CompilerExitCode"] = result.ExitCode.ToString();
+            RunScripts(context, ScriptNames.PostCompile, contextVariables);
 
             var success = result.ExitCode == 0;
 
@@ -358,6 +374,17 @@ namespace Microsoft.DotNet.Tools.Compiler
             return PrintSummary(diagnostics, sw, success);
         }
 
+        private static void RunScripts(ProjectContext context, string name, Dictionary<string, string> contextVariables)
+        {
+            foreach (var script in context.ProjectFile.Scripts.GetOrEmpty(name))
+            {
+                ScriptExecutor.CreateCommandForScript(context.ProjectFile, script, contextVariables)
+                    .ForwardStdErr()
+                    .ForwardStdOut()
+                    .Execute();
+            }
+        }
+
         private static string GetProjectOutput(Project project, NuGetFramework framework, string configuration, string outputPath)
         {
             var compilationOptions = project.GetCompilerOptions(framework, configuration);
@@ -663,7 +690,7 @@ namespace Microsoft.DotNet.Tools.Compiler
                 PrintDiagnostic(diag);
             }
         }
-        
+
         private static void PrintDiagnostic(DiagnosticMessage diag)
         {
             switch (diag.Severity)
@@ -682,28 +709,31 @@ namespace Microsoft.DotNet.Tools.Compiler
 
         private static void ShowDependencyInfo(IEnumerable<LibraryExport> dependencies)
         {
-            foreach (var dependency in dependencies)
+            if (CommandContext.IsVerbose())
             {
-                if (!dependency.Library.Resolved)
+                foreach (var dependency in dependencies)
                 {
-                    Reporter.Error.WriteLine($"  Unable to resolve dependency {dependency.Library.Identity.ToString().Red().Bold()}");
-                    Reporter.Error.WriteLine("");
-                }
-                else
-                {
-                    Reporter.Output.WriteLine($"  Using {dependency.Library.Identity.Type.Value.Cyan().Bold()} dependency {dependency.Library.Identity.ToString().Cyan().Bold()}");
-                    Reporter.Output.WriteLine($"    Path: {dependency.Library.Path}");
-
-                    foreach (var metadataReference in dependency.CompilationAssemblies)
+                    if (!dependency.Library.Resolved)
                     {
-                        Reporter.Output.WriteLine($"    Assembly: {metadataReference}");
+                        Reporter.Verbose.WriteLine($"  Unable to resolve dependency {dependency.Library.Identity.ToString().Red().Bold()}");
+                        Reporter.Verbose.WriteLine("");
                     }
-
-                    foreach (var sourceReference in dependency.SourceReferences)
+                    else
                     {
-                        Reporter.Output.WriteLine($"    Source: {sourceReference}");
+                        Reporter.Verbose.WriteLine($"  Using {dependency.Library.Identity.Type.Value.Cyan().Bold()} dependency {dependency.Library.Identity.ToString().Cyan().Bold()}");
+                        Reporter.Verbose.WriteLine($"    Path: {dependency.Library.Path}");
+
+                        foreach (var metadataReference in dependency.CompilationAssemblies)
+                        {
+                            Reporter.Verbose.WriteLine($"    Assembly: {metadataReference}");
+                        }
+
+                        foreach (var sourceReference in dependency.SourceReferences)
+                        {
+                            Reporter.Verbose.WriteLine($"    Source: {sourceReference}");
+                        }
+                        Reporter.Verbose.WriteLine("");
                     }
-                    Reporter.Output.WriteLine("");
                 }
             }
         }

src/Microsoft.DotNet.Tools.Compiler/project.json

@@ -25,5 +25,11 @@
   },
   "frameworks": {
     "dnxcore50": { }
+  },
+  "scripts": {
+    "postcompile": [
+        "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+        "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+    ]
   }
 }

src/Microsoft.DotNet.Tools.Init/project.json

@@ -1,5 +1,5 @@
 {
-    "name" : "dotnet-init",
+    "name": "dotnet-init",
     "version": "1.0.0-*",
     "compilationOptions": {
         "emitEntryPoint": true
@@ -25,8 +25,14 @@
         }
     },
     "compileExclude": [ "Template/**" ],
-    "resource":  [ "Template/**" ],
+    "resource": [ "Template/**" ],
     "frameworks": {
         "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
     }
 }

src/Microsoft.DotNet.Tools.Publish/project.json

@@ -26,5 +26,11 @@
     },
     "frameworks": {
         "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
     }
 }

src/Microsoft.DotNet.Tools.Repl.Csi/project.json

@@ -1,28 +1,34 @@
 {
-  "name": "dotnet-repl-csi",
-  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "System.Console": "4.0.0-beta-23504",
-    "System.Collections": "4.0.11-beta-23504",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Diagnostics.Process": "4.1.0-beta-23504",
-    "System.IO.FileSystem": "4.0.1-beta-23504",
-    "System.AppContext": "4.0.1-beta-23504",
+    "name": "dotnet-repl-csi",
+    "version": "1.0.0-*",
+    "compilationOptions": {
+        "emitEntryPoint": true
+    },
+    "dependencies": {
+        "System.Console": "4.0.0-beta-23504",
+        "System.Collections": "4.0.11-beta-23504",
+        "System.Linq": "4.0.1-beta-23504",
+        "System.Diagnostics.Process": "4.1.0-beta-23504",
+        "System.IO.FileSystem": "4.0.1-beta-23504",
+        "System.AppContext": "4.0.1-beta-23504",
 
-    "Microsoft.DotNet.Cli.Utils": {
-      "type": "build",
-      "version": "1.0.0-*"
+        "Microsoft.DotNet.Cli.Utils": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Extensions.CommandLineUtils.Sources": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02"
     },
-    "Microsoft.Extensions.CommandLineUtils.Sources": {
-      "type": "build",
-      "version": "1.0.0-*"
+    "frameworks": {
+        "dnxcore50": { }
     },
-    "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02"
-  },
-  "frameworks": {
-    "dnxcore50": { }
-  }
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
+    }
 }

src/Microsoft.DotNet.Tools.Repl/project.json

@@ -1,27 +1,33 @@
 {
-  "name": "dotnet-repl",
-  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "System.Console": "4.0.0-beta-23504",
-    "System.Collections": "4.0.11-beta-23504",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Diagnostics.Process": "4.1.0-beta-23504",
-    "System.IO.FileSystem": "4.0.1-beta-23504",
-
-    "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
-      "type": "build",
-      "version": "1.0.0-*"
+    "name": "dotnet-repl",
+    "version": "1.0.0-*",
+    "compilationOptions": {
+        "emitEntryPoint": true
     },
-    "Microsoft.Extensions.CommandLineUtils.Sources": {
-      "type": "build",
-      "version": "1.0.0-*"
+    "dependencies": {
+        "System.Console": "4.0.0-beta-23504",
+        "System.Collections": "4.0.11-beta-23504",
+        "System.Linq": "4.0.1-beta-23504",
+        "System.Diagnostics.Process": "4.1.0-beta-23504",
+        "System.IO.FileSystem": "4.0.1-beta-23504",
+
+        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
+        "Microsoft.DotNet.Cli.Utils": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Extensions.CommandLineUtils.Sources": {
+            "type": "build",
+            "version": "1.0.0-*"
+        }
+    },
+    "frameworks": {
+        "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
     }
-  },
-  "frameworks": {
-    "dnxcore50": { }
-  }
 }

src/Microsoft.DotNet.Tools.Resgen/project.json

@@ -24,5 +24,11 @@
     },
     "frameworks": {
         "dnxcore50": { }
+    },
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
     }
 }

src/Microsoft.DotNet.Tools.Run/project.json

@@ -1,28 +1,34 @@
 {
-  "name": "dotnet-run",
-  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "System.Console": "4.0.0-beta-23504",
-    "System.Collections": "4.0.11-beta-23504",
-    "System.Linq": "4.0.1-beta-23504",
-    "System.Diagnostics.Process": "4.1.0-beta-23504",
-    "System.IO.FileSystem": "4.0.1-beta-23504",
+    "name": "dotnet-run",
+    "version": "1.0.0-*",
+    "compilationOptions": {
+        "emitEntryPoint": true
+    },
+    "dependencies": {
+        "System.Console": "4.0.0-beta-23504",
+        "System.Collections": "4.0.11-beta-23504",
+        "System.Linq": "4.0.1-beta-23504",
+        "System.Diagnostics.Process": "4.1.0-beta-23504",
+        "System.IO.FileSystem": "4.0.1-beta-23504",
 
-    "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
-        "type": "build",
-        "version": "1.0.0-*"
+        "Microsoft.DotNet.ProjectModel": "1.0.0-*",
+        "Microsoft.DotNet.Cli.Utils": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Extensions.CommandLineUtils.Sources": {
+            "type": "build",
+            "version": "1.0.0-*"
+        },
+        "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04"
     },
-    "Microsoft.Extensions.CommandLineUtils.Sources": {
-        "type": "build",
-        "version": "1.0.0-*"
+    "frameworks": {
+        "dnxcore50": { }
     },
-    "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04"
-  },
-  "frameworks": {
-    "dnxcore50": { }
-  }
+    "scripts": {
+        "postcompile": [
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.dll\"",
+            "../../scripts/build/place-binary \"%compile:OutputDir%/%project:Name%.pdb\""
+        ]
+    }
 }