Rename build files

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>

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);

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>

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" />

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" />

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"

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)) " 

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>