Merge pull request #1985 from dsplaisted/1071-rename-build-directory

Rename SDK build directory to "targets" in source and layout
dotnet · Feb 23, 2018 · 6945e36 · 6945e36
2 parents acf05da + e301331
commit 6945e36
Show file tree

Hide file tree

Showing 37 changed files with 12 additions and 13 deletions.
diff --git a/...T.DefaultPackageConflictOverrides.targets → ...T.DefaultPackageConflictOverrides.targets b/...T.DefaultPackageConflictOverrides.targets → ...T.DefaultPackageConflictOverrides.targets
diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
@@ -61,7 +61,7 @@
     <None Include="msbuildExtensions\**\*" PackagePath="msbuildExtensions\" />
     <None Include="msbuildExtensions-ver\**\*" PackagePath="msbuildExtensions-ver\" />
     <None Include="..\Common\Resources\xlf\**\*" LinkBase="Resources\xlf" />
-    <None Include="..\Common\build\**\*" PackagePath="msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\" LinkBase="%(PackagePath)" />
+    <None Include="..\Common\targets\**\*" PackagePath="msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\" LinkBase="%(PackagePath)" />
   </ItemGroup>
 
   <Target Name="PrepareAdditionalFilesToLayout" BeforeTargets="AssignTargetPaths">

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -62,10 +62,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="build\**\*" PackagePath="build\" />
-    <None Include="buildCrossTargeting\**\*" PackagePath="buildCrossTargeting\"  />
+    <None Include="targets\**\*" PackagePath="targets\" />
     <None Include="sdk\**\*" PackagePath="Sdk\" />
-    <None Include="..\Common\build\**\*" PackagePath="build\" LinkBase="build" />
+    <None Include="..\Common\targets\**\*" PackagePath="targets\" LinkBase="targets" />
     <None Include="..\Common\Resources\xlf\**\*" LinkBase="Resources\xlf" />
   </ItemGroup>
 
@@ -87,7 +86,7 @@
       <Stage0SdkFile Include="$(_Stage0SdksFolder)\FSharp.NET.Sdk\**" SdkName="FSharp.NET.Sdk" />
       <Stage0SdkFile Include="$(_Stage0SdksFolder)\Microsoft.NET.Sdk.Publish\**" SdkName="Microsoft.NET.Sdk.Publish" />
       <Stage0SdkFile Include="$(_Stage0SdksFolder)\Microsoft.NET.Sdk.Web\**" SdkName="Microsoft.NET.Sdk.Web" />
-      <Stage0SdkFile Include="$(_Stage0SdksFolder)\Microsoft.NET.Sdk.Web.ProjectSystem\**" SdkName="Microsoft.NET.Sdk.Web.ProjectSystem"/>
+      <Stage0SdkFile Include="$(_Stage0SdksFolder)\Microsoft.NET.Sdk.Web.ProjectSystem\**" SdkName="Microsoft.NET.Sdk.Web.ProjectSystem" />
       <LayoutFile Include="@(Stage0SdkFile)">
         <TargetPath>..\%(Stage0SdkFile.SdkName)\%(Stage0SdkFile.RecursiveDir)%(Stage0SdkFile.Filename)%(Stage0SdkFile.Extension)</TargetPath>
       </LayoutFile>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props
@@ -27,5 +27,5 @@ Copyright (c) .NET Foundation. All rights reserved.
   </PropertyGroup>
 
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.NET.Sdk.props"  />  
+  <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.props"  />  
 </Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets
@@ -20,15 +20,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     <IsCrossTargetingBuild>true</IsCrossTargetingBuild>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.NET.Sdk.BeforeCommonCrossTargeting.targets"
+  <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.BeforeCommonCrossTargeting.targets"
           Condition="'$(IsCrossTargetingBuild)' == 'true'"/>
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.NET.Sdk.BeforeCommon.targets"
+  <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.BeforeCommon.targets"
           Condition="'$(IsCrossTargetingBuild)' != 'true'"/>
 
   <PropertyGroup Condition="'$(LanguageTargets)' == ''">
     <LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.csproj'">$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
     <LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.vbproj'">$(MSBuildToolsPath)\Microsoft.VisualBasic.targets</LanguageTargets>
-    <LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.fsproj'">$(MSBuildThisFileDirectory)..\build\Microsoft.NET.Sdk.FSharp.targets</LanguageTargets>
+    <LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.fsproj'">$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.FSharp.targets</LanguageTargets>
 
     <!-- If LanguageTargets isn't otherwise set, then just import the common targets.  This should allow the restore target to run,
          which could bring in NuGet packages that set the LanguageTargets to something else.  This means support for different
@@ -40,9 +40,9 @@ Copyright (c) .NET Foundation. All rights reserved.
                using Sdk attribute (from .NET Core Sdk 1.0.0-preview4) -->
   <Import Project="$(LanguageTargets)"/>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\buildCrossTargeting\Microsoft.NET.Sdk.targets"
+  <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.CrossTargeting.targets"
           Condition="'$(IsCrossTargetingBuild)' == 'true'"/>
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.NET.Sdk.targets"
+  <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.targets"
           Condition="'$(IsCrossTargetingBuild)' != 'true'"/>
 
   <!-- Import targets from NuGet.Build.Tasks.Pack package/Sdk -->

diff --git a/...asks/build/GenerateDeps/GenerateDeps.proj → ...ks/targets/GenerateDeps/GenerateDeps.proj b/...asks/build/GenerateDeps/GenerateDeps.proj → ...ks/targets/GenerateDeps/GenerateDeps.proj
diff --git a/.../build/Microsoft.NET.ComposeStore.targets → ...argets/Microsoft.NET.ComposeStore.targets b/.../build/Microsoft.NET.ComposeStore.targets → ...argets/Microsoft.NET.ComposeStore.targets
diff --git a/.../Microsoft.NET.ConflictResolution.targets → .../Microsoft.NET.ConflictResolution.targets b/.../Microsoft.NET.ConflictResolution.targets → .../Microsoft.NET.ConflictResolution.targets
diff --git a/...asks/build/Microsoft.NET.CrossGen.targets → ...ks/targets/Microsoft.NET.CrossGen.targets b/...asks/build/Microsoft.NET.CrossGen.targets → ...ks/targets/Microsoft.NET.CrossGen.targets
diff --git a/...Microsoft.NET.DefaultAssemblyInfo.targets → ...Microsoft.NET.DefaultAssemblyInfo.targets b/...Microsoft.NET.DefaultAssemblyInfo.targets → ...Microsoft.NET.DefaultAssemblyInfo.targets
diff --git a/.../Microsoft.NET.DefaultOutputPaths.targets → .../Microsoft.NET.DefaultOutputPaths.targets b/.../Microsoft.NET.DefaultOutputPaths.targets → .../Microsoft.NET.DefaultOutputPaths.targets
diff --git a/...isableStandardFrameworkResolution.targets → ...isableStandardFrameworkResolution.targets b/...isableStandardFrameworkResolution.targets → ...isableStandardFrameworkResolution.targets
diff --git a/...icrosoft.NET.GenerateAssemblyInfo.targets → ...icrosoft.NET.GenerateAssemblyInfo.targets b/...icrosoft.NET.GenerateAssemblyInfo.targets → ...icrosoft.NET.GenerateAssemblyInfo.targets
diff --git a/...d/Microsoft.NET.NuGetOfflineCache.targets → ...s/Microsoft.NET.NuGetOfflineCache.targets b/...d/Microsoft.NET.NuGetOfflineCache.targets → ...s/Microsoft.NET.NuGetOfflineCache.targets
diff --git a/....Tasks/build/Microsoft.NET.PackTool.props → ...asks/targets/Microsoft.NET.PackTool.props b/....Tasks/build/Microsoft.NET.PackTool.props → ...asks/targets/Microsoft.NET.PackTool.props
diff --git a/...asks/build/Microsoft.NET.PackTool.targets → ...ks/targets/Microsoft.NET.PackTool.targets b/...asks/build/Microsoft.NET.PackTool.targets → ...ks/targets/Microsoft.NET.PackTool.targets
diff --git a/...ft.NET.PreserveCompilationContext.targets → ...ft.NET.PreserveCompilationContext.targets b/...ft.NET.PreserveCompilationContext.targets → ...ft.NET.PreserveCompilationContext.targets
diff --git a/...Tasks/build/Microsoft.NET.Publish.targets → ...sks/targets/Microsoft.NET.Publish.targets b/...Tasks/build/Microsoft.NET.Publish.targets → ...sks/targets/Microsoft.NET.Publish.targets
diff --git a/...ft.NET.RuntimeIdentifierInference.targets → ...ft.NET.RuntimeIdentifierInference.targets b/...ft.NET.RuntimeIdentifierInference.targets → ...ft.NET.RuntimeIdentifierInference.targets
diff --git a/...ld/Microsoft.NET.Sdk.BeforeCommon.targets → ...ts/Microsoft.NET.Sdk.BeforeCommon.targets b/...ld/Microsoft.NET.Sdk.BeforeCommon.targets → ...ts/Microsoft.NET.Sdk.BeforeCommon.targets
diff --git a/...ET.Sdk.BeforeCommonCrossTargeting.targets → ...ET.Sdk.BeforeCommonCrossTargeting.targets b/...ET.Sdk.BeforeCommonCrossTargeting.targets → ...ET.Sdk.BeforeCommonCrossTargeting.targets
diff --git a/...asks/build/Microsoft.NET.Sdk.CSharp.props → ...ks/targets/Microsoft.NET.Sdk.CSharp.props b/...asks/build/Microsoft.NET.Sdk.CSharp.props → ...ks/targets/Microsoft.NET.Sdk.CSharp.props
diff --git a/...ks/build/Microsoft.NET.Sdk.CSharp.targets → .../targets/Microsoft.NET.Sdk.CSharp.targets b/...ks/build/Microsoft.NET.Sdk.CSharp.targets → .../targets/Microsoft.NET.Sdk.CSharp.targets
diff --git a/...ks/build/Microsoft.NET.Sdk.Common.targets → .../targets/Microsoft.NET.Sdk.Common.targets b/...ks/build/Microsoft.NET.Sdk.Common.targets → .../targets/Microsoft.NET.Sdk.Common.targets
diff --git a/...dCrossTargeting/Microsoft.NET.Sdk.targets → .../Microsoft.NET.Sdk.CrossTargeting.targets b/...dCrossTargeting/Microsoft.NET.Sdk.targets → .../Microsoft.NET.Sdk.CrossTargeting.targets
@@ -15,7 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <Import Project="..\build\Microsoft.NET.Sdk.Common.targets"/>
+  <Import Project="Microsoft.NET.Sdk.Common.targets"/>
 
   <!--
   ============================================================

diff --git a/...uild/Microsoft.NET.Sdk.DefaultItems.props → ...gets/Microsoft.NET.Sdk.DefaultItems.props b/...uild/Microsoft.NET.Sdk.DefaultItems.props → ...gets/Microsoft.NET.Sdk.DefaultItems.props
diff --git a/...ld/Microsoft.NET.Sdk.DefaultItems.targets → ...ts/Microsoft.NET.Sdk.DefaultItems.targets b/...ld/Microsoft.NET.Sdk.DefaultItems.targets → ...ts/Microsoft.NET.Sdk.DefaultItems.targets
diff --git a/...asks/build/Microsoft.NET.Sdk.FSharp.props → ...ks/targets/Microsoft.NET.Sdk.FSharp.props b/...asks/build/Microsoft.NET.Sdk.FSharp.props → ...ks/targets/Microsoft.NET.Sdk.FSharp.props
diff --git a/...ks/build/Microsoft.NET.Sdk.FSharp.targets → .../targets/Microsoft.NET.Sdk.FSharp.targets b/...ks/build/Microsoft.NET.Sdk.FSharp.targets → .../targets/Microsoft.NET.Sdk.FSharp.targets
diff --git a/...build/Microsoft.NET.Sdk.VisualBasic.props → ...rgets/Microsoft.NET.Sdk.VisualBasic.props b/...build/Microsoft.NET.Sdk.VisualBasic.props → ...rgets/Microsoft.NET.Sdk.VisualBasic.props
diff --git a/...ild/Microsoft.NET.Sdk.VisualBasic.targets → ...ets/Microsoft.NET.Sdk.VisualBasic.targets b/...ild/Microsoft.NET.Sdk.VisualBasic.targets → ...ets/Microsoft.NET.Sdk.VisualBasic.targets
diff --git a/...Build.Tasks/build/Microsoft.NET.Sdk.props → ...ild.Tasks/targets/Microsoft.NET.Sdk.props b/...Build.Tasks/build/Microsoft.NET.Sdk.props → ...ild.Tasks/targets/Microsoft.NET.Sdk.props
diff --git a/...ild.Tasks/build/Microsoft.NET.Sdk.targets → ...d.Tasks/targets/Microsoft.NET.Sdk.targets b/...ild.Tasks/build/Microsoft.NET.Sdk.targets → ...d.Tasks/targets/Microsoft.NET.Sdk.targets
diff --git a/...osoft.NET.SupportedTargetFrameworks.props → ...osoft.NET.SupportedTargetFrameworks.props b/...osoft.NET.SupportedTargetFrameworks.props → ...osoft.NET.SupportedTargetFrameworks.props
diff --git a/...soft.NET.TargetFrameworkInference.targets → ...soft.NET.TargetFrameworkInference.targets b/...soft.NET.TargetFrameworkInference.targets → ...soft.NET.TargetFrameworkInference.targets
diff --git a/...osoft.PackageDependencyResolution.targets → ...osoft.PackageDependencyResolution.targets b/...osoft.PackageDependencyResolution.targets → ...osoft.PackageDependencyResolution.targets
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs
@@ -136,7 +136,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem
 
             var args = new List<string>();
 
-            string generateDepsProjectPath = Path.Combine(TestContext.Current.ToolsetUnderTest.SdksPath, "Microsoft.NET.Sdk", "build", "GenerateDeps", "GenerateDeps.proj");
+            string generateDepsProjectPath = Path.Combine(TestContext.Current.ToolsetUnderTest.SdksPath, "Microsoft.NET.Sdk", "targets", "GenerateDeps", "GenerateDeps.proj");
 
             args.Add($"/p:ProjectAssetsFile=\"{toolAssetsFilePath}\"");