From 9a6ed554f2c37b69517664e6ec13cc9ad5a40c4d Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Tue, 30 Oct 2018 14:12:02 -0700
Subject: [PATCH] Move targets files under eng directory.

Commit migrated from https://github.com/dotnet/corefx/commit/fd8e341b2542d762c175ba32d4be416a6f62dd43
---
 {tools-local => eng}/DefaultGenApiDocIds.txt  |  0
 {tools-local => eng}/LicenseHeader.txt        |  0
 {src/libraries => eng}/Packaging.props        |  2 +-
 {src/libraries => eng}/buildvertical.targets  |  2 +-
 .../configurations}/archgroups.props          |  0
 .../configurations}/configurationgroups.props |  0
 .../configurations}/osgroups.props            |  0
 .../configurations}/properties.props          |  0
 .../configurations}/targetgroups.props        |  0
 {src/libraries => eng}/dependencies.props     |  2 +-
 {src/libraries => eng}/illink.targets         |  0
 .../referenceFromRuntime.targets              |  0
 src/libraries/dir.traversal.targets           |  2 +-
 src/libraries/pkg/test/testPackages.proj      | 20 +++++++++----------
 14 files changed, 14 insertions(+), 14 deletions(-)
 rename {tools-local => eng}/DefaultGenApiDocIds.txt (100%)
 rename {tools-local => eng}/LicenseHeader.txt (100%)
 rename {src/libraries => eng}/Packaging.props (95%)
 rename {src/libraries => eng}/buildvertical.targets (99%)
 rename {tools-local => eng/configurations}/archgroups.props (100%)
 rename {tools-local => eng/configurations}/configurationgroups.props (100%)
 rename {tools-local => eng/configurations}/osgroups.props (100%)
 rename {tools-local => eng/configurations}/properties.props (100%)
 rename {tools-local => eng/configurations}/targetgroups.props (100%)
 rename {src/libraries => eng}/dependencies.props (99%)
 rename {src/libraries => eng}/illink.targets (100%)
 rename {src/libraries => eng}/referenceFromRuntime.targets (100%)

diff --git a/tools-local/DefaultGenApiDocIds.txt b/eng/DefaultGenApiDocIds.txt
similarity index 100%
rename from tools-local/DefaultGenApiDocIds.txt
rename to eng/DefaultGenApiDocIds.txt
diff --git a/tools-local/LicenseHeader.txt b/eng/LicenseHeader.txt
similarity index 100%
rename from tools-local/LicenseHeader.txt
rename to eng/LicenseHeader.txt
diff --git a/src/libraries/Packaging.props b/eng/Packaging.props
similarity index 95%
rename from src/libraries/Packaging.props
rename to eng/Packaging.props
index 84a29ad97e6..b5977a41f49 100644
--- a/src/libraries/Packaging.props
+++ b/eng/Packaging.props
@@ -31,7 +31,7 @@
     <SkipGenerationCheck>true</SkipGenerationCheck>
   </PropertyGroup>
 
-  <Import Condition="Exists('pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="pkg/baseline/baseline.props" />
+  <Import Condition="Exists('../pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/baseline/baseline.props" />
 
   <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
     <!--
diff --git a/src/libraries/buildvertical.targets b/eng/buildvertical.targets
similarity index 99%
rename from src/libraries/buildvertical.targets
rename to eng/buildvertical.targets
index 2eac3f88d23..2c8062e7f90 100644
--- a/src/libraries/buildvertical.targets
+++ b/eng/buildvertical.targets
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <!-- Import configuration data model -->
-  <Import Project="$(ProjectDir)tools-local/properties.props" />
+  <Import Project="$(RepositoryEngineeringDir)configurations/properties.props" />
 
   <!-- Runs during traversal when BuildAllConfigurations is set to expand each project
        to a seperate instance for each of its BuildConfigurations -->
diff --git a/tools-local/archgroups.props b/eng/configurations/archgroups.props
similarity index 100%
rename from tools-local/archgroups.props
rename to eng/configurations/archgroups.props
diff --git a/tools-local/configurationgroups.props b/eng/configurations/configurationgroups.props
similarity index 100%
rename from tools-local/configurationgroups.props
rename to eng/configurations/configurationgroups.props
diff --git a/tools-local/osgroups.props b/eng/configurations/osgroups.props
similarity index 100%
rename from tools-local/osgroups.props
rename to eng/configurations/osgroups.props
diff --git a/tools-local/properties.props b/eng/configurations/properties.props
similarity index 100%
rename from tools-local/properties.props
rename to eng/configurations/properties.props
diff --git a/tools-local/targetgroups.props b/eng/configurations/targetgroups.props
similarity index 100%
rename from tools-local/targetgroups.props
rename to eng/configurations/targetgroups.props
diff --git a/src/libraries/dependencies.props b/eng/dependencies.props
similarity index 99%
rename from src/libraries/dependencies.props
rename to eng/dependencies.props
index 17e0ffee727..65bb0d56aa3 100644
--- a/src/libraries/dependencies.props
+++ b/eng/dependencies.props
@@ -152,7 +152,7 @@
     </XmlUpdateStep>
     <UpdateStep Include="CoreCLR">
       <UpdaterType>MSBuildSdk</UpdaterType>
-      <Path>$(MSBuildThisFileDirectory)global.json</Path>
+      <Path>$(MSBuildThisFileDirectory)../global.json</Path>
       <PackageId>Microsoft.NET.Sdk.IL</PackageId>
       <MSBuildSdkName>Microsoft.NET.Sdk.IL</MSBuildSdkName>
     </UpdateStep>
diff --git a/src/libraries/illink.targets b/eng/illink.targets
similarity index 100%
rename from src/libraries/illink.targets
rename to eng/illink.targets
diff --git a/src/libraries/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets
similarity index 100%
rename from src/libraries/referenceFromRuntime.targets
rename to eng/referenceFromRuntime.targets
diff --git a/src/libraries/dir.traversal.targets b/src/libraries/dir.traversal.targets
index fa775d9193b..9acd7295a49 100644
--- a/src/libraries/dir.traversal.targets
+++ b/src/libraries/dir.traversal.targets
@@ -27,7 +27,7 @@
     <Message Text="%(PackageIds.Identity)" Importance="High" />
   </Target>
 
-  <Import Project="buildvertical.targets" Condition="'$(ImportedBuildVerticalTargets)' != 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)buildvertical.targets" Condition="'$(ImportedBuildVerticalTargets)' != 'true'" />
 
   <Target Name="BuildAllProjects" DependsOnTargets="FilterProjects">
     <PropertyGroup>
diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj
index 516245f262b..2f892df5ab8 100644
--- a/src/libraries/pkg/test/testPackages.proj
+++ b/src/libraries/pkg/test/testPackages.proj
@@ -9,11 +9,11 @@
 
     <PackageReports Condition="'@(TestPackages)' == ''" Include="$(PackageReportDir)*.json" Exclude="@(ExcludePackages->'$(PackageReportDir)%(Identity).json')"/>
     <PackageReports Condition="'@(TestPackages)' != ''" Include="@(TestPackages->'$(PackageReportDir)%(Identity).json')" />
-    
+
     <!-- support override via commandline -->
     <RuntimesToInclude Condition="'$(RuntimesToInclude)' != ''" Include="$(RuntimesToInclude)" />
     <TargetFrameworksToInclude Condition="'$(TargetFrameworksToInclude)' != ''" Include="$(TargetFrameworksToInclude)" />
-    
+
     <RestoreSource Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
 
     <!-- needed for SQLClient's SNI packages -->
@@ -43,7 +43,7 @@
     <TestProjectDir>$(TestDir)projects/</TestProjectDir>
     <TestPackageDir>$(BinDir)testPackages</TestPackageDir>
     <TestDotNetPath>$(TestToolsDir)/dotnet</TestDotNetPath>
-    
+
     <ProjectTemplate>project.csproj.template</ProjectTemplate>
 
     <TestRestoreCommand>$(TestDotNetPath)</TestRestoreCommand>
@@ -65,10 +65,10 @@
     <TestSupportFiles Include="$(SourceDir)shims\netfxreference.props">
       <DestinationFolder>$(TestToolsDir)</DestinationFolder>
     </TestSupportFiles>
-    <TestSupportFiles Include="$(ProjectDir)dependencies.props">
+    <TestSupportFiles Include="$(RepositoryEngineeringDir)dependencies.props">
       <DestinationFolder>$(TestToolsDir)</DestinationFolder>
     </TestSupportFiles>
-    <TestSupportFiles Include="$(ProjectDir)eng/versions.props">
+    <TestSupportFiles Include="$(RepositoryEngineeringDir)versions.props">
       <DestinationFolder>$(TestToolsDir)eng/</DestinationFolder>
     </TestSupportFiles>
     <TestSupportFiles Include="$(ToolsDir)Packaging.common.targets">
@@ -93,7 +93,7 @@
       <DestinationFolder>$(TestDir)</DestinationFolder>
     </TestSupportFiles>
   </ItemGroup>
-  
+
   <ItemGroup>
     <CliEnvironment Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
     <CliEnvironment Include="DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" />
@@ -106,12 +106,12 @@
     <MakeDir Directories="%(TestSupportFiles.DestinationFolder)" />
     <Copy SourceFiles="@(TestSupportFiles)" DestinationFolder="%(TestSupportFiles.DestinationFolder)" />
   </Target>
-  
+
   <Target Name="GetSupportedPackages">
     <GetSupportedPackagesFromPackageReports PackageReports="@(PackageReports)">
       <Output TaskParameter="SupportedPackages" ItemName="SupportedPackage"/>
     </GetSupportedPackagesFromPackageReports>
-    
+
     <ItemGroup>
       <SupportedPackage>
         <ProjectDir>$(TestProjectDir)%(Identity)/%(TargetFrameworkShort)/</ProjectDir>
@@ -137,7 +137,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="UpdateRuntimeIdentifiers" 
+  <Target Name="UpdateRuntimeIdentifiers"
           AfterTargets="GetSupportedPackages"
           Inputs="%(SupportedPackage.Identity);%(SupportedPackage.TargetFrameworkShort)"
           Outputs="unused">
@@ -181,7 +181,7 @@
     <Message Importance="High" Text="*** Restoring ***" />
     <Exec Command="$(TestRestoreCommand) &quot;$(TestProject)&quot;" EnvironmentVariables="@(CliEnvironment)" StandardOutputImportance="High" />
   </Target>
-  
+
   <Target Name="BuildProjects"
           DependsOnTargets="RestoreProjects">
     <Message Importance="High" Text="*** Testing ***" />