From 62abef428e2bb310870bf704a63b5e506d3f8faa Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Tue, 14 Feb 2017 15:42:13 -0800
Subject: [PATCH 01/13] Rename build files

---
 build.proj                                    | 18 +++++------
 ....Cli.BranchInfo.props => BranchInfo.props} |  0
 ...tNet.Cli.Branding.props => Branding.props} |  0
 ....Cli.BundledSdks.proj => BundledSdks.proj} |  0
 ...li.BundledSdks.props => BundledSdks.props} |  0
 ...edTemplates.proj => BundledTemplates.proj} |  0
 ...Templates.props => BundledTemplates.props} |  0
 ...et.Cli.Compile.targets => Compile.targets} |  8 ++---
 ...ersions.props => DependencyVersions.props} | 32 +++++++++----------
 ...eExtensions.props => FileExtensions.props} |  0
 ...mmitInfo.targets => GitCommitInfo.targets} |  0
 ....Cli.HostInfo.targets => HostInfo.targets} |  0
 ...tNet.Cli.InitRepo.props => InitRepo.props} |  0
 ....Cli.InitRepo.targets => InitRepo.targets} |  0
 ...ectories.props => OutputDirectories.props} |  0
 ...et.Cli.Package.targets => Package.targets} | 12 +++----
 ...et.Cli.Prepare.targets => Prepare.targets} |  4 +--
 ...et.Cli.Publish.targets => Publish.targets} |  4 +--
 ...oft.DotNet.Cli.Run.targets => Run.targets} |  0
 ...t.DotNet.Cli.Signing.proj => Signing.proj} |  0
 ...t.DotNet.Cli.Stage0.props => Stage0.props} |  0
 ...t.DotNet.Cli.Test.targets => Test.targets} |  0
 ...DotNet.Cli.Version.props => Version.props} |  0
 ....VersionBadge.props => VersionBadge.props} |  0
 ...zmaArchive.targets => LzmaArchive.targets} |  0
 ....Cli.Crossgen.targets => Crossgen.targets} |  0
 ...et.Cli.Archive.targets => Archive.targets} |  0
 ....Installer.DEB.proj => Installer.DEB.proj} |  4 +--
 ...ller.DEB.targets => Installer.DEB.targets} |  0
 ...ller.MSI.targets => Installer.MSI.targets} |  0
 ...ller.PKG.targets => Installer.PKG.targets} |  0
 ...tNet.Cli.Layout.targets => Layout.targets} |  0
 ...DotNet.Cli.Nupkg.targets => Nupkg.targets} |  0
 ...DotNet.Cli.Badge.targets => Badge.targets} |  0
 ....Cli.Checksum.targets => Checksum.targets} |  0
 dir.props                                     | 18 +++++------
 36 files changed, 50 insertions(+), 50 deletions(-)
 rename build/{Microsoft.DotNet.Cli.BranchInfo.props => BranchInfo.props} (100%)
 rename build/{Microsoft.DotNet.Cli.Branding.props => Branding.props} (100%)
 rename build/{Microsoft.DotNet.Cli.BundledSdks.proj => BundledSdks.proj} (100%)
 rename build/{Microsoft.DotNet.Cli.BundledSdks.props => BundledSdks.props} (100%)
 rename build/{Microsoft.DotNet.Cli.BundledTemplates.proj => BundledTemplates.proj} (100%)
 rename build/{Microsoft.DotNet.Cli.BundledTemplates.props => BundledTemplates.props} (100%)
 rename build/{Microsoft.DotNet.Cli.Compile.targets => Compile.targets} (97%)
 rename build/{Microsoft.DotNet.Cli.DependencyVersions.props => DependencyVersions.props} (98%)
 rename build/{Microsoft.DotNet.Cli.FileExtensions.props => FileExtensions.props} (100%)
 rename build/{Microsoft.DotNet.Cli.GitCommitInfo.targets => GitCommitInfo.targets} (100%)
 rename build/{Microsoft.DotNet.Cli.HostInfo.targets => HostInfo.targets} (100%)
 rename build/{Microsoft.DotNet.Cli.InitRepo.props => InitRepo.props} (100%)
 rename build/{Microsoft.DotNet.Cli.InitRepo.targets => InitRepo.targets} (100%)
 rename build/{Microsoft.DotNet.Cli.OutputDirectories.props => OutputDirectories.props} (100%)
 rename build/{Microsoft.DotNet.Cli.Package.targets => Package.targets} (50%)
 rename build/{Microsoft.DotNet.Cli.Prepare.targets => Prepare.targets} (99%)
 rename build/{Microsoft.DotNet.Cli.Publish.targets => Publish.targets} (96%)
 rename build/{Microsoft.DotNet.Cli.Run.targets => Run.targets} (100%)
 rename build/{Microsoft.DotNet.Cli.Signing.proj => Signing.proj} (100%)
 rename build/{Microsoft.DotNet.Cli.Stage0.props => Stage0.props} (100%)
 rename build/{Microsoft.DotNet.Cli.Test.targets => Test.targets} (100%)
 rename build/{Microsoft.DotNet.Cli.Version.props => Version.props} (100%)
 rename build/{Microsoft.DotNet.Cli.VersionBadge.props => VersionBadge.props} (100%)
 rename build/compile/{Microsoft.DotNet.Cli.LzmaArchive.targets => LzmaArchive.targets} (100%)
 rename build/crossgen/{Microsoft.DotNet.Cli.Crossgen.targets => Crossgen.targets} (100%)
 rename build/package/{Microsoft.DotNet.Cli.Archive.targets => Archive.targets} (100%)
 rename build/package/{Microsoft.DotNet.Cli.Installer.DEB.proj => Installer.DEB.proj} (98%)
 rename build/package/{Microsoft.DotNet.Cli.Installer.DEB.targets => Installer.DEB.targets} (100%)
 rename build/package/{Microsoft.DotNet.Cli.Installer.MSI.targets => Installer.MSI.targets} (100%)
 rename build/package/{Microsoft.DotNet.Cli.Installer.PKG.targets => Installer.PKG.targets} (100%)
 rename build/package/{Microsoft.DotNet.Cli.Layout.targets => Layout.targets} (100%)
 rename build/package/{Microsoft.DotNet.Cli.Nupkg.targets => Nupkg.targets} (100%)
 rename build/publish/{Microsoft.DotNet.Cli.Badge.targets => Badge.targets} (100%)
 rename build/publish/{Microsoft.DotNet.Cli.Checksum.targets => Checksum.targets} (100%)

diff --git a/build.proj b/build.proj
index 53157564a..a9e76346a 100644
--- a/build.proj
+++ b/build.proj
@@ -72,14 +72,14 @@
 
   <Target Name="BuildTheWholeCli" DependsOnTargets="$(CLITargets)" />
 
-  <Import Project="build/Microsoft.DotNet.Cli.GitCommitInfo.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.HostInfo.targets" />
-  <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" />
+  <Import Project="build/GitCommitInfo.targets" />
+  <Import Project="build/HostInfo.targets" />
+  <Import Project="build/Prepare.targets" />
+  <Import Project="build/Compile.targets" />
+  <Import Project="build/Package.targets" />
+  <Import Project="build/Test.targets" />
+  <Import Project="build/Publish.targets" />
+  <Import Project="build/Run.targets" />
 
-  <Import Project="build/Microsoft.DotNet.Cli.InitRepo.targets" />
+  <Import Project="build/InitRepo.targets" />
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.BranchInfo.props b/build/BranchInfo.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BranchInfo.props
rename to build/BranchInfo.props
diff --git a/build/Microsoft.DotNet.Cli.Branding.props b/build/Branding.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Branding.props
rename to build/Branding.props
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.proj b/build/BundledSdks.proj
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledSdks.proj
rename to build/BundledSdks.proj
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/BundledSdks.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledSdks.props
rename to build/BundledSdks.props
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.proj b/build/BundledTemplates.proj
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledTemplates.proj
rename to build/BundledTemplates.proj
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.props b/build/BundledTemplates.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledTemplates.props
rename to build/BundledTemplates.props
diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Compile.targets
similarity index 97%
rename from build/Microsoft.DotNet.Cli.Compile.targets
rename to build/Compile.targets
index d22ad04eb..8fac4a281 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Compile.targets
@@ -1,7 +1,7 @@
 <?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" />
+  <Import Project="compile/LzmaArchive.targets" />
+  <Import Project="crossgen/Crossgen.targets" />
 
   <PropertyGroup>
     <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
@@ -245,7 +245,7 @@
   <Target Name="PublishSdks"
           DependsOnTargets="Prepare">
     <ItemGroup>
-      <SdksToBundle Include="build/Microsoft.DotNet.Cli.BundledSdks.proj">
+      <SdksToBundle Include="build/BundledSdks.proj">
         <Properties>
           CLIBuildDll=$(CLIBuildDll);
           NuGetPackagesDir=$(NuGetPackagesDir);
@@ -266,7 +266,7 @@
   <Target Name="PublishTemplates"
           DependsOnTargets="Prepare">
     <ItemGroup>
-      <TemplatesToBundle Include="build/Microsoft.DotNet.Cli.BundledTemplates.proj">
+      <TemplatesToBundle Include="build/BundledTemplates.proj">
         <Properties>
           TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
           TemplatePackageName=%(BundledTemplate.Identity);
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/DependencyVersions.props
similarity index 98%
rename from build/Microsoft.DotNet.Cli.DependencyVersions.props
rename to build/DependencyVersions.props
index 923e055fb..ed16c72ee 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
-    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
+    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+  </PropertyGroup>
+</Project>
diff --git a/build/Microsoft.DotNet.Cli.FileExtensions.props b/build/FileExtensions.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.FileExtensions.props
rename to build/FileExtensions.props
diff --git a/build/Microsoft.DotNet.Cli.GitCommitInfo.targets b/build/GitCommitInfo.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.GitCommitInfo.targets
rename to build/GitCommitInfo.targets
diff --git a/build/Microsoft.DotNet.Cli.HostInfo.targets b/build/HostInfo.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.HostInfo.targets
rename to build/HostInfo.targets
diff --git a/build/Microsoft.DotNet.Cli.InitRepo.props b/build/InitRepo.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.InitRepo.props
rename to build/InitRepo.props
diff --git a/build/Microsoft.DotNet.Cli.InitRepo.targets b/build/InitRepo.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.InitRepo.targets
rename to build/InitRepo.targets
diff --git a/build/Microsoft.DotNet.Cli.OutputDirectories.props b/build/OutputDirectories.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.OutputDirectories.props
rename to build/OutputDirectories.props
diff --git a/build/Microsoft.DotNet.Cli.Package.targets b/build/Package.targets
similarity index 50%
rename from build/Microsoft.DotNet.Cli.Package.targets
rename to build/Package.targets
index d930228db..64d2f34d4 100644
--- a/build/Microsoft.DotNet.Cli.Package.targets
+++ b/build/Package.targets
@@ -1,11 +1,11 @@
 <?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" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Layout.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Archive.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Nupkg.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Installer.DEB.proj" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Installer.MSI.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Installer.PKG.targets" />
 
   <Target Name="GenerateInstallers" 
           DependsOnTargets="Init;Layout;GeneratePkgs;GenerateDebs;GenerateMsis" />
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Prepare.targets
similarity index 99%
rename from build/Microsoft.DotNet.Cli.Prepare.targets
rename to build/Prepare.targets
index b7c5210dd..0370f44da 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Prepare.targets
@@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Microsoft.DotNet.Cli.tasks" />
   <Import Project="prepare/CheckPrereqs.targets" />
-  <Import Project="Microsoft.DotNet.Cli.BundledSdks.props" />
-  <Import Project="Microsoft.DotNet.Cli.BundledTemplates.props" />
+  <Import Project="BundledSdks.props" />
+  <Import Project="BundledTemplates.props" />
 
   <Target Name="Prepare"
           DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages" />
diff --git a/build/Microsoft.DotNet.Cli.Publish.targets b/build/Publish.targets
similarity index 96%
rename from build/Microsoft.DotNet.Cli.Publish.targets
rename to build/Publish.targets
index 9c66a492c..faca97224 100644
--- a/build/Microsoft.DotNet.Cli.Publish.targets
+++ b/build/Publish.targets
@@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)/publish/FinishBuild.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/PublishContent.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Badge.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Checksum.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/publish/Badge.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/publish/Checksum.targets" />
 
   <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
   <Target Name="Publish"
diff --git a/build/Microsoft.DotNet.Cli.Run.targets b/build/Run.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Run.targets
rename to build/Run.targets
diff --git a/build/Microsoft.DotNet.Cli.Signing.proj b/build/Signing.proj
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Signing.proj
rename to build/Signing.proj
diff --git a/build/Microsoft.DotNet.Cli.Stage0.props b/build/Stage0.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Stage0.props
rename to build/Stage0.props
diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Test.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Test.targets
rename to build/Test.targets
diff --git a/build/Microsoft.DotNet.Cli.Version.props b/build/Version.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Version.props
rename to build/Version.props
diff --git a/build/Microsoft.DotNet.Cli.VersionBadge.props b/build/VersionBadge.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.VersionBadge.props
rename to build/VersionBadge.props
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/LzmaArchive.targets
similarity index 100%
rename from build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
rename to build/compile/LzmaArchive.targets
diff --git a/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets b/build/crossgen/Crossgen.targets
similarity index 100%
rename from build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets
rename to build/crossgen/Crossgen.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Archive.targets b/build/package/Archive.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Archive.targets
rename to build/package/Archive.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj b/build/package/Installer.DEB.proj
similarity index 98%
rename from build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
rename to build/package/Installer.DEB.proj
index fb4aab4a6..04e9f7e4b 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -3,7 +3,7 @@
 
   <UsingTask TaskName="DotNetDebTool" AssemblyFile="$(CLIBuildDll)" />
 
-  <Import Project="Microsoft.DotNet.Cli.Installer.DEB.targets" />
+  <Import Project="Installer.DEB.targets" />
 
   <Target Name="GenerateDebs"
           DependsOnTargets="SetupDebProps;
@@ -156,7 +156,7 @@
   </Target>
 
   <Target Name="WriteDotnetDebToolProjectJson"
-          Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
+          Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Installer.DEB.props"
           Outputs="$(DotnetDebToolDir)/project.json">
 
     <MakeDir Condition=" !Exists($(DotnetDebToolDir)) " 
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Installer.DEB.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
rename to build/package/Installer.DEB.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets b/build/package/Installer.MSI.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
rename to build/package/Installer.MSI.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets b/build/package/Installer.PKG.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
rename to build/package/Installer.PKG.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Layout.targets b/build/package/Layout.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Layout.targets
rename to build/package/Layout.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Nupkg.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Nupkg.targets
rename to build/package/Nupkg.targets
diff --git a/build/publish/Microsoft.DotNet.Cli.Badge.targets b/build/publish/Badge.targets
similarity index 100%
rename from build/publish/Microsoft.DotNet.Cli.Badge.targets
rename to build/publish/Badge.targets
diff --git a/build/publish/Microsoft.DotNet.Cli.Checksum.targets b/build/publish/Checksum.targets
similarity index 100%
rename from build/publish/Microsoft.DotNet.Cli.Checksum.targets
rename to build/publish/Checksum.targets
diff --git a/dir.props b/dir.props
index 62ad5659f..be4bb5d6f 100644
--- a/dir.props
+++ b/dir.props
@@ -4,19 +4,19 @@
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
   </PropertyGroup>
 
-  <Import Project="build/Microsoft.DotNet.Cli.InitRepo.props" />
+  <Import Project="build/InitRepo.props" />
   <Import Condition=" Exists('$(GitCommitInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(GitCommitInfoProps)" />
   <Import Condition=" Exists('$(HostInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(HostInfoProps)" />
   
-  <Import Project="build/Microsoft.DotNet.Cli.BranchInfo.props" />
+  <Import Project="build/BranchInfo.props" />
 
-  <Import Project="build/Microsoft.DotNet.Cli.DependencyVersions.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.FileExtensions.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.OutputDirectories.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.Stage0.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.Version.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.Branding.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.VersionBadge.props" />
+  <Import Project="build/DependencyVersions.props" />
+  <Import Project="build/FileExtensions.props" />
+  <Import Project="build/OutputDirectories.props" />
+  <Import Project="build/Stage0.props" />
+  <Import Project="build/Version.props" />
+  <Import Project="build/Branding.props" />
+  <Import Project="build/VersionBadge.props" />
   
   <PropertyGroup>
     <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>

From 7a894df413487eca81828c5e7af491632e57827a Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:42:34 -0800
Subject: [PATCH 02/13] Trying to fix the diff of one file

---
 ...osoft.DotNet.Cli.DependencyVersions.props} | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)
 rename build/{DependencyVersions.props => Microsoft.DotNet.Cli.DependencyVersions.props} (78%)

diff --git a/build/DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
similarity index 78%
rename from build/DependencyVersions.props
rename to build/Microsoft.DotNet.Cli.DependencyVersions.props
index f266ec79a..923e055fb 100644
--- a/build/DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
-    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
+    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+  </PropertyGroup>
+</Project>

From e85f4069c4f5052dba115650d921b652aaae41b8 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:43:27 -0800
Subject: [PATCH 03/13] Now rename

---
 ...ersions.props => DependencyVersions.props} | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)
 rename build/{Microsoft.DotNet.Cli.DependencyVersions.props => DependencyVersions.props} (98%)

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/DependencyVersions.props
similarity index 98%
rename from build/Microsoft.DotNet.Cli.DependencyVersions.props
rename to build/DependencyVersions.props
index 923e055fb..ed16c72ee 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
-    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
+    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+  </PropertyGroup>
+</Project>

From 688195b8b542f4f5d40a2afab8c3967c474a92d7 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:47:33 -0800
Subject: [PATCH 04/13] try again

---
 build/DependencyVersions.props                | 31 ++++++++++---------
 ...rosoft.DotNet.Cli.DependencyVersions.props | 19 ++++++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 build/Microsoft.DotNet.Cli.DependencyVersions.props

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index ed16c72ee..23093e98f 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
-    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-  </PropertyGroup>
+  <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+      <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+      <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+      <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+      <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
+      <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+      <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+      <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+      <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+      <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+      <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+      <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
+      <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+      <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+      <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+    </PropertyGroup>
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
new file mode 100644
index 000000000..23093e98f
--- /dev/null
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+      <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+      <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+      <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+      <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
+      <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+      <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+      <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+      <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+      <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+      <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+      <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
+      <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+      <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+      <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+    </PropertyGroup>
+</Project>

From ce0ae2553d34e00daca96e3fae7b5301f624b957 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:51:00 -0800
Subject: [PATCH 05/13] fix tabs

---
 ...rosoft.DotNet.Cli.DependencyVersions.props | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 23093e98f..64a15c94b 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-      <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-      <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-      <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-      <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
-      <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-      <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-      <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-      <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-      <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-      <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-      <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-      <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-      <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-      <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-    </PropertyGroup>
+	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+		<PropertyGroup>
+			<CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+			<CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+			<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+			<CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
+			<!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+			<CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+			<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+			<CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+			<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+			<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+			<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
+			<TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+			<TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+			<TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+		</PropertyGroup>
 </Project>

From 0c7a94e7cb9cc11b047bac755cffb09b5fe27277 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:52:14 -0800
Subject: [PATCH 06/13] Trying to figure out spacing

---
 build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 64a15c94b..baa489581 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-		<PropertyGroup>
+  <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
 			<CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
 			<CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
 			<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>

From 832e8dc6e0e885f70d748332612f21eed9eca40b Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:54:35 -0800
Subject: [PATCH 07/13] try new spacing

---
 ...rosoft.DotNet.Cli.DependencyVersions.props | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index baa489581..f266ec79a 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-			<CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-			<CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-			<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-			<CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
-			<!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-			<CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-			<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-			<CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-			<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-			<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-			<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-			<TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-			<TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-			<TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-		</PropertyGroup>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+    <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
+    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
+    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+  </PropertyGroup>
 </Project>

From da81fcaa307e2660042eea3145b2541c5a998eb0 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:56:46 -0800
Subject: [PATCH 08/13] One more try. Delete the file first

---
 ...rosoft.DotNet.Cli.DependencyVersions.props | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 build/Microsoft.DotNet.Cli.DependencyVersions.props

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
deleted file mode 100644
index f266ec79a..000000000
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
-    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-  </PropertyGroup>
-</Project>

From 2f298ed61623630205eb48d9d4e7f03c7c7b939c Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:57:11 -0800
Subject: [PATCH 09/13] Now add the original file without any rename

---
 ...Microsoft.DotNet.Cli.DependencyVersions.props | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 build/Microsoft.DotNet.Cli.DependencyVersions.props

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
new file mode 100644
index 000000000..923e055fb
--- /dev/null
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
+    <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
+    <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
+    <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
+  </PropertyGroup>
+</Project>

From b40635f8df20b8a772db5a1b9b1ad6c647b5243c Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:59:30 -0800
Subject: [PATCH 10/13] Fix up the file

---
 build/Microsoft.DotNet.Cli.DependencyVersions.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 923e055fb..229d4b4a6 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -9,6 +9,9 @@
     <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
     <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>

From 74493a13e963694464c437024ee8336555af1338 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 11:59:51 -0800
Subject: [PATCH 11/13] Delete the renamed file

---
 build/DependencyVersions.props | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 build/DependencyVersions.props

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
deleted file mode 100644
index 23093e98f..000000000
--- a/build/DependencyVersions.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-      <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
-      <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
-      <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-      <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
-      <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
-      <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
-      <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
-      <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-      <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-      <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-      <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-      <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-      <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
-      <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>
-    </PropertyGroup>
-</Project>

From 4d38a9be97976936a4c17590c9bcf5414f1fcd04 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 12:00:57 -0800
Subject: [PATCH 12/13] Fix the file

---
 build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 229d4b4a6..249a8db03 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -4,7 +4,7 @@
     <CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>1.1.0-alpha-20170209-1</CLI_NETSDK_Version>
     <!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
     <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>

From e66f6cd1a3b8da8ec7ff20bfe21e8a4e92c60fb9 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 15 Feb 2017 12:05:36 -0800
Subject: [PATCH 13/13] Do not rename the file yet

---
 Microsoft.DotNet.Cli.sln | 2 +-
 dir.props                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 3715f30ab..71b979be9 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -33,7 +33,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\BundledTemplates.props = build\BundledTemplates.props
 		build\Compile.targets = build\Compile.targets
 		build\CoreSetupInfo.props = build\CoreSetupInfo.props
-		build\DependencyVersions.props = build\DependencyVersions.props
+		build\Microsoft.DotNet.Cli.DependencyVersions.props = build\Microsoft.DotNet.Cli.DependencyVersions.props
 		build\FileExtensions.props = build\FileExtensions.props
 		build\GitCommitInfo.targets = build\GitCommitInfo.targets
 		build\HostInfo.targets = build\HostInfo.targets
diff --git a/dir.props b/dir.props
index ff69de344..04189ffc0 100644
--- a/dir.props
+++ b/dir.props
@@ -11,7 +11,7 @@
   <Import Project="build/BranchInfo.props" />
   <Import Project="build/CoreSetupInfo.props" />
 
-  <Import Project="build/DependencyVersions.props" />
+  <Import Project="build/Microsoft.DotNet.Cli.DependencyVersions.props" />
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
   <Import Project="build/OutputDirectories.props" />