From 7b62dd1267fb8b9c2529bddfa4ef32593fd026c0 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 22 Feb 2017 10:52:50 -0800
Subject: [PATCH] Address some of the PR comments

---
 build/BuildOutputs.props          |  1 -
 build/compile/LzmaArchive.targets | 29 ++++++++++++++---------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/build/BuildOutputs.props b/build/BuildOutputs.props
index a5bc0d821..6410dcd89 100644
--- a/build/BuildOutputs.props
+++ b/build/BuildOutputs.props
@@ -3,7 +3,6 @@
     <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
     <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibExtension)</DotnetHostFxrBaseName>
     <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibExtension)</HostPolicyBaseName>
-    <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
     <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
   </PropertyGroup>
 </Project>
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index 784721ad2..7b51073ee 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+      <UploadNuGetPackagesArchiveToAzure>false</UploadNuGetPackagesArchiveToAzure>
+      <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
+      <NuGetConfigContent>
+        &lt;configuration&gt;
+        &lt;packageSources&gt;
+        &lt;add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /&gt;
+        &lt;/packageSources&gt;
+        &lt;/configuration&gt;
+      </NuGetConfigContent>
+      <LZMANuGetConfigFilePath>$(NuGetPackagesArchiveProject)/Nuget.config</LZMANuGetConfigFilePath>
+    </PropertyGroup>
+
     <Target Name="GetNuGetPackagesArchive"
             DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs;
                               DownloadNuGetPackagesArchive;
@@ -44,10 +58,6 @@
                     ContinueOnError="WarnAndContinue" />
     </Target>
 
-    <PropertyGroup>
-      <UploadNuGetPackagesArchiveToAzure>false</UploadNuGetPackagesArchiveToAzure>
-    </PropertyGroup>
-
     <Target Name="GenerateNuGetPackagesArchive"
             DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs"
             Inputs="$(IntermediateArchive)"
@@ -67,17 +77,6 @@
         <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" />
       </ItemGroup>
 
-      <PropertyGroup>
-        <NuGetConfigContent>
-          &lt;configuration&gt;
-            &lt;packageSources&gt;
-              &lt;add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /&gt;
-            &lt;/packageSources&gt;
-          &lt;/configuration&gt;
-        </NuGetConfigContent>
-        <LZMANuGetConfigFilePath>$(NuGetPackagesArchiveProject)/Nuget.config</LZMANuGetConfigFilePath>
-      </PropertyGroup>
-
       <Delete Files="@(FilesToClean)" />
       <RemoveDir Directories="@(NuGetPackagesArchiveDirectory)" />
       <MakeDir Directories="@(NuGetPackagesArchiveDirectory)"/>