From 728cea22f133976098f10bd4dee9b173f298b5b1 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 1 Sep 2017 17:17:33 -0700
Subject: [PATCH] Update signing.proj to use new output paths, and import
 common repo props

---
 build/MicroBuild.props |  3 ---
 build/Signing.proj     | 24 ++----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/build/MicroBuild.props b/build/MicroBuild.props
index 1cf77f45b..f55a5eea1 100644
--- a/build/MicroBuild.props
+++ b/build/MicroBuild.props
@@ -1,9 +1,6 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="DependencyVersions.props" />
 
   <PropertyGroup>
-    <RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
-    <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
     <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
 
     <MicroBuildPropsAndTargetsPath>$(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/</MicroBuildPropsAndTargetsPath>
diff --git a/build/Signing.proj b/build/Signing.proj
index e3bef0122..3982962d6 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\dir.props" />
   <Import Project="MicroBuild.props" />
   <Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />
-  <Import Project="InitRepo.props" />
-  <Import Project="$(BuildInfoProps)" />
 
   <!-- This will be overridden if we're building with MicroBuild. -->
   <Target Name="SignFiles">
@@ -13,10 +12,6 @@
   <Target Name="SetSigningProperties">
     <Error Condition="'$(Rid)' == ''" Text="Missing required property 'Rid'." />
     <PropertyGroup>
-      <BaseOutputDirectory Condition="'$(BaseOutputDirectory)' == ''">$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
-      <OutputDirectory Condition="'$(OutputDirectory)' == ''">$(BaseOutputDirectory)/stage2</OutputDirectory>
-      <CompilationDirectory Condition="'$(CompilationDirectory)' == ''">$(BaseOutputDirectory)/stage2compilation</CompilationDirectory>
-      <PackagesDirectory Condition="'$(PackagesDirectory)' == ''">$(BaseOutputDirectory)/packages</PackagesDirectory>
       <SdkResolverOutputDirectory>$(BaseOutputDirectory)/intermediate/MSBuildExtensionsLayout/MSBuildSdkResolver</SdkResolverOutputDirectory>
 
       <!-- The OutDir and IntermediateOutputPath properties are required by MicroBuild. MicroBuild only
@@ -62,12 +57,9 @@
   <Target Name="SignNuPkgContents" DependsOnTargets="GetSignNuPkgContentsFiles;SignFiles" />
 
   <Target Name="GetSignNuPkgContentsFiles">
-    <PropertyGroup>
-      <OutDir>$(RepoRoot)/src/Microsoft.DotNet.Cli.Utils</OutDir>
-    </PropertyGroup>
     <ItemGroup>
       <!-- NuPkg contents -->
-      <FilesToSign Include="$(OutDir)/bin/**/Microsoft.DotNet.Cli.Utils.dll">
+      <FilesToSign Include="$(BaseOutputDirectory)/bin/Microsoft.DotNet.Cli.Utils/**/Microsoft.DotNet.Cli.Utils.dll">
         <Authenticode>$(InternalCertificateId)</Authenticode>
       </FilesToSign>
     </ItemGroup>
@@ -76,9 +68,6 @@
   <Target Name="SignSdkResolverContents" DependsOnTargets="GetSignSdkResolverContentsFiles;SignFiles" />
 
   <Target Name="GetSignSdkResolverContentsFiles">
-    <PropertyGroup>
-      <OutDir>$(SdkResolverOutputDirectory)</OutDir>
-    </PropertyGroup>
     <ItemGroup>
       <FilesToSign Include="$(SdkResolverOutputDirectory)/Microsoft.DotNet.MSBuildSdkResolver.dll">
         <Authenticode>$(InternalCertificateId)</Authenticode>
@@ -89,9 +78,6 @@
   <Target Name="SignMsiAndCab" DependsOnTargets="GetSignMsiAndCabFiles;SignFiles" />
 
   <Target Name="GetSignMsiAndCabFiles">
-    <PropertyGroup>
-      <OutDir>$(PackagesDirectory)</OutDir>
-    </PropertyGroup>
     <ItemGroup>
       <FilesToSign Include="$(PackagesDirectory)/**/*.msi">
         <Authenticode>$(InternalCertificateId)</Authenticode>
@@ -105,9 +91,6 @@
   <Target Name="SignEngine" DependsOnTargets="GetSignEngineFiles;SignFiles" />
 
   <Target Name="GetSignEngineFiles">
-    <PropertyGroup>
-      <OutDir>$(PackagesDirectory)</OutDir>
-    </PropertyGroup>
     <ItemGroup>
       <FilesToSign Include="$(PackagesDirectory)/**/*engine.exe">
         <Authenticode>$(InternalCertificateId)</Authenticode>
@@ -118,9 +101,6 @@
   <Target Name="SignCliBundle" DependsOnTargets="GetSignCliBundleFiles;SignFiles" />
 
   <Target Name="GetSignCliBundleFiles">
-    <PropertyGroup>
-      <OutDir>$(PackagesDirectory)</OutDir>
-    </PropertyGroup>
     <ItemGroup>
       <FilesToSign Include="$(PackagesDirectory)/**/*.exe">
         <Authenticode>$(InternalCertificateId)</Authenticode>