fixup! Refactor LZMA generation to support Docker and Antares usage

Author: Nate McMaster

build/PackageArchive.targets

@@ -10,8 +10,7 @@
         DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
         DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
         OutputPath=$(ArtifactsDir)lzma\;
-        _BuildToolsAssembly=$(_BuildToolsAssembly);
-        RestoreForce=true
+        _BuildToolsAssembly=$(_BuildToolsAssembly)
       </ArchiveBuildProps>
     </PropertyGroup>
 
@@ -26,6 +25,7 @@
     <MSBuild Projects="@(ArchiveProjects)"
       Targets="Build"
       BuildInParallel="false"
+      StopOnFirstFailure="true"
       Properties="$(ArchiveBuildProps)" />
   </Target>
 </Project>

src/PackageArchive/Archive.targets

@@ -1,5 +1,4 @@
 <Project>
-
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <!-- Default items -->
@@ -15,27 +14,42 @@
     <Delete Files="$(TargetPath)" />
   </Target>
 
-  <Target Name="CollectInputs">
+  <PropertyGroup>
+    <CollectInputsDependsOn Condition=" '$(IncludeNupkgFiles)' == 'false' ">$(CollectInputsDependsOn);CollectNupkgExclusions</CollectInputsDependsOn>
+    <CollectInputsDependsOn Condition=" '$(IncludeXmlDocs)' == 'false' ">$(CollectInputsDependsOn);CollectXmlExclusions</CollectInputsDependsOn>
+    <CollectInputsDependsOn Condition=" '$(IsIncremental)' == 'true' ">$(CollectInputsDependsOn);CollectBaselineExclusions</CollectInputsDependsOn>
+  </PropertyGroup>
 
+  <Target Name="CollectNupkgExclusions">
     <ItemGroup>
-      <ArchiveItemNupkg Include="$(RestorePackagesPath)**\*.nupkg" />
-      <ArchiveItemXml Include="$(RestorePackagesPath)**\*.xml" />
+      <ArchiveExclusions Include="$(RestorePackagesPath)**\*.nupkg" />
     </ItemGroup>
+  </Target>
+
+  <Target Name="CollectXmlExclusions">
+    <ItemGroup>
+      <_ArchiveItemXml Include="$(RestorePackagesPath)**\*.xml" />
+    </ItemGroup>
+
+    <Message Text="Found @(_ArchiveItemXml->Count()) xml files that might be docxml" />
+
+    <RepoTasks.GetDocXmlFiles Files="@(_ArchiveItemXml)">
+      <Output TaskParameter="XmlDocFiles" ItemName="ArchiveExclusions" />
+    </RepoTasks.GetDocXmlFiles>
+  </Target>
 
+  <Target Name="CollectBaselineExclusions">
     <ReadLinesFromFile File="%(ArchiveBaseline.Identity)" Condition="'%(ArchiveBaseline.Identity)' != ''">
       <Output TaskParameter="Lines" ItemName="PreviousArchiveItem" />
     </ReadLinesFromFile>
 
-    <Message Text="Found @(ArchiveItemXml->Count()) xml files that might be docxml" />
-
-    <RepoTasks.GetDocXmlFiles Files="@(ArchiveItemXml)">
-      <Output TaskParameter="XmlDocFiles" ItemName="XmlDocFiles" />
-    </RepoTasks.GetDocXmlFiles>
+    <ItemGroup>
+      <ArchiveExclusions Include="$(RestorePackagesPath)%(PreviousArchiveItem.Identity)" Condition=" '%(PreviousArchiveItem.Identity)' != '' " />
+    </ItemGroup>
+  </Target>
 
+  <Target Name="CollectInputs" DependsOnTargets="$(CollectInputsDependsOn)">
     <ItemGroup>
-      <ArchiveExclusions Include="$(RestorePackagesPath)%(PreviousArchiveItem.Identity)" Condition=" '%(PreviousArchiveItem.Identity)' != '' AND '$(IsIncremental)' == 'true' " />
-      <ArchiveExclusions Include="@(ArchiveItemNupkg)" Condition=" '$(IncludeNupkgFiles)' == 'false' " />
-      <ArchiveExclusions Include="@(XmlDocFiles)" Condition=" '$(IncludeXmlDocs)' == 'false' " />
       <ArchiveItem Include="$(RestorePackagesPath)**\*.*" Exclude="@(ArchiveExclusions)" />
     </ItemGroup>
 
@@ -73,7 +87,7 @@
     </PropertyGroup>
 
     <Error Text="The ArchiveBaseline for previous release (v$(PreviousStableVersion)) could not be found. This is required to build the incremental archives. See instructions in $(MSBuildThisFileDirectory)ZipManifestGenerator\README.md"
-           Condition="! Exists('$(MSBuildThisFileDirectory)ArchiveBaseline.$(PreviousStableVersion).txt')" />
+           Condition="! Exists('$(MSBuildProjectDirectory)\ArchiveBaseline.$(PreviousStableVersion).txt')" />
   </Target>
 
   <Target Name="Build"