Merge pull request #4127 from livarcocc/merge_feature_msbuild_into_rel100

Merge feature msbuild into rel100

.gitignore

@@ -37,6 +37,9 @@ cmake/
 # stage0 install directory
 .dotnet_stage0
 
+# build tools directory
+build_tools
+
 # `dotnet new` template zip files are generated by a pre-build step.
 /src/dotnet/commands/dotnet-new/*.zip
 
@@ -61,7 +64,6 @@ cmake/
 [Rr]eleases/
 x64/
 x86/
-build/
 bld/
 [Bb]in/
 [Oo]bj/
@@ -149,6 +151,7 @@ _ReSharper*/
 *.DotSettings.user
 .idea/
 *.iml
+*.DotSettings
 
 # JustCode is a .NET coding add-in
 .JustCode
@@ -184,9 +187,6 @@ DocProject/Help/*.hhp
 DocProject/Help/Html2
 DocProject/Help/html
 
-# Click-Once directory
-publish/
-
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml

BuildToolsCliVersion.txt

@@ -0,0 +1 @@
+1.0.0-preview2-002733

BuildToolsVersion.txt

@@ -0,0 +1 @@
+1.0.26-prerelease-00621-06

Documentation/developer-guide.md

@@ -53,7 +53,7 @@ For E2E and functional tests, they all depend on the binaries located under `art
 1. `cd src\dotnet\`
 2. `dotnet build`
 3. `cp bin\debug\netstandardapp1.5\dotnet.dll artifacts\rid\stage2`
-4. `cd ..\..\test\dotnet-build.Tests`
+4. `cd ..\..\test\dotnet.Tests`
 5. `dotnet test`
 
 ##Adding a Command

Documentation/specs/installation-scenarios.md

@@ -18,12 +18,12 @@ This section describes placeholders used inside this spec.
 # Build Output
 Each official, successful build should create and upload packages to location described by following URLs:
 ```
-https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/<Version>/dotnet.<OSID>.<Version>.<Extension>
+https://dotnetcli.azureedge.net/dotnet/<Channel>/<Version>/dotnet.<OSID>.<Version>.<Extension>
 
 Currently:
-https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/Binaries/<Version>/dotnet-sharedframework-<OSName>-<Architecture>.<Version>.zip
+https://dotnetcli.azureedge.net/dotnet/<Channel>/Binaries/<Version>/dotnet-sharedframework-<OSName>-<Architecture>.<Version>.zip
-https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/Binaries/<Version>/dotnet-host-<OSName>-<Architecture>.<Version>.zip
+https://dotnetcli.azureedge.net/dotnet/<Channel>/Binaries/<Version>/dotnet-host-<OSName>-<Architecture>.<Version>.zip
-https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/Binaries/<Version>/dotnet-<OSName>-<Architecture>.<Version>.zip
+https://dotnetcli.azureedge.net/dotnet/<Channel>/Binaries/<Version>/dotnet-<OSName>-<Architecture>.<Version>.zip
 ```
 Content of the package should contain binaries which layout will be described later.
 
@@ -105,7 +105,7 @@ WIP: Exact script action description.
 | -DryRun | --dry-run | `<not set>` | If switch present, installation will not be performed and instead deterministic invocation with specific version and zip location will be displayed. |
 | -NoPath | --no-path | `<not set>` | If switch present the script will not set PATH environmental variable for the current process. |
 | -Verbose | --verbose | `<not set>` | If switch present displays diagnostics information. |
-| -AzureFeed | --azure-feed | See description | Azure feed URL, default: `https://dotnetcli.blob.core.windows.net/dotnet` |
+| -AzureFeed | --azure-feed | See description | Azure feed URL, default: `https://dotnetcli.azureedge.net/dotnet` |
 
 ### Script location
 WIP: permanent link for obtaining latest version
@@ -143,7 +143,7 @@ Version files can be found in multiple places:
 
 URL:
 ```
-https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/<VersionPointer>.<OSID>.version
+https://dotnetcli.azureedge.net/dotnet/<Channel>/<VersionPointer>.<OSID>.version
 ```
 
 ### File content
@@ -156,7 +156,7 @@ Each version file contains two lines describing the build:
 ## Version badge
 Version badge (SVG) is an image with textual representation of `<Version>`. It can be found under following URL:
 ```
-https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/<VersionPointer>.<OSID>.svg
+https://dotnetcli.azureedge.net/dotnet/<Channel>/<VersionPointer>.<OSID>.svg
 ```
 
 ## Questions/gaps

Microsoft.DotNet.Cli.sln

@@ -1,12 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A29E8E3-A0FC-4C57-81DD-297B56D1A119}"
 	ProjectSection(SolutionItems) = preProject
+		build.proj = build.proj
 		global.json = global.json
 		NuGet.Config = NuGet.Config
 	EndProjectSection
@@ -27,24 +28,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0722D325
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MultiProjectValidator", "tools\MultiProjectValidator\MultiProjectValidator.xproj", "{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.xproj", "{688870C8-9843-4F9E-8576-D39290AD0F25}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EndToEnd", "test\EndToEnd\EndToEnd.xproj", "{65741CB1-8AEE-4C66-8198-10A7EA0E4258}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Test.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Test.Utilities.xproj", "{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestProjects", "TestProjects", "{713CBFBB-5392-438D-B766-A9A585EF1BB8}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet", "src\dotnet\dotnet.xproj", "{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.xproj", "{833FFEE1-7EED-4F51-8DFD-946D48833333}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile.Tests", "test\dotnet-compile.Tests\dotnet-compile.Tests.xproj", "{833FFEE1-7EED-4F51-8DFD-946D48893D6E}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.xproj", "{386D412C-003C-47B1-8258-0E35865CB7C4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server.Tests", "test\dotnet-projectmodel-server.Tests\dotnet-projectmodel-server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Files", "src\Microsoft.DotNet.Files\Microsoft.DotNet.Files.xproj", "{D521DD9F-0614-4929-93B4-D8FA5682C174}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.xproj", "{CB710268-4A82-48E4-9531-FAF1C8F78F4B}"
@@ -65,8 +58,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Cli.Msi.Tests", "test\Installer\Microsoft.DotNet.Cli.Msi.Tests\Microsoft.DotNet.Cli.Msi.Tests.xproj", "{0B31C336-149D-471A-B7B1-27B0F1E80F83}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel.Tests", "test\Microsoft.Extensions.DependencyModel.Tests\Microsoft.Extensions.DependencyModel.Tests.xproj", "{4A4711D8-4312-49FC-87B5-4F183F4C6A51}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.xproj", "{0724ED7C-56E3-4604-9970-25E600611383}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-test.UnitTests", "test\dotnet-test.UnitTests\dotnet-test.UnitTests.xproj", "{857274AC-E741-4266-A7FD-14DEE0C1CC96}"
@@ -115,8 +106,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "update-dependencies", "buil
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader", "src\Microsoft.DotNet.ProjectModel.Loader\Microsoft.DotNet.ProjectModel.Loader.xproj", "{1C599FFD-FB52-4279-A8E5-465D3EC499E1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader.Tests", "test\Microsoft.DotNet.ProjectModel.Loader.Tests\Microsoft.DotNet.ProjectModel.Loader.Tests.xproj", "{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.xproj", "{E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.xproj", "{4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}"
@@ -125,6 +114,56 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Archive",
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.xproj", "{712A4AFF-D758-49B0-AB46-B6DD2FFC9D26}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-build3.Tests", "test\dotnet-build3.Tests\dotnet-build3.Tests.xproj", "{49D7318E-D198-4E2B-BBEA-3A24D805F88D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}"
+	ProjectSection(SolutionItems) = preProject
+		build\Microsoft.DotNet.Cli.Compile.targets = build\Microsoft.DotNet.Cli.Compile.targets
+		build\Microsoft.DotNet.Cli.Monikers.props = build\Microsoft.DotNet.Cli.Monikers.props
+		build\Microsoft.DotNet.Cli.Package.targets = build\Microsoft.DotNet.Cli.Package.targets
+		build\Microsoft.DotNet.Cli.Prepare.targets = build\Microsoft.DotNet.Cli.Prepare.targets
+		build\Microsoft.DotNet.Cli.Publish.targets = build\Microsoft.DotNet.Cli.Publish.targets
+		build\Microsoft.DotNet.Cli.Run.targets = build\Microsoft.DotNet.Cli.Run.targets
+		build\Microsoft.DotNet.Cli.tasks = build\Microsoft.DotNet.Cli.tasks
+		build\Microsoft.DotNet.Cli.Test.targets = build\Microsoft.DotNet.Cli.Test.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"
+	ProjectSection(SolutionItems) = preProject
+		build\package\Microsoft.DotNet.Cli.Archive.targets = build\package\Microsoft.DotNet.Cli.Archive.targets
+		build\package\Microsoft.DotNet.Cli.Installer.DEB.targets = build\package\Microsoft.DotNet.Cli.Installer.DEB.targets
+		build\package\Microsoft.DotNet.Cli.Installer.MSI.targets = build\package\Microsoft.DotNet.Cli.Installer.MSI.targets
+		build\package\Microsoft.DotNet.Cli.Installer.PKG.targets = build\package\Microsoft.DotNet.Cli.Installer.PKG.targets
+		build\package\Microsoft.DotNet.Cli.Layout.targets = build\package\Microsoft.DotNet.Cli.Layout.targets
+		build\package\Microsoft.DotNet.Cli.Nupkg.targets = build\package\Microsoft.DotNet.Cli.Nupkg.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "compile", "compile", "{8E3354BD-827F-41B7-9EE6-6BE1F1EDD8E9}"
+	ProjectSection(SolutionItems) = preProject
+		build\compile\Microsoft.DotNet.Cli.LzmaArchive.targets = build\compile\Microsoft.DotNet.Cli.LzmaArchive.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2DE2-47F6-8C35-3CF0589CF2B8}"
+	ProjectSection(SolutionItems) = preProject
+		build\test\TestAssetProjects.targets = build\test\TestAssetProjects.targets
+		build\test\TestPackageProjects.targets = build\test\TestPackageProjects.targets
+		build\test\TestProjects.targets = build\test\TestProjects.targets
+	EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.xproj", "{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B12960-ABB0-4903-9C60-5E9157E659C8}"
+	ProjectSection(SolutionItems) = preProject
+		build\publish\Microsoft.DotNet.Cli.Badge.targets = build\publish\Microsoft.DotNet.Cli.Badge.targets
+		build\publish\PublishContent.targets = build\publish\PublishContent.targets
+	EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.xproj", "{0E083818-2320-4388-8007-4F720FD5C634}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectJsonMigration.Tests", "test\Microsoft.DotNet.ProjectJsonMigration.Tests\Microsoft.DotNet.ProjectJsonMigration.Tests.xproj", "{1F2EF070-AC5F-4078-AFB0-65745AC691B9}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.xproj", "{1F2EF070-AC5F-4078-AFB0-65745AC691B9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -217,22 +256,6 @@ Global
 		{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|x64.Build.0 = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Release|x64.ActiveCfg = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Release|x64.Build.0 = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -265,22 +288,6 @@ Global
 		{65741CB1-8AEE-4C66-8198-10A7EA0E4258}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{65741CB1-8AEE-4C66-8198-10A7EA0E4258}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{65741CB1-8AEE-4C66-8198-10A7EA0E4258}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|x64.Build.0 = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|x64.ActiveCfg = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|x64.Build.0 = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -297,22 +304,6 @@ Global
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|x64.Build.0 = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|Any CPU.Build.0 = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|x64.ActiveCfg = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|x64.Build.0 = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{833FFEE1-7EED-4F51-8DFD-946D48893D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{833FFEE1-7EED-4F51-8DFD-946D48893D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{833FFEE1-7EED-4F51-8DFD-946D48893D6E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -345,22 +336,6 @@ Global
 		{386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{D521DD9F-0614-4929-93B4-D8FA5682C174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D521DD9F-0614-4929-93B4-D8FA5682C174}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D521DD9F-0614-4929-93B4-D8FA5682C174}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -489,22 +464,6 @@ Global
 		{0B31C336-149D-471A-B7B1-27B0F1E80F83}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{0B31C336-149D-471A-B7B1-27B0F1E80F83}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{0B31C336-149D-471A-B7B1-27B0F1E80F83}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|x64.Build.0 = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|x64.ActiveCfg = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|x64.Build.0 = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{0724ED7C-56E3-4604-9970-25E600611383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0724ED7C-56E3-4604-9970-25E600611383}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0724ED7C-56E3-4604-9970-25E600611383}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -841,22 +800,6 @@ Global
 		{1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|x64.Build.0 = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|x64.Build.0 = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -921,6 +864,103 @@ Global
 		{712A4AFF-D758-49B0-AB46-B6DD2FFC9D26}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{712A4AFF-D758-49B0-AB46-B6DD2FFC9D26}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{712A4AFF-D758-49B0-AB46-B6DD2FFC9D26}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Debug|x64.Build.0 = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Release|x64.ActiveCfg = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.Release|x64.Build.0 = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.Release|x64.Build.0 = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|x64.Build.0 = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|x64.ActiveCfg = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|x64.Build.0 = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.Debug|x64.ActiveCfg = Debug|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.Debug|x64.Build.0 = Debug|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.Release|x64.ActiveCfg = Release|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.Release|x64.Build.0 = Release|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{0E083818-2320-4388-8007-4F720FD5C634}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{0E083818-2320-4388-8007-4F720FD5C634}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Debug|x64.ActiveCfg = Debug|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Debug|x64.Build.0 = Debug|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Release|x64.ActiveCfg = Release|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.Release|x64.Build.0 = Release|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.ActiveCfg = Debug|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.Build.0 = Debug|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.ActiveCfg = Release|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.Build.0 = Release|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -931,16 +971,12 @@ Global
 		{A16958E1-24C7-4F1E-B317-204AD91625DD} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{BD7833F8-3209-4682-BF75-B4BCA883E279} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
-		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85} = {0722D325-24C8-4E83-B5AF-0A083E7F0749}
 		{688870C8-9843-4F9E-8576-D39290AD0F25} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{65741CB1-8AEE-4C66-8198-10A7EA0E4258} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
-		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{713CBFBB-5392-438D-B766-A9A585EF1BB8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
-		{833FFEE1-7EED-4F51-8DFD-946D48833333} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{833FFEE1-7EED-4F51-8DFD-946D48893D6E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{386D412C-003C-47B1-8258-0E35865CB7C4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
-		{11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{D521DD9F-0614-4929-93B4-D8FA5682C174} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{CB710268-4A82-48E4-9531-FAF1C8F78F4B} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{920B71D8-62DA-4F5E-8A26-926C113F1D97} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
@@ -950,7 +986,6 @@ Global
 		{0745410A-6629-47EB-AAB5-08D6288CAD72} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{0E3300A4-DF54-40BF-87D8-E7658330C288} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{0B31C336-149D-471A-B7B1-27B0F1E80F83} = {0E3300A4-DF54-40BF-87D8-E7658330C288}
-		{4A4711D8-4312-49FC-87B5-4F183F4C6A51} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{0724ED7C-56E3-4604-9970-25E600611383} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{857274AC-E741-4266-A7FD-14DEE0C1CC96} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{60C33D0A-A5D8-4AB0-9956-1F804654DF05} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
@@ -975,10 +1010,19 @@ Global
 		{B768BD29-12BF-4C7C-B093-03193FE244D1} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3}
 		{A28BD8AC-DF15-4F58-8299-98A9AE2B8726} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3}
 		{1C599FFD-FB52-4279-A8E5-465D3EC499E1} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
-		{5DF6C9DA-6909-4EC0-909E-6913580BB4A4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{35B19F22-B8C0-4849-9C35-3F809B7588B8} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{712A4AFF-D758-49B0-AB46-B6DD2FFC9D26} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{49D7318E-D198-4E2B-BBEA-3A24D805F88D} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE} = {89905EC4-BC0F-443B-8ADF-691321F10108}
+		{8E3354BD-827F-41B7-9EE6-6BE1F1EDD8E9} = {89905EC4-BC0F-443B-8ADF-691321F10108}
+		{FF498306-2DE2-47F6-8C35-3CF0589CF2B8} = {89905EC4-BC0F-443B-8ADF-691321F10108}
+		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{27B12960-ABB0-4903-9C60-5E9157E659C8} = {89905EC4-BC0F-443B-8ADF-691321F10108}
+		{6D028154-5518-4A56-BAD6-938A90E5BCF6} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{0E083818-2320-4388-8007-4F720FD5C634} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{1F2EF070-AC5F-4078-AFB0-65745AC691B9} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 	EndGlobalSection
 EndGlobal

NuGet.Config

@@ -5,6 +5,7 @@
     <clear />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
+    <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

README.md

@@ -41,7 +41,7 @@ Build Status
 Installers and Binaries
 -----------------------
 
-You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip). You can download the product in two flavours:
+You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip). You can download the product in two flavors:
 
 - .NET Core - .NET Core runtime and framework
 - .NET Core SDK - .NET Core + CLI tools
@@ -122,4 +122,3 @@ License
 --------------------
 
 By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).
-

TestAssets/LockFiles/ExportFiles/valid/project.lock.json

@@ -57,5 +57,9 @@
       "ClassLibrary2",
       "ClassLibrary3"
     ]
+  },
+  "packageFolders": {
+    "/foo/packages": {},
+    "/foo/packages2": {}
   }
 }

TestAssets/ProjectModelServer/DthTestProjects/global.json

@@ -1,3 +0,0 @@
-{
-  "projects": ["src"]
-}

TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json

@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0",
-    "EmptyLibrary": "1.0.0-*"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/Program.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace Misc.DthTestProjects.EmptyConsoleApp
-{
-    public class Program
-    {
-        public int Main(string[] args)
-        {
-            Console.WriteLine("Hello, world.");
-            return 0;
-        }
-    }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json

@@ -1,11 +0,0 @@
-{
-  "dependencies": {},
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": "1.0.0"
-      }
-    },
-    "dnx451": {}
-  }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/Class.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace Misc.DthTestProjects.EmptyLibrary
-{
-    public class Class
-    {
-    }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project-update.json

@@ -1,11 +0,0 @@
-{
-  "dependencies": { },
-  "frameworks": {
-    "dnxcore50": {
-      "dependencies":{
-        "NETStandard.Library": "1.0.0-rc2-23811",
-        "System.Console": "4.0.0-beta-*"
-      }
-    }
-  }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json

@@ -1,12 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "dependencies": {},
-  "frameworks": {
-    "netstandard1.3": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "NETStandard.Library": "1.6.0"
-      }
-    }
-  }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/Program.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace Misc.DthTestProjects.SimpleConsoleApp
-{
-    public class Program
-    {
-        public int Main(string[] args)
-        {
-            Console.WriteLine("Hello, world.");
-            return 0;
-        }
-    }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/Program.cs

@@ -1,14 +0,0 @@
-namespace FailReleaseProject
-{
-    public class Program
-    {
-        public int Main(string[] args)
-        {
-#if RELEASE
-            // fail the compilation under Release configuration
-            i
-#endif
-            return 0;
-        }
-    }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json

@@ -1,11 +0,0 @@
-{
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "Microsoft.NETCore.App": "1.0.0"
-      }
-    }
-  },
-  "dependencies": {}
-}

TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json

@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0",
-    "Microsoft.Web.Administration": "7.0.0"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/UnresolvedPackageSample/project.json

@@ -1,8 +0,0 @@
-{
-  "dependencies": { 
-    "NoSuchPackage": "1.0.0"
-  },
-  "frameworks": {
-    "dnx451": { }
-  }
-}

TestAssets/ProjectModelServer/DthTestProjects/src/UnresolvedProjectSample/project.json

@@ -1,8 +0,0 @@
-{
-  "dependencies": { 
-    "EmptyLibrary": "1.0.0-*"
-  },
-  "frameworks": {
-    "dnx451": { }
-  }
-}

TestAssets/ProjectModelServer/DthUpdateSearchPathSample/ext/Newtonsoft.Json/project.json

@@ -1,8 +0,0 @@
-{
-  "version": "9.0.1",
-  "dependencies": {
-  },
-  "frameworks": {
-    "netstandard1.5": { }
-  }
-}

TestAssets/ProjectModelServer/DthUpdateSearchPathSample/home/global.json

@@ -1,6 +0,0 @@
-{
-  "projects": [
-    "src",
-    "../ext"
-  ]
-}

TestAssets/ProjectModelServer/DthUpdateSearchPathSample/home/src/MainProject/project.json

@@ -1,8 +0,0 @@
-{
-  "dependencies": {
-    "Newtonsoft.Json": "9.0.1"
-  },
-  "frameworks": {
-    "netstandard1.5": {}
-  }
-}

TestAssets/ProjectModelServer/IncorrectGlobalJson/global.json

@@ -1,3 +0,0 @@
-{
-    "projects": ["src"]]
-}

TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/NuGet.Config

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>

TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json

@@ -1,12 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  }
-}

TestAssets/ProjectModelServer/IncorrectProjectJson/project.json

@@ -1,9 +0,0 @@
-{
-    "version": "1.0.0-*",
-    "dependencies": {
-        "
-    },
-    "frameworks": {
-        []
-    }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/.gitignore

@@ -1,3 +0,0 @@
-# Negates the lock file
-# MSBuiild references' project model server tests requires these lock files, since they can't be created without VS tooling.
-!project.lock.json

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary1/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ClassLibrary1
-{
-    public class Class1
-    {
-    }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary1/ClassLibrary1.csproj

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FD073258-550B-4E57-86AE-DC4874015EB1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClassLibrary1</RootNamespace>
-    <AssemblyName>ClassLibrary1</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Class1.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary1/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClassLibrary1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClassLibrary1")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fd073258-550b-4e57-86ae-dc4874015eb1")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary1/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
-</packages>

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary2/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ClassLibrary2
-{
-    public class Class1
-    {
-    }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary2/ClassLibrary2.csproj

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>0f2d2a48-e867-496c-85a7-e97b64cfeda4</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClassLibrary2</RootNamespace>
-    <AssemblyName>ClassLibrary2</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System"/>
-    
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Xml.Linq"/>
-    <Reference Include="System.Data.DataSetExtensions"/>
-    
-    
-    <Reference Include="Microsoft.CSharp"/>
-    
-    <Reference Include="System.Data"/>
-    
-    <Reference Include="System.Net.Http"/>
-    
-    <Reference Include="System.Xml"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Class1.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-
- </Project>

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary2/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClassLibrary2")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClassLibrary2")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0f2d2a48-e867-496c-85a7-e97b64cfeda4")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary3/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ClassLibrary3
-{
-    public class Class1
-    {
-    }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary3/ClassLibrary3.csproj

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>428e95cb-8435-414b-a313-9d734c633b3e</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ClassLibrary3</RootNamespace>
-    <AssemblyName>ClassLibrary3</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System"/>
-    
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Xml.Linq"/>
-    <Reference Include="System.Data.DataSetExtensions"/>
-    
-    
-    <Reference Include="Microsoft.CSharp"/>
-    
-    <Reference Include="System.Data"/>
-    
-    <Reference Include="System.Net.Http"/>
-    
-    <Reference Include="System.Xml"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Class1.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-
- </Project>

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ClassLibrary3/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClassLibrary3")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClassLibrary3")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("428e95cb-8435-414b-a313-9d734c633b3e")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/ConsoleApp13.sln

@@ -1,53 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25029.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1443ACE0-3065-4C20-AD59-D561798AE0A5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0AE82780-22C8-4DC8-8F1E-86977FDD092F}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConsoleApp13", "src\ConsoleApp13\ConsoleApp13.xproj", "{767D3038-AC3A-4722-B21F-F85F2CBC3AA3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary1", "ClassLibrary1\ClassLibrary1.csproj", "{FD073258-550B-4E57-86AE-DC4874015EB1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary2", "ClassLibrary2\ClassLibrary2.csproj", "{0F2D2A48-E867-496C-85A7-E97B64CFEDA4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary3", "ClassLibrary3\ClassLibrary3.csproj", "{428E95CB-8435-414B-A313-9D734C633B3E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{767D3038-AC3A-4722-B21F-F85F2CBC3AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{767D3038-AC3A-4722-B21F-F85F2CBC3AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{767D3038-AC3A-4722-B21F-F85F2CBC3AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{767D3038-AC3A-4722-B21F-F85F2CBC3AA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD073258-550B-4E57-86AE-DC4874015EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD073258-550B-4E57-86AE-DC4874015EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD073258-550B-4E57-86AE-DC4874015EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD073258-550B-4E57-86AE-DC4874015EB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F2D2A48-E867-496C-85A7-E97B64CFEDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F2D2A48-E867-496C-85A7-E97B64CFEDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F2D2A48-E867-496C-85A7-E97B64CFEDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F2D2A48-E867-496C-85A7-E97B64CFEDA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{428E95CB-8435-414B-A313-9D734C633B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{428E95CB-8435-414B-A313-9D734C633B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{428E95CB-8435-414B-A313-9D734C633B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{428E95CB-8435-414B-A313-9D734C633B3E}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{767D3038-AC3A-4722-B21F-F85F2CBC3AA3} = {1443ACE0-3065-4C20-AD59-D561798AE0A5}
-		{FD073258-550B-4E57-86AE-DC4874015EB1} = {1443ACE0-3065-4C20-AD59-D561798AE0A5}
-		{0F2D2A48-E867-496C-85A7-E97B64CFEDA4} = {1443ACE0-3065-4C20-AD59-D561798AE0A5}
-		{428E95CB-8435-414B-A313-9D734C633B3E} = {1443ACE0-3065-4C20-AD59-D561798AE0A5}
-	EndGlobalSection
-EndGlobal

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/global.json

@@ -1,3 +0,0 @@
-{
-  "projects": [ "src", "test" ]
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/Program.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ConsoleApp13
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var q = new ClassLibrary1.Class1();
-        }
-    }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/Properties/AssemblyInfo.cs

@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ConsoleApp13")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("767d3038-ac3a-4722-b21f-f85f2cbc3aa3")]

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/project.fragment.lock.json

@@ -1,36 +0,0 @@
-{
-  "version": 2,
-  "exports": {
-    "ClassLibrary1/1.0.0": {
-      "type": "project",
-      "framework": ".NETFramework,Version=v4.5.2",
-      "compile": {
-        "bin/Debug/ClassLibrary1.dll": {}
-      },
-      "runtime": {
-        "../packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.dll": {},
-        "bin/Debug/ClassLibrary1.dll": {}
-      }
-    },
-    "ClassLibrary2/1.0.0": {
-      "type": "project",
-      "framework": ".NETFramework,Version=v4.6",
-      "compile": {
-        "bin/Debug/ClassLibrary2.dll": {}
-      },
-      "runtime": {
-        "bin/Debug/ClassLibrary2.dll": {}
-      }
-    },
-    "ClassLibrary3/1.0.0": {
-      "type": "project",
-      "framework": ".NETFramework,Version=v4.6",
-      "compile": {
-        "bin/Debug/ClassLibrary3.dll": {}
-      },
-      "runtime": {
-        "bin/Debug/ClassLibrary3.dll": {}
-      }
-    }
-  }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/project.json

@@ -1,21 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-  "frameworks": {
-    "net46": {
-      "dependencies": {
-        "ClassLibrary1": {
-          "target": "project"
-        },
-        "ClassLibrary2": {
-          "target": "project"
-        },
-        "ClassLibrary3": {
-          "target": "project"
-        }
-      }
-    }
-  }
-}

TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/project.lock.json

@@ -1,61 +0,0 @@
-{
-  "locked": false,
-  "version": 2,
-  "targets": {
-    ".NETFramework,Version=v4.6": {
-      "ClassLibrary1/1.0.0": {
-        "type": "project"
-      },
-      "ClassLibrary2/1.0.0": {
-        "type": "project"
-      },
-      "ClassLibrary3/1.0.0": {
-        "type": "project"
-      }
-    },
-    ".NETFramework,Version=v4.6/win7-x64": {
-      "ClassLibrary1/1.0.0": {
-        "type": "project"
-      },
-      "ClassLibrary2/1.0.0": {
-        "type": "project"
-      },
-      "ClassLibrary3/1.0.0": {
-        "type": "project"
-      }
-    },
-    ".NETFramework,Version=v4.6/win7-x86": {
-      "ClassLibrary1/1.0.0": {
-        "type": "project"
-      },
-      "ClassLibrary2/1.0.0": {
-        "type": "project"
-      },
-      "ClassLibrary3/1.0.0": {
-        "type": "project"
-      }
-    }
-  },
-  "libraries": {
-    "ClassLibrary1/1.0.0": {
-      "type": "project",
-      "msbuildProject": "../../ClassLibrary1/ClassLibrary1.csproj"
-    },
-    "ClassLibrary2/1.0.0": {
-      "type": "project",
-      "msbuildProject": "../../ClassLibrary2/ClassLibrary2.csproj"
-    },
-    "ClassLibrary3/1.0.0": {
-      "type": "project",
-      "msbuildProject": "../../ClassLibrary3/ClassLibrary3.csproj"
-    }
-  },
-  "projectFileDependencyGroups": {
-    "": [],
-    ".NETFramework,Version=v4.6": [
-      "ClassLibrary1",
-      "ClassLibrary2",
-      "ClassLibrary3"
-    ]
-  }
-}

TestAssets/ProjectModelServer/MscorlibLibraryDuplication/project.json

@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-  },
-  "frameworks": {
-    "net45": {
-      "frameworkAssemblies": {
-        "mscorlib": ""
-      }
-    }
-  }
-}

TestAssets/TestPackages/dotnet-dependency-context-test/project.json

@@ -8,9 +8,7 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "Microsoft.Extensions.DependencyModel": {
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000919"
-      "target": "project"
-    }
   },
   "frameworks": {
     "netcoreapp1.0": {

TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json

@@ -1,9 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.Extensions.DependencyModel": {
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000919"
-      "target": "project"
-    }
   },
   "frameworks": {
     "netstandard1.6": {

TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
+    <OutputPath>bin\$(Configuration)\netcoreapp1.0</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <None Include="project.json" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft.CSharp.targets" />
+</Project>

TestAssets/TestProjects/MSBuildTestApp/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace MSBuildTestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}

TestAssets/TestProjects/MSBuildTestApp/project.json

@@ -0,0 +1,13 @@
+{
+  "frameworks": {
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160822-4",
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0",
+          "type": "platform"
+        }
+      }
+    }
+  }
+}

TestAssets/TestProjects/NuGet.Config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="Local" value="Packages" />

TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json

@@ -1,9 +1,8 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
-    "Microsoft.NETCore.Platforms": "1.0.1",
+    "xunit": "2.2.0-beta3-build3330"
-    "xunit": "2.1.0"
   },
   "frameworks": {
     "netcoreapp1.0": {

TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json

@@ -7,8 +7,11 @@
     },
     "System.Linq.Expressions": "4.1.0",
     "System.Runtime.Serialization.Primitives": "4.1.1",
-    "xunit": "2.1.0",
+    "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
+    "Microsoft.DotNet.InternalAbstractions": {
+      "target": "project"
+    }
   },
   "frameworks": {
     "netcoreapp1.0": {

TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>58808bbc-371e-47d6-a3d0-4902145eda4e</ProjectGuid>
-    <RootNamespace>TestApp</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>

TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>947dd232-8d9b-4b78-9c6a-94f807d2dd58</ProjectGuid>
-    <RootNamespace>TestLibrary</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>

TestAssets/TestProjects/TestAppWithMigrateableScripts/Program.cs

@@ -0,0 +1,17 @@
+// 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;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            Console.WriteLine("Hello World");
+            return 0;
+        }
+    }
+}

TestAssets/TestProjects/TestAppWithMigrateableScripts/echoscript.cmd

@@ -0,0 +1,2 @@
+@echo off
+echo %*

TestAssets/TestProjects/TestAppWithMigrateableScripts/echoscript.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+echo $@

TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json

@@ -0,0 +1,29 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.0",
+    }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  },
+  "scripts": {
+    "prepublish": [
+      "echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:FullTargetFramework%?"
+    ],
+    "postpublish": [
+      "echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:FullTargetFramework%?"
+    ],
+    "precompile": [
+      "echoscript precompile_output ?%compile:Configuration%? ?%compile:OutputDir%? ?%compile:FullTargetFramework%?"
+    ],
+    "postcompile": [
+      "echoscript postcompile_output ?%compile:Configuration%? ?%compile:OutputDir%? ?%compile:FullTargetFramework%?"
+    ]
+  }
+}

TestAssets/TestProjects/TestAppWithResourceDeps/project.json

@@ -7,7 +7,7 @@
     "Microsoft.NETCore.App": "1.0.0",
     "Microsoft.CSharp": "4.0.1",
     "System.Dynamic.Runtime": "4.0.11",
-    "System.Reflection.Metadata": "1.3.0",
+    "System.Reflection.Metadata": "1.4.1-beta-24410-02",
     "System.Runtime.Serialization.Primitives": "4.1.1",
     "System.Xml.XmlSerializer": "4.0.11",
     "WindowsAzure.Storage": "6.2.2-preview"

TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json

@@ -0,0 +1,26 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+		"version": "1.0.0",
+		"type": "platform"
+	}
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  },
+  "runtimeOptions": {
+    "somethingString": "anything",
+    "somethingBoolean": true,
+    "someArray": [
+      "one",
+      "two"
+    ],
+    "someObject": {
+      "someProperty": "someValue"
+    }
+  }
+}

build.cmd

@@ -3,5 +3,5 @@
 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.
 
-powershell -NoProfile -NoLogo -Command "& \"%~dp0build_projects\dotnet-cli-build\build.ps1\" %*; exit $LastExitCode;"
+powershell -NoProfile -NoLogo -Command "& \"%~dp0run-build.ps1\" %*; exit $LastExitCode;"
 if %errorlevel% neq 0 exit /b %errorlevel%

build.proj

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
+
+  <PropertyGroup>
+    <!--
+      $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
+    -->
+    <PlatformScriptHost Condition=" '$(OS)' == 'Windows_NT' ">powershell -NoProfile -NoLogo -Command </PlatformScriptHost>
+    <PlatformScriptHost Condition=" '$(OS)' != 'Windows_NT' "></PlatformScriptHost>
+
+    <PlatformScriptExtension Condition=" '$(OS)' == 'Windows_NT' ">.ps1</PlatformScriptExtension>
+    <PlatformScriptExtension Condition=" '$(OS)' != 'Windows_NT' ">.sh</PlatformScriptExtension>
+
+    <CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
+
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+    <CLIBuildFileName>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build</CLIBuildFileName>
+    <CLIBuildDll>$(CLIBuildFileName).dll</CLIBuildDll>
+
+    <CoreSetupChannel>preview</CoreSetupChannel>
+    <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
+    <SharedFrameworkVersion>1.0.0</SharedFrameworkVersion>
+    <SharedHostVersion>1.0.1</SharedHostVersion>
+    <HostFxrVersion>1.0.1</HostFxrVersion>
+
+    <CoreCLRVersion>1.0.2</CoreCLRVersion>
+    <JitVersion>1.0.2</JitVersion>
+
+    <ExeExtension>.exe</ExeExtension>
+    <ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension>
+
+    <Stage0Directory>$(RepoRoot)/.dotnet_stage0/$(Architecture)</Stage0Directory>
+    <DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0>
+    <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
+    <PackagesDir>$(RepoRoot)/.nuget</PackagesDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <DotnetCliBuildFrameworkInputs Include="build_projects/**/*.cs" Exclude="build_projects/**/obj/**/*.cs" />
+    <DotnetCliBuildFrameworkInputs Include="build_projects/**/project.json;build_projects/**/project.lock.json" />
+  </ItemGroup>
+
+  <!-- Workaround to "Native image cannot be loaded multiple times" issue
+       A target in the top level file needs to run and invoke a task
+       https://github.com/Microsoft/msbuild/issues/750 -->
+  <Target Name="MSBuildWorkaroundTarget">
+    <Message Text="Dont remove this target" />
+  </Target>
+
+  <Target Name="BuildDotnetCliBuildFramework"
+          Inputs="@(DotnetCliBuildFrameworkInputs)"
+          Outputs="$(CLIBuildDll)"
+          DependsOnTargets="MSBuildWorkaroundTarget;
+                            RestoreDotnetCliBuildFramework">
+
+    <Exec Command="$(DotnetStage0) publish -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp1.0" WorkingDirectory="$(DotnetCliBuildDirectory)"/>
+  </Target>
+
+  <Target Name="RestoreDotnetCliBuildFramework"
+          Inputs="$(DotnetCliBuildDirectory)/project.json"
+          Outputs="$(DotnetCliBuildDirectory)/project.lock.json">
+
+    <Exec Command="$(DotnetStage0) restore" WorkingDirectory="$(DotnetCliBuildDirectory)"/>
+  </Target>
+
+  <Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target>
+
+  <Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" />
+  <Import Project="build/Microsoft.DotNet.Cli.Compile.targets" />
+  <Import Project="build/Microsoft.DotNet.Cli.Package.targets" />
+  <Import Project="build/Microsoft.DotNet.Cli.Test.targets" />
+  <Import Project="build/Microsoft.DotNet.Cli.Publish.targets" />
+  <Import Project="build/Microsoft.DotNet.Cli.Run.targets" />
+</Project>

build.sh

@@ -44,17 +44,19 @@ done
 
 # $args array may have empty elements in it.
 # The easiest way to remove them is to cast to string and back to array.
+# This will actually break quoted arguments, arguments like 
+# -test "hello world" will be broken into three arguments instead of two, as it should.
 temp="${args[@]}"
 args=($temp)
 
 dockerbuild()
 {
-    BUILD_COMMAND=/opt/code/build_projects/dotnet-cli-build/build.sh $DIR/scripts/dockerrun.sh --non-interactive "$@"
+    BUILD_COMMAND=/opt/code/run-build.sh $DIR/scripts/dockerrun.sh --non-interactive "$@"
 }
 
 # Check if we need to build in docker
 if [ ! -z "$BUILD_IN_DOCKER" ]; then
     dockerbuild "${args[@]}"
 else
-    $DIR/build_projects/dotnet-cli-build/build.sh "${args[@]}"
+    $DIR/run-build.sh "${args[@]}"
 fi

build/Microsoft.DotNet.Cli.Compile.targets

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="compile/Microsoft.DotNet.Cli.LzmaArchive.targets" />
+  <Import Project="crossgen/Microsoft.DotNet.Cli.Crossgen.targets" />
+
+  <PropertyGroup>
+    <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
+    <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
+    <FilesToMove Include="$(BinaryToCorehostifyRelDir)/csc.exe;$(BinaryToCorehostifyRelDir)/MSBuild.exe;" />
+    <BundledTools Include="csc;MSBuild;NuGet.CommandLine.XPlat;dotnet" />
+    <MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" />
+  </ItemGroup>
+
+  <Target Name="Compile" DependsOnTargets="Prepare;
+                                           SetupStage;
+                                           CompileStage;
+                                           BuildProjectsForNuGetPackages;
+                                           GenerateNuGetPackagesArchive" />
+
+  <Target Name="SetupStage"
+          DependsOnTargets="Prepare">
+    <PropertyGroup>
+      <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <CompileStageInputs Include="$(SrcDirectory)/**/*.cs" Exclude="$(SrcDirectory)/**/obj/**/*.cs" />
+      <CompileStageInputs Include="$(SrcDirectory)/**/project.json;$(SrcDirectory)/**/project.lock.json" />
+
+      <Stage Include="Stage1">
+        <Inputs>@(CompileStageInputs)</Inputs>
+        <StageDirectory>$(Stage1Directory)</StageDirectory>
+        <StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
+        <DotnetDir>$(Stage0Directory)</DotnetDir>
+      </Stage>
+      <Stage Include="Stage2">
+        <Inputs>@(CompileStageInputs)</Inputs>
+        <StageDirectory>$(Stage2Directory)</StageDirectory>
+        <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
+        <DotnetDir>$(Stage1Directory)</DotnetDir>
+      </Stage>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CompileStage"
+          DependsOnTargets="SetupStage;
+                            InitCrossgenProps;"
+          Inputs="%(Stage.Inputs)"
+          Outputs="%(StageDirectory)/sdk/$(SdkVersion)/dotnet.dll">
+      <PropertyGroup>
+        <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
+        <DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
+
+        <DynamicLibSuffix Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibSuffix>
+        <DynamicLibSuffix Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibSuffix>
+        <DynamicLibSuffix Condition=" '$(DynamicLibSuffix)' == '' ">.so</DynamicLibSuffix>
+
+        <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
+        <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
+        <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
+
+        <StageDirectory>%(Stage.StageDirectory)</StageDirectory>
+        <StageSymbolsDirectory>%(Stage.StageSymbolsDirectory)</StageSymbolsDirectory>
+        <SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
+        <BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
+        <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
+
+        <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <BinObj Remove="*" />
+        <BinObj Include="$(SrcDirectory)/**/bin/**/*" />
+        <BinObj Include="$(SrcDirectory)/**/obj/**/*" />
+
+        <SharedFramework Remove="*" />
+        <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
+
+        <AssetsToRemoveFromDeps Remove="*" />
+        <AssetsToRemoveFromDeps Include="csc" />
+        <AssetsToRemoveFromDeps Include="vbc" />
+        <AssetsToRemoveFromDeps Include="MSBuild" />
+      </ItemGroup>
+
+      <Delete Files="@(BinObj)" />
+
+      <RemoveDir Directories="$(StageDirectory)" />
+      <MakeDir Directories="$(StageDirectory)"/>
+
+      <!-- CopySharedFramework -->
+      <Copy SourceFiles="@(SharedFramework)"
+            DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+
+      <!-- Publish DotNet -->
+      <DotNetPublish ToolPath="%(Stage.DotnetDir)"
+                     NativeSubdirectory="True"
+                     Output="$(SdkOutputDirectory)"
+                     Configuration="$(Configuration)"
+                     VersionSuffix="$(CommitCount)"
+                     ProjectPath="$(SrcDirectory)/redist" />
+
+      <!-- Corehostify Binaries -->
+      <ItemGroup Condition=" '$(OSName)' != 'win' ">
+        <SdkOutputChmodTargets Remove="*" />
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.exe;
+                                      $(SdkOutputDirectory)/**/*.dll" >
+          <!-- Managed assemblies do not need execute -->
+          <Mode>u=rw,g=r,o=r</Mode>
+        </SdkOutputChmodTargets>
+
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.dylib;
+                                      $(SdkOutputDirectory)/**/*.so" >
+          <!-- Generally, dylibs and sos have 'x' -->
+          <Mode>u=rwx,g=rx,o=rx</Mode>
+        </SdkOutputChmodTargets>
+
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*"
+                             Exclude="$(SdkOutputDirectory)/**/*.*" >
+          <!-- Executables need x -->
+          <Mode>u=rwx,g=rx,o=rx</Mode>
+        </SdkOutputChmodTargets>
+      </ItemGroup>
+
+      <Chmod Condition=" '$(OSName)' != 'win' "
+             File="%(SdkOutputChModTargets.FullPath)"
+             Mode="%(SdkOutputChModTargets.Mode)" />
+
+      <RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
+                                   SectionName="runtimeTargets"
+                                   AssetPath="$(BinaryToCorehostifyRelDir)/%(AssetsToRemoveFromDeps.Identity).exe" />
+
+      <Copy SourceFiles="$(SdkOutputDirectory)/%(FilesToMove.Identity)"
+            DestinationFiles="$(SdkOutputDirectory)/%(FilesToMove.Filename).dll" />
+
+      <!-- MSBuild needs csc.exe to be in the SdkOutputDirectory, or else it can't invoke it -->
+      <Move SourceFiles="$(BinaryToCorehostifyOutDir)/csc.exe"
+            DestinationFiles="$(SdkOutputDirectory)/csc.exe" />
+
+      <Copy SourceFiles="$(SdkOutputDirectory)/redist.deps.json"
+            DestinationFiles="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json" />
+
+      <Copy SourceFiles="$(SdkOutputDirectory)/redist.runtimeconfig.json"
+            DestinationFiles="$(SdkOutputDirectory)/%(BundledTools.Identity).runtimeconfig.json" />
+
+      <ChangeEntryPointLibraryName
+            DepsFile="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json"
+            NewName="%(BundledTools.Identity).deps.json" />
+
+      <!-- cleanup project output we don't need -->
+      <Delete Files="$(SdkOutputDirectory)/redist%(PublishOutputExtensions.Identity)" />
+      <Delete Files="$(SdkOutputDirectory)/tool_msbuild%(PublishOutputExtensions.Identity)" />
+
+      <!-- Copy Host to SDK Directory -->
+      <Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostBaseName)"
+            DestinationFiles="$(SdkOutputDirectory)/corehost$(ExeExtension)" />
+
+      <Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostFxrBaseName)"
+            DestinationFiles="$(SdkOutputDirectory)/$(DotnetHostFxrBaseName)" />
+
+      <Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(HostPolicyBaseName)"
+            DestinationFiles="$(SdkOutputDirectory)/$(HostPolicyBaseName)" />
+
+      <!-- copy core sdk -->
+      <Copy SourceFiles="@(MSBuildImportsContent)"
+            DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" />
+
+      <!-- Crossgen the Shared Framework -->
+      <ItemGroup>
+        <SdkFiles Remove="*" />
+        <SdkFiles Include="$(SdkOutputDirectory)/**/*" />
+        <SdkFilesWithPEMarker Remove="*" />
+      </ItemGroup>
+
+      <AddMetadataIsPE Items="@(SdkFiles)">
+        <Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
+      </AddMetadataIsPE>
+
+      <ItemGroup>
+        <CrossgenTargets Remove="*" />
+        <CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
+
+        <CompileStageSdkDirectories Remove="*" />
+      </ItemGroup>
+
+      <RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
+        <Output TaskParameter="Filtered" ItemName="CompileStageSdkDirectories" />
+      </RemoveDuplicates>
+
+      <Crossgen Condition=" '$(DISABLE_CROSSGEN)' != '1' "
+                SourceAssembly="%(CrossgenTargets.FullPath)"
+                DestinationPath="%(CrossgenTargets.FullPath)"
+                JITPath="$(LibCLRJitPath)"
+                CrossgenPath="$(CrossgenPath)"
+                ReadyToRun="True"
+                PlatformAssemblyPaths="@(PlatformAssemblies);
+                                       @(CompileStageSdkDirectories);
+                                       $(SharedFrameworkNameVersionPath)" />
+
+      <!-- Generate .version file -->
+      <WriteLinesToFile File="$(SdkOutputDirectory)/.version"
+                        Lines="$(CommitHash);$(SdkVersion)"
+                        Overwrite="true" />
+
+      <ItemGroup>
+        <MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.targets" />
+        <MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.Targets" />
+        <MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.props" />
+        <MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.overridetasks" />
+        <MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.tasks" />
+      </ItemGroup>
+
+      <Copy SourceFiles="@(MSBuildTargetsToCopy)"
+            DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+
+      <!-- Temporary workaround for MSBuild placing their .props files in the old 14.1 directory -->
+      <Move SourceFiles="$(SdkOutputDirectory)/14.1/Microsoft.Common.props"
+            DestinationFolder="$(SdkOutputDirectory)/15.0" />
+      <RemoveDir Directories="$(SdkOutputDirectory)/14.1" />
+
+      <ItemGroup>
+        <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
+      </ItemGroup>
+
+      <Delete Files="@(FilesToClean)" />
+
+      <ItemGroup>
+        <FilesToCopy Include="$(StageDirectory)/**/*" />
+        <PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
+      </ItemGroup>
+
+      <Copy SourceFiles="@(FilesToCopy)"
+          DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
+
+      <Delete Files="@(PdbsToClean)" />
+
+      <!-- workaround for https://github.com/Microsoft/msbuild/issues/872 -->
+      <Copy SourceFiles="$(MSBuildTargetsDirectory)/MSBuild.exe"
+            DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe" />
+
+      <Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
+            DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe.config" />
+
+      <Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
+            DestinationFiles="$(MSBuildTargetsDirectory)/MSBuild.exe.config" />
+  </Target>
+</Project>

build/Microsoft.DotNet.Cli.Monikers.props

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SdkBrandName>Microsoft .NET Core 1.0.0 - SDK Preview 2</SdkBrandName>
+    <SharedFrameworkBrandName>Microsoft .NET Core 1.0.0 - Runtime</SharedFrameworkBrandName>
+    <SharedHostBrandName>Microsoft .NET Core 1.0.0 - Host</SharedHostBrandName>
+    <HostFxrBrandName>Microsoft .NET Core 1.0.0 - Host FX Resolver</HostFxrBrandName>
+
+    <SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
+  </PropertyGroup>
+</Project>

build/Microsoft.DotNet.Cli.Package.targets

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Layout.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Archive.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Nupkg.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.DEB.proj" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.MSI.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.PKG.targets" />
+
+  <Target Name="GenerateInstallers" 
+          DependsOnTargets="Init;Layout;GeneratePkgs;GenerateDebs;GenerateMsis" />
+
+  <Target Name="Package"
+          DependsOnTargets="BuildDotnetCliBuildFramework;
+                            Init;
+                            Layout;
+                            GenerateNugetPackages;
+                            GenerateArchives;
+                            GenerateInstallers"  />
+</Project>

build/Microsoft.DotNet.Cli.Prepare.targets

@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Microsoft.DotNet.Cli.tasks" />
+  <Import Project="prepare/CheckPrereqs.targets" />
+
+  <Target Name="Prepare"
+          DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestorePackages;ZipTemplates" />
+
+  <Target Name="Init"
+          DependsOnTargets="InitializeCommonProps;
+                            BuildDotnetCliBuildFramework;
+                            CheckPrereqs;">
+  </Target>
+
+  <Target Name="InitializeCommonProps"
+          DependsOnTargets="BuildDotnetCliBuildFramework" >
+
+    <!-- Current Runtime Information -->
+    <GetCurrentRuntimeInformation>
+      <Output TaskParameter="Rid" PropertyName="Rid" />
+      <Output TaskParameter="Architecture" PropertyName="Architecture" />
+      <Output TaskParameter="OSName" PropertyName="OSName" />
+    </GetCurrentRuntimeInformation>
+
+    <!-- NuGet Information -->
+    <PropertyGroup>
+      <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
+      <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
+    </PropertyGroup>
+    
+    <!-- Common Properties -->
+    <PropertyGroup>
+      <IsDesktopAvailable>False</IsDesktopAvailable>
+      <IsDesktopAvailable Condition=" '$(OSName)' == 'win' ">True</IsDesktopAvailable>
+      <DotNetPath>$(Stage0Directory)</DotNetPath>
+
+      <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
+      <ToolsOutputDirectory>$(BaseOutputDirectory)/tools</ToolsOutputDirectory>
+      <Stage1Directory>$(BaseOutputDirectory)/stage1</Stage1Directory>
+      <Stage1SymbolsDirectory>$(BaseOutputDirectory)/stage1symbols</Stage1SymbolsDirectory>
+      <DotnetStage1>$(Stage1Directory)/dotnet$(ExeExtension)</DotnetStage1>
+      <Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory>
+      <Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory>
+      <DotnetStage2>$(Stage2Directory)/dotnet$(ExeExtension)</DotnetStage2>
+      <OutputDirectory>$(Stage2Directory)/</OutputDirectory>
+      <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
+      <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
+      <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
+      <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
+    </PropertyGroup>
+
+    <GetCommitHash RepoRoot="$(RepoRoot)">
+      <Output TaskParameter="CommitHash" PropertyName="CommitHash" />
+    </GetCommitHash>
+
+    <GenerateBuildVersionInfo RepoRoot="$(RepoRoot)">
+      <Output TaskParameter="VersionMajor" PropertyName="VersionMajor" />
+      <Output TaskParameter="VersionMinor" PropertyName="VersionMinor" />
+      <Output TaskParameter="VersionPatch" PropertyName="VersionPatch" />
+      <Output TaskParameter="CommitCount" PropertyName="CommitCount" />
+      <Output TaskParameter="ReleaseSuffix" PropertyName="ReleaseSuffix" />
+      <Output TaskParameter="VersionSuffix" PropertyName="VersionSuffix" />
+      <Output TaskParameter="SimpleVersion" PropertyName="SimpleVersion" />
+      <Output TaskParameter="NugetVersion" PropertyName="NugetVersion" />
+      <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
+      <Output TaskParameter="VersionBadgeMoniker" PropertyName="VersionBadgeMoniker" />
+      <Output TaskParameter="Channel" PropertyName="Channel" />
+      <Output TaskParameter="BranchName" PropertyName="BranchName" />
+    </GenerateBuildVersionInfo>
+
+    <PropertyGroup>
+      <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
+      <SdkVersion>$(NugetVersion)</SdkVersion>
+
+      <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-preview3-$(CommitCount)</SdkNugetVersion>
+      <ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
+      <DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>
+
+      <ArchiveExtension Condition=" '$(OSName)' == 'win' ">.zip</ArchiveExtension>
+      <ArchiveExtension Condition=" '$(OSName)' != 'win' ">.tar.gz</ArchiveExtension>
+
+      <InstallerExtension Condition=" '$(OSName)' == 'win' ">.msi</InstallerExtension>
+      <InstallerExtension Condition=" '$(OSName)' == 'osx' ">.pkg</InstallerExtension>
+      <InstallerExtension Condition=" '$(OSName)' == 'ubuntu' ">.deb</InstallerExtension>
+
+      <BundleExtension Condition=" '$(OSName)' == 'win' ">.exe</BundleExtension>
+      <BundleExtension Condition=" '$(OSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
+      <BundleExtension Condition=" '$(OSName)' == 'ubuntu' ">$(InstallerExtension)</BundleExtension>
+
+      <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' Or '$(Rid)' == 'fedora.23-x64' Or '$(Rid)' == 'opensuse.13.2-x64' ">$(Rid)</ProductMonikerRid>
+      <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
+
+      <DynamicLibPrefix>lib</DynamicLibPrefix>
+      <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
+      <DynamicLibExtension>.so</DynamicLibExtension>
+      <DynamicLibExtension Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibExtension>
+      <DynamicLibExtension Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibExtension>
+
+      <ArtifactNameSdk>dotnet-sdk</ArtifactNameSdk>
+      <ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
+      <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-dev</ArtifactNameCombinedHostHostFxrFrameworkSdk>
+      <ArtifactNameCombinedFrameworkSdk>dotnet-sharedframework-sdk</ArtifactNameCombinedFrameworkSdk>
+
+      <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(ProductMonikerRid).$(SdkVersion)</ArtifactNameWithVersionSdk>
+      <ArtifactNameWithVersionSdkDebug>$(ArtifactNameSdkDebug)-$(ProductMonikerRid).$(SdkVersion)</ArtifactNameWithVersionSdkDebug>
+      <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(ProductMonikerRid).$(SdkVersion)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+      <ArtifactNameWithVersionCombinedFrameworkSdk>$(ArtifactNameCombinedFrameworkSdk)-$(ProductMonikerRid).$(SdkVersion)</ArtifactNameWithVersionCombinedFrameworkSdk>
+
+      <!-- Downloaded Installers + Archives -->
+      <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
+      <DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
+
+      <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
+      <DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
+
+      <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
+      <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
+
+      <CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
+    </PropertyGroup>
+
+    <!-- SetTelemetryProfile -->
+    <SetEnvVar Name="DOTNET_CLI_TELEMETRY_PROFILE" Value="$(DOTNET_CLI_TELEMETRY_PROFILE);https://github.com/dotnet/cli;$(CommitHash)" />
+  </Target>
+
+  <Target Name="SetupDownloadHostAndSharedFxInputsOutputs" DependsOnTargets="Init">
+    <PropertyGroup>
+      <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/$(CoreSetupChannel)</CoreSetupBlobRootUrl>
+      <SharedFrameworkArchiveBlobRootUrl>$(CoreSetupBlobRootUrl)/Binaries/$(SharedFrameworkVersion)</SharedFrameworkArchiveBlobRootUrl>
+      <CoreSetupInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)/Installers</CoreSetupInstallerBlobRootUrl>
+
+      <CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion)</CoreSetupDownloadDirectory>
+      <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</CombinedSharedHostAndFrameworkArchive>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive"
+                               Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')">
+        <Url>$(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName)</Url>
+        <DownloadFileName>$(CombinedSharedHostAndFrameworkArchive)</DownloadFileName>
+        <ExtractDestination>$(SharedFrameworkPublishDirectory)</ExtractDestination>
+      </_DownloadAndExtractItem>
+
+      <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile"
+                               Condition="!Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
+        <Url>$(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)</Url>
+        <DownloadFileName>$(DownloadedSharedFrameworkInstallerFile)</DownloadFileName>
+        <ExtractDestination></ExtractDestination>
+      </_DownloadAndExtractItem>
+
+      <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile"
+                               Condition="!Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
+        <Url>$(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)</Url>
+        <DownloadFileName>$(DownloadedSharedHostInstallerFile)</DownloadFileName>
+        <ExtractDestintation></ExtractDestintation>
+      </_DownloadAndExtractItem>
+
+      <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile"
+                               Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
+        <Url>$(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)</Url>
+        <DownloadFileName>$(DownloadedHostFxrInstallerFile)</DownloadFileName>
+        <ExtractDestintation></ExtractDestintation>
+      </_DownloadAndExtractItem>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="DownloadHostAndSharedFxArtifacts"
+          DependsOnTargets="SetupDownloadHostAndSharedFxInputsOutputs">
+
+    <DownloadFile Condition=" '@(_DownloadAndExtractItem)' != '' "
+                  Uri="%(_DownloadAndExtractItem.Url)"
+                  DestinationPath="%(_DownloadAndExtractItem.DownloadFileName)" />
+
+    <ZipFileExtractToDirectory Condition=" '%(_DownloadAndExtractItem.ExtractDestination)' != '' AND '$(OSName)' == 'win' "
+                               SourceArchive="%(_DownloadAndExtractItem.DownloadFileName)"
+                               DestinationDirectory="%(_DownloadAndExtractItem.ExtractDestination)"
+                               OverwriteDestination="True" />
+
+    <TarGzFileExtractToDirectory Condition=" '%(_DownloadAndExtractItem.ExtractDestination)' != '' AND '$(OSName)' != 'win' "
+                               SourceArchive="%(_DownloadAndExtractItem.DownloadFileName)"
+                               DestinationDirectory="%(_DownloadAndExtractItem.ExtractDestination)"
+                               OverwriteDestination="True" />
+  </Target>
+
+  <Target Name="RestorePackages"
+          DependsOnTargets="SetupRestorePackagesInputsOutputs;Init"
+          Inputs="@(RestorePackagesInput)"
+          Outputs="@(RestorePackagesInput->'%(RelativeDir)/project.lock.json')">
+
+    <CallTarget Targets="CleanSrcToolsLockFiles" />
+    <DotNetRestore WorkingDirectory="$(RepoRoot)/src" ToolPath="$(DotNetPath)" />
+    <DotNetRestore WorkingDirectory="$(RepoRoot)/tools" ToolPath="$(DotNetPath)" />
+
+  </Target>
+
+  <Target Name="CleanSrcToolsLockFiles" >
+    <ItemGroup>
+      <SrcToolsLockFiles Include="$(RepoRoot)/src/**/project.lock.json;$(RepoRoot)/tools/**/project.lock.json" />
+    </ItemGroup>
+    <Delete Files="@(SrcToolsLockFiles)" />
+  </Target>
+
+  <Target Name="SetupRestorePackagesInputsOutputs">
+    <ItemGroup>
+      <RestorePackagesInput Include="$(RepoRoot)/src/**/project.json" />
+      <RestorePackagesInput Include="$(RepoRoot)/tools/**/project.json" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="SetupZipTemplatesInputsOutputs">
+    <PropertyGroup>
+      <_DotNetNewFolder>$(RepoRoot)/src/dotnet/commands/dotnet-new</_DotNetNewFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <DotNetNewArchive Include="$([System.IO.Directory]::GetDirectories($(_DotNetNewFolder)))" />
+
+      <ZipTemplatesInput Include="$(_DotNetNewFolder)/**" Exclude="$(_DotNetNewFolder)/*.zip" />
+      <ZipTemplatesOutput Include="@(DotNetNewArchive->'%(RelativeDir)/$([System.IO.Path]::GetFileName('%(DotNetNewArchive.FullPath)')).zip')" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="ZipTemplates"
+          DependsOnTargets="SetupZipTemplatesInputsOutputs"
+          Inputs="@(ZipTemplatesInput)"
+          Outputs="@(ZipTemplatesOutput)">
+
+    <ZipFileCreateFromDirectory
+          SourceDirectory="%(DotNetNewArchive.FullPath)"
+          DestinationArchive="%(DotNetNewArchive.RelativeDir)/$([System.IO.Path]::GetFileName(%(DotNetNewArchive.FullPath))).zip"
+          OverwriteDestination="True" />
+  </Target>
+
+</Project>

build/Microsoft.DotNet.Cli.Publish.targets

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)/publish/PublishContent.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Badge.targets" />
+
+  <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
+  <Target Name="Publish"
+          Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
+          DependsOnTargets="Init;
+                            Package;
+                            PublishArtifacts;
+                            FinishBuild" />
+
+  <!-- UploadToAzure target comes from Build Tools -->
+  <Target Name="PublishArtifacts"
+          DependsOnTargets="SetupAzureBlobInformation;
+                            GenerateVersionBadge;
+                            GatherItemsForPattern;
+                            UploadToAzure;
+                            PublishDebFilesToDebianRepo;
+                            PublishCliVersionBadge" />
+
+  <Target Name="FinishBuild">
+    <FinalizeBuild AccountName="$(CloudDropAccountName)"
+                   AccountKey="$(CloudDropAccessToken)"
+                   NugetVersion="$(NugetVersion)"
+                   Channel="$(Channel)"
+                   CommitHash="$(CommitHash)"
+                   BranchName="$(BranchName)" />
+  </Target>
+
+  <Target Name="SetupAzureBlobInformation">
+    <PropertyGroup>
+      <Product>Sdk</Product>
+      <ContainerName>$(STORAGE_CONTAINER)</ContainerName>
+      <CloudDropAccessToken>$(STORAGE_KEY)</CloudDropAccessToken>
+      <CloudDropAccountName>$(STORAGE_ACCOUNT)</CloudDropAccountName>
+      <DotnetBlobRootUrl>https://$(CloudDropAccountName).blob.core.windows.net/$(ContainerName)</DotnetBlobRootUrl>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="GatherItemsForPattern">
+    <ItemGroup>
+      <ForPublishing Include="@(GeneratedInstallers)" />
+      <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ForPublishing>
+        <RelativeBlobPath>$(Product)/$(NugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
+      </ForPublishing>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="PublishDebFilesToDebianRepo" Condition=" '$(OSName)' == 'ubuntu' ">
+    <Error Condition="'$(REPO_ID)' == ''" Text="REPO_ID must be set as an environment variable for debian publishing." />
+    <Error Condition="'$(REPO_USER)' == ''" Text="REPO_USER must be set as an environment variable for debian publishing." />
+    <Error Condition="'$(REPO_PASS)' == ''" Text="REPO_PASS must be set as an environment variable for debian publishing." />
+    <Error Condition="'$(REPO_SERVER)' == ''" Text="REPO_SERVER must be set as an environment variable for debian publishing." />
+
+    <ItemGroup>
+      <SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
+    </ItemGroup>
+    <PropertyGroup>
+      <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(NugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
+      <DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
+      <DebianRevisionNumber>1</DebianRevisionNumber>
+
+      <DebianUploadJsonContent>
+        {
+          "name":"$(SdkDebianPackageName)",
+          "version":"$(NugetVersion)-$(DebianRevisionNumber)",
+          "repositoryId":"$(REPO_ID)",
+          "sourceUrl": "$(SdkDebianUploadUrl)"
+        }
+      </DebianUploadJsonContent>
+    </PropertyGroup>
+
+    <Delete Files="$(DebianUploadJsonFile)" />
+    <WriteLinesToFile File="$(DebianUploadJsonFile)" Lines="$(DebianUploadJsonContent)" />
+
+    <Exec Command="$(RepoRoot)/scripts/publish/repoapi_client.sh -addpkg $(DebianUploadJsonFile)" />
+  </Target>
+
+  <Target Name="PublishCliVersionBadge">
+    <ItemGroup>
+      <CliVersionBadgeToUpload Include="$(VersionBadge)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <CliVersionBadgeToUpload>
+        <RelativeBlobPath>$(Product)/$(NugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
+      </CliVersionBadgeToUpload>
+    </ItemGroup>
+
+    <UploadToAzure
+      AccountKey="$(CloudDropAccessToken)"
+      AccountName="$(CloudDropAccountName)"
+      ContainerName="$(ContainerName)"
+      Items="@(CliVersionBadgeToUpload)" />
+
+    <SetBlobPropertiesBasedOnFileType
+      AccountKey="$(CloudDropAccessToken)"
+      AccountName="$(CloudDropAccountName)"
+      Items="@(CliVersionBadgeToUpload)" />
+  </Target>
+</Project>

build/Microsoft.DotNet.Cli.Run.targets

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="CleanArtifacts" >
+    <RemoveDir Directories="$(BaseOutputDirectory)" />
+  </Target>
+
+  <Target Name="CleanRepo">
+    <Exec Command="git clean -fdx" WorkingDirectory="$(RepoRoot)" />
+  </Target>
+
+</Project>

build/Microsoft.DotNet.Cli.Test.targets

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <PathSeparator>/</PathSeparator>
+    <PathSeparator Condition=" '$(OSName)' == 'win' ">\</PathSeparator>
+  </PropertyGroup>
+
+  <Import Project="test/TestPackageProjects.targets" />
+  <Import Project="test/TestAssetProjects.targets" />
+  <Import Project="test/TestProjects.targets" />
+
+  <Target Name="Test"
+          DependsOnTargets="PrepareTests;
+                            BuildTestAssets;
+                            BuildTests;">
+    <PropertyGroup>
+      <PathListSeparator>:</PathListSeparator>
+      <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
+      <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
+      <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
+      <TestArtifactsEnv>$(TestArtifactsDir)</TestArtifactsEnv>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <TestTaskEnvironmentVariables Include="PATH=$(ExecPath)" />
+      <TestTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsEnv)" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <RunTestEnvironmentVariables>@(TestTaskEnvironmentVariables)</RunTestEnvironmentVariables>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectsToTest Include="build/test/RunTest.proj">
+        <Properties>
+          CLIBuildDll=$(CLIBuildDll);
+          Configuration=$(Configuration);
+          EnvironmentVariables=$(RunTestEnvironmentVariables);
+          TestProjectName=%(TestProjects.OutputName);
+          TestResultXmlDir=$(TestResultXmlDir);
+          ToolPath=$(Stage2Directory);
+          WorkingDirectory=%(TestProjects.ProjectDir)
+        </Properties>
+      </ProjectsToTest>
+    </ItemGroup>
+
+    <MSBuild
+      BuildInParallel="True"
+      Projects="@(ProjectsToTest)">
+    </MSBuild>
+  </Target>
+
+  <Target Name="PrepareTests"
+          DependsOnTargets="Init">
+    <PropertyGroup>
+      <TestPackageBuildVersionSuffix>$(CommitCount)</TestPackageBuildVersionSuffix>
+      <TestOutputDir>$(BaseOutputDirectory)/tests/</TestOutputDir>
+      <TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
+      <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
+      <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
+      <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
+      <TestDirectory>$(RepoRoot)/test/</TestDirectory>
+      <DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="BuildTests"
+          DependsOnTargets="RestoreTests;
+                            SetupTestProjectData;"
+          Inputs="%(TestProjects.BuildInputs)"
+          Outputs="%(TestProjects.BuildOutput)">
+    <DotNetBuild  Configuration="$(Configuration)"
+                  Framework="%(TestProjects.Framework)"
+                  ToolPath="$(DotnetUnderTest)"
+                  WorkingDirectory="%(TestProjects.RelativeDir)" />
+  </Target>
+
+  <Target Name="RestoreTests"
+          DependsOnTargets="CreateTestAssetPackageNuPkgs;
+                            CleanTestProjectsBinObjProjectJson;
+                            SetupRestoreTestsInputs;"
+          Inputs="@(RestoreTestsInputs)"
+          Outputs="@(RestoreTestsInputs->'%(RelativeDir)project.lock.json')">
+    <CallTarget Targets="CleanTestProjectsLockFiles"/>
+
+    <DotNetRestore  FallbackSource="$(TestPackagesDir)"
+                    ToolPath="$(DotnetUnderTest)"
+                    WorkingDirectory="$(TestDirectory)" />
+  </Target>
+
+  <Target Name="CleanTestProjectsBinObjProjectJson"
+          DependsOnTargets="SetupRestoreTestsInputs;"
+          Inputs="@(RestoreTestsInputs)"
+          Outputs="@(RestoreTestsInputs->'%(RelativeDir)project.lock.json')">
+    <ItemGroup>
+      <FilesToDelete Include="$(TestDirectory)**/bin/**/project.json" />
+      <FilesToDelete Include="$(TestDirectory)**/obj/**/project.json" />
+    </ItemGroup>
+
+    <Delete Files="@(FilesToDelete)" />
+
+    <ItemGroup>
+      <FilesToDelete Remove="*" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="SetupRestoreTestsInputs"
+          DependsOnTargets="PrepareTests;" >
+    <ItemGroup>
+      <RestoreTestsInputs Include="$(TestDirectory)/**/project.json"
+                          Exclude="$(TestDirectory)/**/bin/**/project.json" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="BuildTestAssets"
+          DependsOnTargets="BuildTestAssetProjects;
+                            BuildDesktopTestAssetProjects;">
+  </Target>
+
+  <Target Name="BuildTestAssetProjects"
+          DependsOnTargets="RestoreTestAssetProjects;
+                            SetupTestAssetProjectData;"
+          Inputs="%(TestAssetProjects.BuildInputs)"
+          Outputs="%(TestAssetProjects.BuildOutput)">
+
+    <DotNetBuild  Framework="netcoreapp1.0"
+                  ProjectPath="$(RepoRoot)%(TestAssetProjects.ProjectPath)"
+                  ToolPath="$(DotnetUnderTest)"
+                  WorkingDirectory="%(TestAssetProjects.RelativeDir)" />
+  </Target>
+
+  <Target Name="RestoreTestAssetProjects"
+          DependsOnTargets="CreateTestAssetPackageNuPkgs;
+                            SetupRestoreTestAssetProjectsInputs;"
+          Inputs="@(RestoreTestAssetProjectsInputs)"
+          Outputs="@(RestoreTestAssetProjectsInputs->'%(RelativeDir)/project.lock.json')">
+
+    <DotNetRestore  FallbackSource="$(TestPackagesDir)"
+                    ToolPath="$(DotnetUnderTest)"
+                    WorkingDirectory="$(RepoRoot)TestAssets/TestProjects/" />
+  </Target>
+
+  <Target Name="SetupRestoreTestAssetProjectsInputs" >
+    <ItemGroup>
+      <RestoreTestAssetProjectsInputs Include="$(RepoRoot)/TestAssets/TestProjects/**/project.json" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CleanTestAssetProjectsLockFiles" >
+    <ItemGroup>
+      <TestAssetProjectsLockFiles Include="$(RepoRoot)/TestAssets/TestProjects/**/project.lock.json" />
+    </ItemGroup>
+    <Delete Files="@(TestAssetProjectsLockFiles)" />
+  </Target>
+
+  <Target Name="CleanTestProjectsLockFiles" >
+    <ItemGroup>
+      <TestProjectsLockFiles Include="$(RepoRoot)/test/**/project.lock.json" />
+    </ItemGroup>
+    <Delete Files="@(TestProjectsLockFiles)" />
+  </Target>
+
+  <Target Name="BuildDesktopTestAssetProjects"
+          Condition=" '$(IsDesktopAvailable)' == 'True' "
+          DependsOnTargets="RestoreDesktopTestAssetProjects">
+    <ItemGroup>
+      <NoAutoBuildDesktopTestAssets Include="$(RepoRoot)TestAssets\DesktopTestProjects\**\.noautobuild" />
+      <NoAutoBuildDesktopTestAssetProjects Include="%(NoAutoBuildDesktopTestAssets.RelativeDir)project.json" />
+      <BuildableDesktopTestAssetProjects Include="$(RepoRoot)TestAssets\DesktopTestProjects\**\project.json"
+                                         Exclude="@(NoAutoBuildDesktopTestAssetProjects)" />
+    </ItemGroup>
+
+    <Message Text="Skipping projects with .noautobuild files:" />
+    <Message Text="%(NoAutoBuildDesktopTestAssetProjects.FullPath)" />
+
+    <DotNetBuild  Configuration="$(Configuration)"
+                  Framework="net451"
+                  ProjectPath="%(BuildableDesktopTestAssetProjects.FullPath)"
+                  ToolPath="$(DotnetUnderTest)"
+                  WorkingDirectory="%(BuildableDesktopTestAssetProjects.RelativeDir)" />
+  </Target>
+
+  <Target Name="RestoreDesktopTestAssetProjects"
+          Condition=" '$(IsDesktopAvailable)' == 'True' "
+          DependsOnTargets="CreateTestAssetPackageNuPkgs;
+                            SetupRestoreDesktopTestAssetProjectsInputs;"
+          Inputs="@(RestoreDesktopTestAssetProjectsInputs)"
+          Outputs="@(RestoreDesktopTestAssetProjectsInputs->'%(RelativeDir)/project.lock.json')">
+
+    <DotNetRestore  FallbackSource="$(TestPackagesDir)"
+                    ToolPath="$(DotnetUnderTest)"
+                    WorkingDirectory="$(RepoRoot)TestAssets\DesktopTestProjects\" />
+  </Target>
+
+  <Target Name="SetupRestoreDesktopTestAssetProjectsInputs">
+    <ItemGroup>
+      <RestoreDesktopTestAssetProjectsInputs Include="$(RepoRoot)TestAssets\DesktopTestProjects\**\project.json" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CreateTestAssetPackageNuPkgs"
+          DependsOnTargets="BuildTestAssetPackageProjects;
+                            SetupTestPackageProjectData;"
+          Inputs="%(TestPackageProject.PackInputs)"
+          Outputs="%(TestPackageProject.PackOutputs)">
+
+    <DotNetPack BuildBasePath="$(TestPackagesBuildDir)"
+                NoBuild="True"
+                Output="$(TestPackagesDir)"
+                ProjectPath="%(TestPackageProject.FullPath)"
+                ToolPath="$(DotnetUnderTest)"
+                VersionSuffix="%(TestPackageProject.VersionSuffix)" />
+  </Target>
+
+  <Target Name="BuildTestAssetPackageProjects"
+          DependsOnTargets="RestoreTestAssetPackageProjects;
+                            SetupTestPackageProjectData;"
+          Inputs="%(TestPackageProject.BuildInputs)"
+          Outputs="%(TestPackageProject.BuildOutputs)">
+
+    <DotNetBuild  BuildBasePath="$(TestPackagesBuildDir)"
+                  Framework="%(TestPackageProject.Framework)"
+                  ProjectPath="%(TestPackageProject.FullPath)"
+                  ToolPath="$(DotnetUnderTest)"
+                  WorkingDirectory="%(BuildableTestAssetProjects.RelativeDir)" />
+  </Target>
+
+  <Target Name="RestoreTestAssetPackageProjects"
+          DependsOnTargets="PrepareTests;
+                            SetupRestoreTestAssetPackageProjectsInputs;"
+          Inputs="@(RestoreTestAssetPackageProjectsInputs)"
+          Outputs="@(RestoreTestAssetPackageProjectsInputs->'%(RelativeDir)/project.lock.json')">
+
+    <DotNetRestore  ToolPath="$(DotnetUnderTest)"
+                    WorkingDirectory="$(RepoRoot)/TestAssets/TestPackages/" />
+  </Target>
+
+  <Target Name="SetupRestoreTestAssetPackageProjectsInputs"
+          DependsOnTargets="Init;">
+    <ItemGroup>
+      <RestoreTestAssetPackageProjectsInputs Include="$(RepoRoot)/TestAssets/TestPackages/**/project.json" />
+    </ItemGroup>
+  </Target>
+</Project>

build/Microsoft.DotNet.Cli.tasks

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="Crossgen" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetBuild" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetNew" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetPack" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetPublish" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetRestore" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DownloadFile" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GenerateBuildVersionInfo" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GenerateGuidFromName" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GetCommitHash" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="SetBlobPropertiesBasedOnFileType" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="SetEnvVar" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="TarGzFileCreateFromDirectory" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="TarGzFileExtractToDirectory" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="CreateAzureContainer" AssemblyFile="$(CLIBuildDll)"/>
+  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(CLIBuildDll)"/>
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(CLIBuildDll)"/>
+  <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(CLIBuildDll)"/>
+</Project>

build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="GenerateNuGetPackagesArchive"
+            DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs"
+            Inputs="@(GenerateNuGetPackagesArchiveInputs)"
+            Outputs="$(FinalArchive)">
+      <ItemGroup>
+        <FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" />
+        <FilesToClean Include="$(NuGetPackagesArchiveFolder)/**/*" />
+      </ItemGroup>
+
+      <Delete Files="@(FilesToClean)" />
+      <RemoveDir Directories="$(NuGetPackagesArchiveProject);$(NuGetPackagesArchiveFolder)" />
+      <MakeDir Directories="$(NuGetPackagesArchiveProject);$(NuGetPackagesArchiveFolder)"/>
+
+      <DotNetNew ToolPath="$(Stage2Directory)"
+                 WorkingDirectory="$(NuGetPackagesArchiveProject)" />
+      <DotNetRestore ToolPath="$(Stage2Directory)"
+                     Packages="$(NuGetPackagesArchiveFolder)"
+                     WorkingDirectory="$(NuGetPackagesArchiveProject)" />
+
+      <Delete Files="$(IntermediateArchive);$(IntermediateArchive).zip" />
+
+      <Message Text="Publishing Archiver" />
+
+      <DotNetPublish ToolPath="$(Stage2Directory)"
+                     WorkingDirectory="$(RepoRoot)/tools/Archiver"
+                     Output="$(ToolsOutputDirectory)"
+                     Configuration="$(Configuration)" />
+
+      <Exec Command="$(ArchiverExe) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
+
+      <Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" />
+    </Target>
+
+    <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
+            DependsOnTargets="Prepare;SetupStage">
+      <PropertyGroup>
+        <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
+        <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
+        <ArchiverExe>$(ToolsOutputDirectory)/Archiver</ArchiverExe>
+        <IntermediateArchive>$(IntermediateDirectory)/nuGetPackagesArchive.lzma</IntermediateArchive>
+        <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <GenerateNuGetPackagesArchiveInputs Include="$(_DotNetNewFolder)/CSharp_Console/**/*" />
+        <GenerateNuGetPackagesArchiveInputs Include="$(SrcDirectory)/dotnet-archive/**/*"
+                                            Exclude="$(SrcDirectory)/dotnet-archive/**/bin/**/*;
+                                                     $(SrcDirectory)/dotnet-archive/**/obj/**/*" />
+        <GenerateNuGetPackagesArchiveInputs Include="$(SrcDirectory)/Microsoft.DotNet.Archive/**/*"
+                                            Exclude="$(SrcDirectory)/Microsoft.DotNet.Archive/**/bin/**/*;
+                                                     $(SrcDirectory)/Microsoft.DotNet.Archive/**/obj/**/*" />
+      </ItemGroup>
+    </Target>
+</Project>

build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="InitCrossgenProps"
+          DependsOnTargets="Init">
+    <PropertyGroup>
+      <CoreCLRRid>$(Rid)</CoreCLRRid>
+      <CoreCLRRid Condition=" '$(OSName)' == 'win' ">win7-$(Architecture)</CoreCLRRid>
+      <CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx.10.10-x64</CoreCLRRid>
+      <CoreCLRRid Condition=" '$(OSName)' == 'centos' OR '$(OSName)' == 'rhel' ">rhel.7-x64</CoreCLRRid>
+
+      <CrossGenPackageName>runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr</CrossGenPackageName>
+      <LibCLRJitPackageName>runtime.$(CoreCLRRid).microsoft.netcore.jit</LibCLRJitPackageName>
+      <CoreCLRPackageName>runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr</CoreCLRPackageName>
+
+      <CoreCLRLibsDir>$(NuGetPackagesDir)/$(CoreCLRPackageName)/$(CoreCLRVersion)/runtimes/$(CoreCLRRid)/lib/netstandard1.0</CoreCLRLibsDir>
+      <CrossgenPath>$(NuGetPackagesDir)/$(CrossGenPackageName)/$(CoreCLRVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
+      <LibCLRJitPath>$(NuGetPackagesDir)/$(LibCLRJitPackageName)/$(CoreCLRVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PlatformAssemblies Include="$(CoreCLRLibsDir)" />
+    </ItemGroup>
+  </Target>
+</Project>

build/package/Microsoft.DotNet.Cli.Archive.targets

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="GenerateArchives"
+          DependsOnTargets="Init;
+                            Layout;
+                            SetupGenerateArchivesInputsOutputs;
+                            MakePackagesDir;"
+          Inputs="%(GenerateArchivesInputsOutputs.Inputs)"
+          Outputs="%(GenerateArchivesInputsOutputs.Outputs)">
+
+    <PropertyGroup>
+      <GenerateArchivesDestinationArchive>$(ArchiveOutputDirectory)/%(GenerateArchivesInputsOutputs.OutFileName)$(ArchiveExtension)</GenerateArchivesDestinationArchive>
+    </PropertyGroup>
+
+    <ZipFileCreateFromDirectory
+        Condition=" '$(OSName)' == 'win' "
+        SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
+        DestinationArchive="$(GenerateArchivesDestinationArchive)" />
+
+    <TarGzFileCreateFromDirectory
+        Condition=" '$(OSName)' != 'win' "
+        SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
+        DestinationArchive="$(GenerateArchivesDestinationArchive)" />
+
+    <ItemGroup>
+      <Archives Include="$(GenerateArchivesDestinationArchive)" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="SetupGenerateArchivesInputsOutputs"
+          DependsOnTargets="Init">
+    <PropertyGroup>
+      <ArchiveOutputDirectory>$(PackagesDirectory)</ArchiveOutputDirectory>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <GenerateArchivesInputsOutputs Include="%(LayoutDefinition.Name)">
+        <Inputs>%(LayoutDefinition.OutputFiles)</Inputs>
+        <Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
+        <InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
+        <OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
+      </GenerateArchivesInputsOutputs>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="MakePackagesDir">
+    <MakeDir Directories="$(PackagesDirectory)" />
+  </Target>
+
+</Project>

build/package/Microsoft.DotNet.Cli.Installer.DEB.proj

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <UsingTask TaskName="DotNetDebTool" AssemblyFile="$(CLIBuildDll)" />
+
+  <Import Project="Microsoft.DotNet.Cli.Installer.DEB.targets" />
+
+  <Target Name="GenerateDebs"
+          DependsOnTargets="SetupDebProps;
+                            TestDebuild;
+                            BuildSdkDeb;
+                            TestSdkDeb;"
+          Condition=" '$(OSName)' == 'ubuntu' " 
+          Outputs="@(GeneratedInstallers)"/>
+
+  <Target Name="BuildSdkDeb"
+      Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)'  == 'true' "
+      DependsOnTargets="PrepareDotnetDebDirectories;
+                        PrepareDotnetDebTool;"
+      Inputs="@(CLISdkFiles)"
+      Outputs="$(SdkInstallerFile)" >
+
+      <!-- Install Shared Framework Packages -->
+      <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
+
+      <!-- Create layout: Binaries -->
+      <Copy
+        DestinationFiles="@(CLISdkFiles->'$(LayoutPackageRootDir)/sdk/%(RecursiveDir)%(Filename)%(Extension)')"
+        SourceFiles="@(CLISdkFiles)"       
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        UseHardlinksIfPossible="False" />
+      
+      <!-- Create layout: Man Pages -->
+      <Copy
+        DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')"
+        SourceFiles="@(SdkDebManPageFiles)"
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        UseHardlinksIfPossible="False" />
+
+      <!-- Create layout: Generate and Place debian_config.json -->
+      <ReplaceFileContents
+        InputFile="$(DebianConfigTemplateFile)"
+        DestinationFile="$(DebianConfigJsonFile)"
+        ReplacementPatterns="@(DebianConfigTokenValues -> '%(Identity)')"
+        ReplacementStrings="@(DebianConfigTokenValues -> '%(ReplacementString)')" />
+
+      <!-- Build SDK Deb package -->
+      <DotNetDebTool ToolPath="$(Stage2Directory)"
+                     InputDirectory="$(LayoutDirectory)"
+                     OutputDirectory="$(DotNetDebToolOutputDirectory)"
+                     PackageName="$(SdkDebianPackageName)"
+                     PackageVersion="$(SdkVersion)"
+                     WorkingDirectory="$(DotnetDebToolDir)" />
+      
+      <!-- Copy SDK package to output -->
+      <ItemGroup>
+        <GeneratedDebFiles Include="$(DotNetDebToolOutputDirectory)/*.deb" />
+      </ItemGroup>
+  
+      <Error Text="@(GeneratedDebFiles->Count()) .deb files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
+
+      <Copy
+        DestinationFiles="$(SdkInstallerFile)"
+        SourceFiles="@(GeneratedDebFiles)"
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        UseHardlinksIfPossible="False" />
+
+      <!-- Remove Shared Framework and Debian Packages -->
+      <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
+      <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
+      <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
+      <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
+  </Target>
+
+  <Target Name="TestSdkDeb"
+      Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)'  == 'true' "
+      Inputs="$(DownloadedSharedHostInstallerFile);
+              $(DownloadedHostFxrInstallerFile);
+              $(DownloadedSharedFrameworkInstallerFile);
+              $(SdkInstallerFile);"
+      Outputs="$(DebianTestResultsXmlFile)" >
+
+      <!-- Install Dependencies and SDK Packages -->
+      <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
+
+      <!-- Run E2E -->
+      <DotNetTest WorkingDirectory="$(EndToEndTestDirectory)"
+                  EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
+                  ToolPath="$(DebianInstalledDirectory)"
+                  Xml="$(DebianTestResultsXmlFile)" />
+
+      <!-- Clean up Packages -->
+      <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
+      <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
+      <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
+      <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
+  </Target>
+
+  <Target Name="PrepareDotnetDebDirectories">
+
+    <!-- Clean the workspace -->
+    <ItemGroup>
+      <FilesToClean Remove="*" />
+      <FilesToClean Include="$(SdkInstallerFile)" />
+
+      <WorkspaceDirectories Remove="*" />
+      <WorkspaceDirectories Include="$(SdkDebianIntermediateDirectory);
+                                     $(LayoutDirectory)" />
+
+      <LayoutSubDirectories Remove="*" />
+      <LayoutSubDirectories Include="$(LayoutPackageRootDir);
+                                     $(LayoutAbsolutePlacementDir);
+                                     $(LayoutSamplesDir);
+                                     $(LayoutDocsDir);
+                                     $(LayoutDebianFilesDir)" />
+    </ItemGroup>
+
+    <Delete Files="@(FilesToClean)" />
+    <RemoveDir Directories="@(WorkspaceDirectories)" />
+
+    <!-- Rebuild the workspace -->
+    <MakeDir Directories="@(WorkspaceDirectories)" />
+    <MakeDir Directories="@(LayoutSubDirectories)" />
+    <MakeDir Directories="$(DotNetDebToolOutputDirectory)" />
+  </Target>
+
+  <Target Name="PrepareDotnetDebTool"
+          DependsOnTargets="WriteDotnetDebToolProjectJson;">
+
+    <DotNetRestore  FallbackSource="$(DotnetDebToolPackageSource)"
+                    ToolPath="$(Stage2Directory)"
+                    WorkingDirectory="$(DotnetDebToolDir)" />
+  </Target>
+
+  <Target Name="WriteDotnetDebToolProjectJson"
+          Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
+          Outputs="$(DotnetDebToolDir)/project.json">
+
+    <MakeDir Condition=" !Exists($(DotnetDebToolDir)) " 
+             Directories="$(DotnetDebToolDir)" />
+
+    <WriteLinesToFile File="$(DotnetDebToolDir)/project.json" 
+                      Lines="@(DotnetDebToolProjectJsonLines)"
+                      Overwrite="True" />
+  </Target>
+
+  <Target Name="TestDebuild">
+      <Message Text="Don't remove this" />
+      
+      <!-- run Debuild -->
+      <Exec Command="/usr/bin/env debuild -h" ContinueOnError="true">
+          <Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" />
+      </Exec>  
+
+      <!-- Check if it returned 0 -->
+      <PropertyGroup>
+        <DebuildPresent>false</DebuildPresent>
+        <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>
+      </PropertyGroup>
+
+      <!-- Workaround for Ubuntu16 Jenkins https://github.com/dotnet/core-setup/issues/167 -->
+      <Message Condition=" '$(DebuildPresent)'  != 'true' "
+               Text="Debuild Not found, Debian packages will not be built."
+               Importance="High" />
+  </Target>
+</Project>

build/package/Microsoft.DotNet.Cli.Installer.DEB.targets

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="SetupDebProps"
+          DependsOnTargets="Init">
+    <!-- dotnet deb-tool -->
+    <PropertyGroup>
+      <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>  
+      <DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
+      <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
+      <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
+      <DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
+    </PropertyGroup>  
+
+    <ItemGroup>
+      <DotnetDebToolProjectJsonLines Include="{" />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;name&quot;: &quot;$(DotnetDebToolConsumerProjectName)&quot;," />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;frameworks&quot;: { &quot;netcoreapp1.0&quot;: {} }," />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;tools&quot;: {&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }" />
+      <DotnetDebToolProjectJsonLines Include="}" />
+    </ItemGroup>
+
+    <!-- constants -->
+    <PropertyGroup>
+      <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
+
+      <LayoutPackageRootDirName>package_root</LayoutPackageRootDirName>
+      <LayoutAbsolutePlacementDirName>$</LayoutAbsolutePlacementDirName>
+      <LayoutSamplesDirName>samples</LayoutSamplesDirName>
+      <LayoutDocsDirName>docs</LayoutDocsDirName>
+      <LayoutDebianFilesDirName>debian</LayoutDebianFilesDirName>
+    </PropertyGroup>
+
+    <!-- Package Identities -->
+    <PropertyGroup>
+      <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
+      <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
+      <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
+      <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
+      <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
+      <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
+      <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
+      <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
+      <HostDebianPackageName>dotnet-host</HostDebianPackageName>
+    </PropertyGroup>
+
+    <!-- Inputs -->
+    <PropertyGroup>
+      <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
+      <EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
+      <CLISdkRoot>$(Stage2Directory)/sdk</CLISdkRoot>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
+      <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
+    </ItemGroup>
+
+    <!-- Output Directories -->
+    <PropertyGroup>
+      <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+      <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+
+      <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+      <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
+      <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
+    </PropertyGroup>
+
+    <!-- Layout Directories -->
+    <PropertyGroup>
+      <LayoutDirectory>$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
+      <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
+      <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
+      <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
+      <LayoutDocsDir>$(LayoutDirectory)/$(LayoutDocsDirName)</LayoutDocsDir>
+      <LayoutDebianFilesDir>$(LayoutDirectory)/$(LayoutDebianFilesDirName)</LayoutDebianFilesDir>
+    </PropertyGroup>
+
+    <!-- debian_config.json -->
+    <PropertyGroup>
+      <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/dotnet-debian_config.json</DebianConfigTemplateFile>
+      <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
+        <ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
+      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_NUGET_NAME%">
+        <ReplacementString>$(SharedFrameworkName)</ReplacementString>
+      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_NUGET_VERSION%">
+        <ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
+      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_BRAND_NAME%">
+        <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
+      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
+        <ReplacementString>$(SdkVersion)</ReplacementString>
+      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%CLI_SDK_BRAND_NAME%">
+        <ReplacementString>$(SdkBrandName)</ReplacementString>
+      </DebianConfigTokenValues>
+    </ItemGroup>
+
+    <ItemGroup>
+      <TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
+
+      <!-- Consumed By Publish -->
+      <GeneratedInstallers Include="$(SdkInstallerFile)" />
+    </ItemGroup>
+  </Target>
+</Project>

build/package/Microsoft.DotNet.Cli.Installer.MSI.targets

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="MsiTargetsSetupInputOutputs" DependsOnTargets="Init">
+      <!-- AcquireWix Properties -->
+      <PropertyGroup>
+        <WixVersion>3.10.2</WixVersion>
+        <WixDownloadUrl>https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip</WixDownloadUrl>
+        <WixRoot>$(IntermediateDirectory)/WixTools/$(WixVersion)</WixRoot>
+        <WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>
+        <WixDownloadSentinel>$(WixRoot)/WixDownload.$(WixVersion).sentinel</WixDownloadSentinel>
+      </PropertyGroup>
+
+      <!-- Generate MSI/Bundle Properties -->
+      <PropertyGroup>
+        <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+
+        <CombinedFrameworkSdkHostBundleEngineName>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe</CombinedFrameworkSdkHostBundleEngineName>
+
+        <SdkGenerateMsiPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatemsi.ps1</SdkGenerateMsiPowershellScript>
+        <SdkGenerateBundlePowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
+
+        <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+        <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
+      </PropertyGroup>
+
+      <!-- Consumed By Publish -->
+      <ItemGroup>
+        <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
+      </ItemGroup>
+
+      <GenerateGuidFromName Name="$(SdkInstallerFile)">
+        <Output TaskParameter="OutputGuid"
+            PropertyName="SdkInstallerUpgradeCode" />
+      </GenerateGuidFromName>
+
+      <GenerateGuidFromName Name="$(CombinedFrameworkSdkHostInstallerFile)">
+        <Output TaskParameter="OutputGuid"
+            PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
+      </GenerateGuidFromName>
+
+      <!-- Test Sdk MSI Properties -->
+      <PropertyGroup>
+        <SdkTestMsiPowershellScript>$(RepoRoot)/test/Installer/testmsi.ps1</SdkTestMsiPowershellScript>
+        <SdkMsiTestedSentinel>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk).MsiTested.sentinel</SdkMsiTestedSentinel>
+      </PropertyGroup>
+    </Target>
+
+    <Target Name="AcquireWix"
+            DependsOnTargets="Init;MsiTargetsSetupInputOutputs"
+            Inputs="$(WixDownloadSentinel)"
+            Outputs="$(WixDestinationPath)">
+
+      <!-- Setup sentinel to take advantage of incrementality -->
+      <MakeDir Directories="$(WixRoot)" />
+      <WriteLinesToFile
+          File="$(WixDownloadSentinel)"
+          Lines="$(WixVersion)"
+          Overwrite="true"
+          Encoding="Unicode"/>
+
+      <DownloadFile
+          Uri="$(WixDownloadUrl)"
+          DestinationPath="$(WixDestinationPath)"
+          Overwrite="false" />
+
+      <ZipFileExtractToDirectory
+          SourceArchive="$(WixDestinationPath)"
+          DestinationDirectory="$(WixRoot)" />
+
+    </Target>
+
+    <Target Name="GenerateSdkMsi"
+            DependsOnTargets="Init;Layout;AcquireWix;MsiTargetsSetupInputOutputs"
+            Condition=" '$(OS)' == 'Windows_NT'"
+            Inputs="$(SdkLayoutOutputDirectory);
+                    $(SdkGenerateMsiPowershellScript)"
+            Outputs="$(SdkInstallerFile)">
+
+      <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript)
+                      '$(SdkLayoutOutputDirectory)'
+                      '$(SdkInstallerFile)'
+                      '$(WixRoot)'
+                      '$(SdkBrandName)'
+                      '$(MsiVersion)'
+                      '$(SimpleVersion)'
+                      '$(NugetVersion)'
+                      '$(SdkInstallerUpgradeCode)'
+                      '$(Architecture)'" />
+    </Target>
+
+    <Target Name="GenerateSdkBundle"
+            DependsOnTargets="Init;Layout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
+            Condition=" '$(OS)' == 'Windows_NT'"
+            Inputs="$(SdkInstallerFile);
+                    $(DownloadedSharedFrameworkInstallerFile);
+                    $(DownloadedHostFxrInstallerFile);
+                    $(DownloadedSharedHostInstallerFile);
+                    $(SdkGenerateBundlePowershellScript)"
+            Outputs="$(CombinedFrameworkSdkHostInstallerFile)">
+
+      <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript)
+                      '$(SdkInstallerFile)'
+                      '$(DownloadedSharedFrameworkInstallerFile)'
+                      '$(DownloadedHostFxrInstallerFile)'
+                      '$(DownloadedSharedHostInstallerFile)'
+                      '$(CombinedFrameworkSdkHostInstallerFile)'
+                      '$(WixRoot)'
+                      '$(SdkBrandName)'
+                      '$(MsiVersion)'
+                      '$(SimpleVersion)'
+                      '$(NugetVersion)'
+                      '$(CombinedFrameworkSDKHostInstallerUpgradeCode)'
+                      '$(Architecture)'" />
+    </Target>
+
+    <Target Name="TestSdkMsi"
+            Inputs="$(SdkInstallerFile)"
+            Outputs="$(SdkMsiTestedSentinel)"
+            DependsOnTargets="Init;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
+            Condition=" '$(OS)' == 'Windows_NT'" >
+
+      <Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
+                      -InputMsi '$(SdkInstallerFile)'
+                      -DotnetDir '$(OutputDirectory)'" />
+
+      <WriteLinesToFile
+          File="$(SdkMsiTestedSentinel)"
+          Lines="$(SdkVersion)"
+          Overwrite="true"
+          Encoding="Unicode"/>
+    </Target>
+
+    <Target Name="GenerateMsis"
+          DependsOnTargets="Init;
+                            Layout;
+                            MsiTargetsSetupInputOutputs;
+                            AcquireWix;
+                            GenerateSdkMsi;
+                            GenerateSdkBundle;
+                            TestSdkMsi"
+          Condition=" '$(OS)' == 'Windows_NT'" />
+
+    <!-- These targets are used in signing, don't remove them! -->
+    <Target Name="ExtractEngineFromSdkBundle"
+            DependsOnTargets="MsiTargetsSetupInputOutputs">
+      <Exec Command="$(WixRoot)/insignia.exe -ib $(CombinedFrameworkSdkHostInstallerFile) -o $(CombinedFrameworkSdkHostBundleEngineName)" />
+    </Target>
+
+    <Target Name="ReattachEngineToSdkBundle"
+            DependsOnTargets="MsiTargetsSetupInputOutputs">
+      <Exec Command="$(WixRoot)/insignia.exe -ab $(CombinedFrameworkSdkHostBundleEngineName) $(CombinedFrameworkSdkHostInstallerFile) -o $(CombinedFrameworkSdkHostInstallerFile)" />
+    </Target>
+</Project>

build/package/Microsoft.DotNet.Cli.Installer.PKG.targets

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="SetupPkgInputsOutputs">
+      <PropertyGroup>
+        <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+        <PkgIntermediateDirectory>$(IntermediateDirectory)/pkgs/$(SdkVersion)</PkgIntermediateDirectory>
+
+        <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+        <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
+
+        <!-- Properties for pkg build -->
+        <SharedHostComponentId>com.microsoft.dotnet.sharedhost.component.osx.x64</SharedHostComponentId>
+        <HostFxrComponentId>com.microsoft.dotnet.hostfxr.component.osx.x64</HostFxrComponentId>
+        <SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(SharedFrameworkVersion).component.osx.x64</SharedFrameworkComponentId>
+        <SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
+        <SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
+
+        <PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
+
+        <SdkPkgSourcesRootDirectory>$(RepoRoot)/packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
+        <SdkPkgScriptsDirectory>$(SdkPkgSourcesRootDirectory)/scripts</SdkPkgScriptsDirectory>
+        <SdkProductArchiveResourcesDirectory>$(SdkPkgSourcesRootDirectory)/resources</SdkProductArchiveResourcesDirectory>
+
+        <SdkProductArchiveDistributionTemplateFile>$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
+        <SdkProductArchiveDistributionFile>$(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml</SdkProductArchiveDistributionFile>
+
+        <SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
+        <SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
+        <SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
+        <HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <DistributionTemplateReplacement Include="{SharedFxComponentId}">
+          <ReplacementString>$(SharedFrameworkComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{SharedHostComponentId}">
+          <ReplacementString>$(SharedHostComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{HostFxrComponentId}">
+          <ReplacementString>$(HostFxrComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{CLISdkComponentId}">
+          <ReplacementString>$(SdkComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{CLISdkNugetVersion}">
+          <ReplacementString>$(SdkVersion)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{CLISdkBrandName}">
+          <ReplacementString>$(SdkBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{SharedFxBrandName}">
+          <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{SharedHostBrandName}">
+          <ReplacementString>$(SharedHostBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{HostFxrBrandName}">
+          <ReplacementString>$(HostFxrBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
+      </ItemGroup>
+
+      <!-- Consumed By Publish -->
+      <ItemGroup>
+        <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
+      </ItemGroup>
+
+      <ItemGroup>
+        <GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
+        <GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />
+
+        <GenerateSdkProductArchiveInputs Include="$(SdkInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
+      </ItemGroup>
+    </Target>
+
+    <Target Name="GenerateSdkPkg"
+            Inputs="@(GenerateSdkPkgInputs)"
+            Outputs="$(SdkInstallerFile)"
+            DependsOnTargets="Init;Layout;SetupPkgInputsOutputs"
+            Condition=" '$(OSName)' == 'osx' ">
+
+      <Exec Command="pkgbuild
+                     --root '$(SdkLayoutOutputDirectory)'
+                     --identifier '$(SdkComponentId)'
+                     --version '$(SdkVersion)'
+                     --install-location '$(PkgInstallDirectory)'
+                     --scripts '$(SdkPkgScriptsDirectory)'
+                     '$(SdkInstallerFile)'" />
+    </Target>
+
+    <Target Name="GenerateSdkProductArchive"
+            Inputs="@(GenerateSdkProductArchiveInputs)"
+            Outputs="$(CombinedFrameworkSdkHostInstallerFile)"
+            DependsOnTargets="GenerateSdkPkg"
+            Condition=" '$(OSName)' == 'osx' ">
+      <!-- Move ProductArchive pkg components into place with component ids in the filenames -->
+      <Copy
+        SourceFiles="$(SdkInstallerFile);
+                     $(DownloadedSharedFrameworkInstallerFile);
+                     $(DownloadedHostFxrInstallerFile);
+                     $(DownloadedSharedHostInstallerFile);"
+        DestinationFiles="$(SdkPkgIntermediatePath);
+                          $(SharedFrameworkPkgIntermediatePath);
+                          $(HostFxrPkgIntermediatePath);
+                          $(SharedHostPkgIntermediatePath);" />
+
+      <!-- Fill out parameters in the Distribution Template -->
+      <ReplaceFileContents
+        InputFile="$(SdkProductArchiveDistributionTemplateFile)"
+        DestinationFile="$(SdkProductArchiveDistributionFile)"
+        ReplacementPatterns="@(DistributionTemplateReplacement -> '%(Identity)')"
+        ReplacementStrings="@(DistributionTemplateReplacement -> '%(ReplacementString)')" />
+
+      <Exec Command="productbuild
+                     --version '$(SdkVersion)'
+                     --identifier '$(SdkProductArchiveId)'
+                     --package-path '$(PkgIntermediateDirectory)'
+                     --resources '$(SdkProductArchiveResourcesDirectory)'
+                     --distribution '$(SdkProductArchiveDistributionFile)'
+                     '$(CombinedFrameworkSdkHostInstallerFile)'" />
+    </Target>
+
+    <Target Name="GeneratePkgs"
+            DependsOnTargets="Init;
+                              Layout;
+                              SetupPkgInputsOutputs;
+                              GenerateSdkPkg;
+                              GenerateSdkProductArchive"
+            Condition=" '$(OSName)' == 'osx' " />
+
+</Project>

build/package/Microsoft.DotNet.Cli.Layout.targets

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
+    <PropertyGroup>
+      <LayoutDirectory>$(IntermediateDirectory)/layouts</LayoutDirectory>
+
+      <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
+      <SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
+      <CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
+      <CombinedFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk)</CombinedFrameworkSdkOutputDirectory>
+    </PropertyGroup>
+
+    <!-- Set up Items with Layout Input Files -->
+    <ItemGroup>
+      <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
+      <SdkDebugLayoutInput Include="$(Stage2SymbolsDirectory)/sdk/**/*" />
+      <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
+      <CombinedFrameworkSdkInput Include="$(OutputDirectory)/shared/**/*" />
+      <CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" />
+    </ItemGroup>
+
+    <MakeRelative
+      Path1="$(OutputDirectory)"
+      Path2="%(SdkLayoutInput.Identity)" >
+      <Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
+    </MakeRelative>
+    <MakeRelative
+      Path1="$(Stage2SymbolsDirectory)"
+      Path2="%(SdkDebugLayoutInput.Identity)" >
+      <Output TaskParameter="RelativePath" ItemName="SdkDebugRelativeOutputFiles" />
+    </MakeRelative>
+    <MakeRelative
+      Path1="$(OutputDirectory)"
+      Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
+      <Output TaskParameter="RelativePath" ItemName="CombinedHostHostFxrFrameworkSdkRelativeOutputFiles" />
+    </MakeRelative>
+    <MakeRelative
+      Path1="$(OutputDirectory)"
+      Path2="%(CombinedFrameworkSdkInput.Identity)" >
+      <Output TaskParameter="RelativePath" ItemName="CombinedFrameworkSdkOutputFiles" />
+    </MakeRelative>
+
+    <!-- Set up Items Defining Layouts for easy change -->
+    <ItemGroup>
+      <LayoutDefinition Include="Sdk">
+        <InputFiles>@(SdkLayoutInput)</InputFiles>
+        <OutputFiles>@(SdkRelativeOutputFiles -> '$(SdkLayoutOutputDirectory)/%(Identity)')</OutputFiles>
+        <NameWithVersion>$(ArtifactNameWithVersionSdk)</NameWithVersion>
+        <Name>$(ArtifactNameSdk)</Name>
+      </LayoutDefinition>
+
+      <LayoutDefinition Include="Debug">
+        <InputFiles>@(SdkDebugLayoutInput)</InputFiles>
+        <OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles>
+        <NameWithVersion>$(ArtifactNameWithVersionSdkDebug)</NameWithVersion>
+        <Name>$(ArtifactNameSdkDebug)</Name>
+      </LayoutDefinition>
+
+      <LayoutDefinition Include="CombinedHostHostFxrFrameworkSdk">
+        <InputFiles>@(CombinedHostHostFxrFrameworkSdkInput)</InputFiles>
+        <OutputFiles>@(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>
+        <NameWithVersion>$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)</NameWithVersion>
+        <Name>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</Name>
+      </LayoutDefinition>
+
+      <LayoutDefinition Include="CombinedFrameworkSdk">
+        <InputFiles>@(CombinedFrameworkSdkInput)</InputFiles>
+        <OutputFiles>@(CombinedFrameworkSdkOutputFiles -> '$(CombinedFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>
+        <NameWithVersion>$(ArtifactNameWithVersionCombinedFrameworkSdk)</NameWithVersion>
+        <Name>$(ArtifactNameCombinedFrameworkSdk)</Name>
+      </LayoutDefinition>
+
+    </ItemGroup>
+  </Target>
+
+  <Target Name="Layout"
+          DependsOnTargets="Init;SetupLayoutInputsOutputs"
+          Inputs="@(LayoutDefinition -> '%(InputFiles)')"
+          Outputs="@(LayoutDefinition -> '%(OutputFiles)')" >
+
+    <!-- Copy Files to layout directories based on defintiions -->
+    <Copy SourceFiles="%(LayoutDefinition.InputFiles)"
+          DestinationFiles="%(LayoutDefinition.OutputFiles)"
+          SkipUnchangedFiles="true" />
+  </Target>
+
+</Project>

build/package/Microsoft.DotNet.Cli.Nupkg.targets

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="SetupProjectsToPack"
+          DependsOnTargets="Init">
+    <PropertyGroup>
+      <NupkgVersionSuffix>$(CommitCount)</NupkgVersionSuffix>
+      <ProjectsSrcDirectory>$(RepoRoot)/src</ProjectsSrcDirectory>
+      <PackagingBuildBasePath>$(Stage2CompilationDirectory)/forPackaging</PackagingBuildBasePath>
+      <NupkgOutputDirectory>$(PackagesDirectory)</NupkgOutputDirectory>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils" >
+        <ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common">
+        <ProjectName>Microsoft.DotNet.Compiler.Common</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files">
+        <ProjectName>Microsoft.DotNet.Files</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions">
+        <ProjectName>Microsoft.DotNet.InternalAbstractions</ProjectName>
+        <Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel">
+        <ProjectName>Microsoft.DotNet.ProjectModel</ProjectName>
+        <Version>$(ProjectModelNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader">
+        <ProjectName>Microsoft.DotNet.ProjectModel.Loader</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces">
+        <ProjectName>Microsoft.DotNet.ProjectModel.Workspaces</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions">
+        <ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Tools.Test">
+        <ProjectName>Microsoft.DotNet.Tools.Test</ProjectName>
+        <Version>$(SdkNugetVersion)</Version>
+      </ProjectsToPack>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="SetupGenerateNugetPackagesInputsOutputs"
+          DependsOnTargets="SetupProjectsToPack">
+    <ItemGroup>
+      <ProjectPackTargetInputs Include="$(PackagingBuildBasePath)/src/%(ProjectsToPack.ProjectName)/**/netstandard*/%(ProjectsToPack.ProjectName).dll" />
+      <ProjectPackTargetOutputs Include="$(NupkgOutputDirectory)/%(ProjectsToPack.ProjectName).%(ProjectsToPack.Version).nupkg" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="GenerateNugetPackages"
+          DependsOnTargets="SetupGenerateNugetPackagesInputsOutputs"
+          Inputs="@(ProjectPackTargetInputs -> '%(Identity)')"
+          Outputs="@(ProjectPackTargetOutputs -> '%(Identity)')">
+
+    <DotNetPack BuildBasePath="$(PackagingBuildBasePath)"
+                NoBuild="True"
+                Output="$(NupkgOutputDirectory)"
+                ProjectPath="%(ProjectsToPack.Identity)"
+                ToolPath="$(Stage2Directory)"
+                VersionSuffix="$(NupkgVersionSuffix)"
+                Configuration="$(Configuration)" />
+  </Target>
+
+  <Target Name="BuildProjectsForNuGetPackages"
+            DependsOnTargets="Init;
+                              SetupProjectsToPack"
+            Condition=" '$(OS)' == 'Windows_NT' ">
+        <MakeDir Directories="$(PackagingBuildBasePath)" />
+
+        <DotNetBuild ToolPath="$(Stage2Directory)"
+                     BuildBasePath="$(PackagingBuildBasePath)"
+                     Configuration="$(Configuration)"
+                     ProjectPath="%(ProjectsToPack.Identity)" />
+  </Target>
+</Project>

build/prepare/CentosCoreclrAndCoreFxDependencies.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CentosCoreclrAndCoreFxDependencies Include="unzip" />
+    <CentosCoreclrAndCoreFxDependencies Include="libunwind" />
+    <CentosCoreclrAndCoreFxDependencies Include="gettext" />
+    <CentosCoreclrAndCoreFxDependencies Include="libcurl-devel" />
+    <CentosCoreclrAndCoreFxDependencies Include="openssl-devel" />
+    <CentosCoreclrAndCoreFxDependencies Include="zlib" />
+    <CentosCoreclrAndCoreFxDependencies Include="libicu-devel" />
+  </ItemGroup>
+</Project>

build/prepare/CheckPrereqs.targets

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="UbuntuCoreclrAndCoreFxDependencies.props" />
+  <Import Project="DebianPackageBuildDependencies.props" />
+  <Import Project="CentosCoreclrAndCoreFxDependencies.props" />
+
+  <Target Name="CheckPrereqs"
+      DependsOnTargets="InitializeCommonProps;
+                        CheckUbuntuAptGetDependencies;
+                        CheckCentOsYumDependencies;">
+
+    <Message Text="Using Stage0 version:" />
+    <Exec Command="$(DotnetStage0) --version" />
+  </Target>
+
+  <Target Name="CheckUbuntuAptGetDependencies"
+      Condition=" '$(Rid)' == 'ubuntu.14.04-x64' ">
+
+    <Exec Command="dpkg -s %(UbuntuCoreclrAndCoreFxDependencies.Identity)" />
+
+    <Exec Command="dpkg -s %(DebianPackageBuildDependencies.Identity)" />
+
+    <OnError ExecuteTargets="ShowAptGetUsage" />
+  </Target>
+
+  <Target Name="ShowAptGetUsage">
+    <Message Text="Install the missing dependency with `sudo apt-get install {package}`." />
+  </Target>
+
+  <Target Name="CheckCentOsYumDependencies"
+      Condition=" '$(OSName)' == 'centos' ">
+
+    <Exec Command="yum list installed %(CentosCoreclrAndCoreFxDependencies.Identity)" />
+
+    <OnError ExecuteTargets="ShowYumUsage" />
+  </Target>
+
+  <Target Name="ShowYumUsage">
+    <Message Text="Install the missing dependency with `yum install {package}`." />
+  </Target>
+</Project>