From d60a852260631c891ed45ac16903edd5e2b5e773 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Mon, 21 Oct 2019 11:18:17 -0700
Subject: [PATCH] Move signing dir under eng/. Remove usages of ProjectDir.

---
 Directory.Build.props                             |  4 ++--
 {signing => eng/signing}/Directory.Build.props    |  0
 {signing => eng/signing}/Directory.Build.targets  |  0
 {signing => eng/signing}/SignBinaries.proj        |  0
 {signing => eng/signing}/SignBurnBundleFiles.proj |  0
 {signing => eng/signing}/SignBurnEngineFiles.proj |  0
 {signing => eng/signing}/SignFinalPackages.proj   |  0
 {signing => eng/signing}/SignMsiFiles.proj        |  0
 publish/prepare-artifacts.proj                    |  2 +-
 src/pkg/Directory.Build.props                     |  4 ++--
 src/pkg/packaging/Directory.Build.props           |  2 +-
 src/pkg/packaging/deb/package.targets             |  2 +-
 src/pkg/packaging/installers.proj                 | 12 ++++++------
 src/pkg/packaging/pack-managed.proj               |  2 +-
 src/pkg/packaging/rpm/package.targets             |  2 +-
 src/pkg/packaging/vs-insertion-packages.proj      |  2 +-
 src/pkg/projects/Directory.Build.props            |  7 +------
 src/test/Directory.Build.props                    |  2 +-
 18 files changed, 18 insertions(+), 23 deletions(-)
 rename {signing => eng/signing}/Directory.Build.props (100%)
 rename {signing => eng/signing}/Directory.Build.targets (100%)
 rename {signing => eng/signing}/SignBinaries.proj (100%)
 rename {signing => eng/signing}/SignBurnBundleFiles.proj (100%)
 rename {signing => eng/signing}/SignBurnEngineFiles.proj (100%)
 rename {signing => eng/signing}/SignFinalPackages.proj (100%)
 rename {signing => eng/signing}/SignMsiFiles.proj (100%)

diff --git a/Directory.Build.props b/Directory.Build.props
index 633b1d3239..c9b1d07017 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -45,9 +45,9 @@
 
   <PropertyGroup>
     <SetupRoot>$(RepoRoot)</SetupRoot>
-    <!-- ProjectDir needs to be set for build-tools and legacy usages. New usages should use SetupRoot. -->
-    <ProjectDir>$(SetupRoot)</ProjectDir>
     <SourceDir>$(SetupRoot)src/</SourceDir>
+    <SigningToolsDir>$(SetupRoot)eng\signing\</SigningToolsDir>
+    <LicenseFile>$(RepoRoot)LICENSE</LicenseFile>
 
     <!-- Output directories -->
     <BinDir Condition="'$(BinDir)'==''">$(ArtifactsBinDir)</BinDir>
diff --git a/signing/Directory.Build.props b/eng/signing/Directory.Build.props
similarity index 100%
rename from signing/Directory.Build.props
rename to eng/signing/Directory.Build.props
diff --git a/signing/Directory.Build.targets b/eng/signing/Directory.Build.targets
similarity index 100%
rename from signing/Directory.Build.targets
rename to eng/signing/Directory.Build.targets
diff --git a/signing/SignBinaries.proj b/eng/signing/SignBinaries.proj
similarity index 100%
rename from signing/SignBinaries.proj
rename to eng/signing/SignBinaries.proj
diff --git a/signing/SignBurnBundleFiles.proj b/eng/signing/SignBurnBundleFiles.proj
similarity index 100%
rename from signing/SignBurnBundleFiles.proj
rename to eng/signing/SignBurnBundleFiles.proj
diff --git a/signing/SignBurnEngineFiles.proj b/eng/signing/SignBurnEngineFiles.proj
similarity index 100%
rename from signing/SignBurnEngineFiles.proj
rename to eng/signing/SignBurnEngineFiles.proj
diff --git a/signing/SignFinalPackages.proj b/eng/signing/SignFinalPackages.proj
similarity index 100%
rename from signing/SignFinalPackages.proj
rename to eng/signing/SignFinalPackages.proj
diff --git a/signing/SignMsiFiles.proj b/eng/signing/SignMsiFiles.proj
similarity index 100%
rename from signing/SignMsiFiles.proj
rename to eng/signing/SignMsiFiles.proj
diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj
index 219866c404..69e4aa8d9d 100644
--- a/publish/prepare-artifacts.proj
+++ b/publish/prepare-artifacts.proj
@@ -5,7 +5,7 @@
           Condition="'$(SkipSigning)' != 'true' and '$(SignType)' != 'public'">
     <Message Importance="High" Text="Signing final packages" />
     <MSBuild
-      Projects="$(SetupRoot)signing\SignFinalPackages.proj"
+      Projects="$(SigningToolsDir)\SignFinalPackages.proj"
       Targets="Build"
       Properties="DownloadDirectory=$(DownloadDirectory)" />
   </Target>
diff --git a/src/pkg/Directory.Build.props b/src/pkg/Directory.Build.props
index 909afc6a65..ae8dfb2c07 100644
--- a/src/pkg/Directory.Build.props
+++ b/src/pkg/Directory.Build.props
@@ -10,7 +10,7 @@
     <PackageLicenseFile>$(RepoRoot)LICENSE</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
     <LicenseUrl>https://github.com/dotnet/core-setup/blob/master/LICENSE</LicenseUrl>
-    <PackageDescriptionFile>$(ProjectDir)src/pkg/projects/descriptions.json</PackageDescriptionFile>
+    <PackageDescriptionFile>$(SetupRoot)src/pkg/projects/descriptions.json</PackageDescriptionFile>
     <!-- This link should be updated for each release milestone, currently this points to 1.0.0 -->
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799417</ReleaseNotes>
     <ProjectUrl>https://dot.net</ProjectUrl>
@@ -34,7 +34,7 @@
     -->
     <DebToolBinDir>$(BinDir)dotnet-deb-tool\</DebToolBinDir>
     <DebtoolAssemblyFile>$(DebToolBinDir)$(Configuration)\netcoreapp3.0\dotnet-deb-tool.dll</DebtoolAssemblyFile>
-    <DotnetDebToolSourceDir>$(ProjectDir)tools-local/setuptools/dotnet-deb-tool/</DotnetDebToolSourceDir>
+    <DotnetDebToolSourceDir>$(SetupRoot)tools-local/setuptools/dotnet-deb-tool/</DotnetDebToolSourceDir>
 
     <IsDebianBasedDistro
       Condition="
diff --git a/src/pkg/packaging/Directory.Build.props b/src/pkg/packaging/Directory.Build.props
index 037849420d..f32421b250 100644
--- a/src/pkg/packaging/Directory.Build.props
+++ b/src/pkg/packaging/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <PackagingRoot>$(ProjectDir)src/pkg/packaging/</PackagingRoot>
+    <PackagingRoot>$(SetupRoot)src/pkg/packaging/</PackagingRoot>
 
     <!-- The runtime package is distro-independent. (Runtime-deps packages vary per distro.) -->
     <BuildRuntimeDebs>$(BuildDistroIndependentInstallers)</BuildRuntimeDebs>
diff --git a/src/pkg/packaging/deb/package.targets b/src/pkg/packaging/deb/package.targets
index 71ebc0a511..1c6b6c3ea6 100644
--- a/src/pkg/packaging/deb/package.targets
+++ b/src/pkg/packaging/deb/package.targets
@@ -32,7 +32,7 @@
       <DebPackageVersion>$(HostPackageVersion)</DebPackageVersion>
       <InputRoot>$(SharedHostPublishRoot)</InputRoot>
       <DebFile>$(SharedHostInstallerFile)</DebFile>
-      <ManPagesDir>$(ProjectDir)Documentation/manpages</ManPagesDir>
+      <ManPagesDir>$(SetupRoot)Documentation/manpages</ManPagesDir>
       <ConfigJsonName>dotnet-sharedhost-debian_config.json</ConfigJsonName>
       <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
       <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
diff --git a/src/pkg/packaging/installers.proj b/src/pkg/packaging/installers.proj
index a8b7a2b439..a13306f11e 100644
--- a/src/pkg/packaging/installers.proj
+++ b/src/pkg/packaging/installers.proj
@@ -51,19 +51,19 @@
   </Target>
 
   <Target Name="EnsureSignedBinaries" Condition="'$(OSGroup)' == 'Windows_NT'" >
-    <MSBuild Projects="$(SetupRoot)signing\SignBinaries.proj" Targets="Build" />
+    <MSBuild Projects="$(SigningToolsDir)\SignBinaries.proj" Targets="Build" />
   </Target>
 
   <Target Name="EnsureSignedMsiFiles" Condition="'$(OSGroup)' == 'Windows_NT'" >
-    <MSBuild Projects="$(SetupRoot)signing\SignMsiFiles.proj" Targets="Build" />
+    <MSBuild Projects="$(SigningToolsDir)\SignMsiFiles.proj" Targets="Build" />
   </Target>
 
   <Target Name="EnsureSignedBurnEngineFiles" Condition="'$(OSGroup)' == 'Windows_NT'" >
-    <MSBuild Projects="$(SetupRoot)signing\SignBurnEngineFiles.proj" Targets="Build" />
+    <MSBuild Projects="$(SigningToolsDir)\SignBurnEngineFiles.proj" Targets="Build" />
   </Target>
 
   <Target Name="EnsureSignedBurnBundleFiles" Condition="'$(OSGroup)' == 'Windows_NT'" >
-    <MSBuild Projects="$(SetupRoot)signing\SignBurnBundleFiles.proj" Targets="Build" />
+    <MSBuild Projects="$(SigningToolsDir)\SignBurnBundleFiles.proj" Targets="Build" />
   </Target>
 
   <Target Name="GenerateProjectInstallers" Condition="'$(GenerateProjectInstallers)' == 'true'">
@@ -96,7 +96,7 @@
           DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
           Condition="'$(TargetsUnix)' == 'true'"/>
 
-    <Copy SourceFiles="$(ProjectDir)resources/LICENSE-MSFT.txt"
+    <Copy SourceFiles="$(SetupRoot)resources/LICENSE-MSFT.txt"
           DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
           Condition="'$(TargetsUnix)' != 'true'"/>
 
@@ -157,7 +157,7 @@
 
   <Target Name="GenerateVersionBadge">
     <PropertyGroup>
-      <templateSvg>$(ProjectDir)resources/images/version_badge.svg</templateSvg>
+      <templateSvg>$(SetupRoot)resources/images/version_badge.svg</templateSvg>
     </PropertyGroup>
 
     <MakeDir  Condition="!Exists('$(BaseOutputRootPath)')" Directories="$(BaseOutputRootPath)" />
diff --git a/src/pkg/packaging/pack-managed.proj b/src/pkg/packaging/pack-managed.proj
index 3b19cdf603..08057d2c31 100644
--- a/src/pkg/packaging/pack-managed.proj
+++ b/src/pkg/packaging/pack-managed.proj
@@ -12,7 +12,7 @@
     packages are used in other parts of the build, so this can't wait for Arcade's Pack stage.
   -->
   <Target Name="Build">
-    <MSBuild Projects="$(SetupRoot)signing\SignBinaries.proj" Targets="Build" />
+    <MSBuild Projects="$(SigningToolsDir)\SignBinaries.proj" Targets="Build" />
 
     <ItemGroup>
       <ManagedProject Include="$(SetupRoot)src\managed\**\*.csproj" />
diff --git a/src/pkg/packaging/rpm/package.targets b/src/pkg/packaging/rpm/package.targets
index c560e149f2..50a893144f 100644
--- a/src/pkg/packaging/rpm/package.targets
+++ b/src/pkg/packaging/rpm/package.targets
@@ -27,7 +27,7 @@
       <RpmPackageVersion>$(HostPackageVersion)</RpmPackageVersion>
       <InputRoot>$(SharedHostPublishRoot)</InputRoot>
       <RpmFile>$(SharedHostInstallerFile)</RpmFile>
-      <ManPagesDir>$(ProjectDir)Documentation/manpages</ManPagesDir>
+      <ManPagesDir>$(SetupRoot)Documentation/manpages</ManPagesDir>
       <ConfigJsonName>dotnet-sharedhost-rpm_config.json</ConfigJsonName>
       <ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
       <RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>
diff --git a/src/pkg/packaging/vs-insertion-packages.proj b/src/pkg/packaging/vs-insertion-packages.proj
index 657e56002a..f36b24f9d1 100644
--- a/src/pkg/packaging/vs-insertion-packages.proj
+++ b/src/pkg/packaging/vs-insertion-packages.proj
@@ -12,7 +12,7 @@
     insertion NuGet packages on each project. Bundle installers aren't inserted, so this is enough.
   -->
   <Target Name="Build" DependsOnTargets="GetSharedFrameworkProjects">
-    <MSBuild Projects="$(SetupRoot)signing\SignMsiFiles.proj" Targets="Build" />
+    <MSBuild Projects="$(SigningToolsDir)\SignMsiFiles.proj" Targets="Build" />
     <MSBuild Projects="@(PkgprojProjectToBuild);@(SharedFrameworkProject)" Targets="GenerateVSInsertionNupkg" />
   </Target>
 
diff --git a/src/pkg/projects/Directory.Build.props b/src/pkg/projects/Directory.Build.props
index d67f23be70..3674c1506c 100644
--- a/src/pkg/projects/Directory.Build.props
+++ b/src/pkg/projects/Directory.Build.props
@@ -1,11 +1,6 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
 
-  <PropertyGroup>
-    <SigningToolsDir>$(SetupRoot)signing\</SigningToolsDir>
-    <LicenseFile>$(RepoRoot)LICENSE</LicenseFile>
-  </PropertyGroup>
-
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" />
 
   <PropertyGroup>
@@ -63,7 +58,7 @@
     <!-- Pkgproj requires its depproj crossgen outputs to be signed.-->
     <OrderProjectReference
       Condition="'$(MSBuildProjectExtension)' == '.pkgproj'"
-      Include="$(SetupRoot)signing\SignBinaries.proj" />
+      Include="$(SigningToolsDir)\SignBinaries.proj" />
   </ItemGroup>
 
   <!-- In *.builds projects, the current phase's name is the same as the project name. -->
diff --git a/src/test/Directory.Build.props b/src/test/Directory.Build.props
index b3eaee01f0..efa5806849 100644
--- a/src/test/Directory.Build.props
+++ b/src/test/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <TestDir>$(ProjectDir)src\test\</TestDir>
+    <TestDir>$(SetupRoot)src\test\</TestDir>
     <TestAssetsDir>$(TestDir)Assets\</TestAssetsDir>
     <TestStabilizedLegacyPackagesDir>$(ObjDir)TestStabilizedPackages\</TestStabilizedLegacyPackagesDir>
     <TestRestorePackagesPath>$(ObjDir)TestPackageCache\</TestRestorePackagesPath>