From 1ce0e6ecdfa2a6b997e6d6377397a47a8d7df15a Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 27 Feb 2018 16:05:05 -0800
Subject: [PATCH] Add lzma repo task

---
 build/PackageArchive.targets |  5 +---
 build/dependencies.props     |  1 +
 build/tasks/CreateLzma.cs    | 44 ++++++++++++++++++++++++++++++++++++
 build/tasks/RepoTasks.csproj |  1 +
 build/tasks/RepoTasks.tasks  |  8 ++-----
 5 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 build/tasks/CreateLzma.cs

diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets
index ad5d9ce0e7..bd37ec64c5 100644
--- a/build/PackageArchive.targets
+++ b/build/PackageArchive.targets
@@ -7,9 +7,6 @@
   </PropertyGroup>
 
   <Target Name="BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo">
-    <Error Text="ArchiverPath must be specified" Condition=" '$(ArchiverPath)' == '' " />
-    <Error Text="Archiver not found at $(ArchiverPath)" Condition="!Exists('$(ArchiverPath)')" />
-
     <!-- Clear the directories -->
     <RemoveDir Directories="$(_WorkRoot)" />
 
@@ -49,6 +46,6 @@
       Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
 
     <!-- Create the archive -->
-    <Exec Command="$(ArchiverPath) -a $(FallbackOutputPath) $(FallbackStagingDir)" />
+    <RepoTasks.CreateLzma OutputPath="$(FallbackOutputPath)" Sources="$(FallbackStagingDir)" />
   </Target>
 </Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index 80c32f188f..1a6d436f58 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -2,6 +2,7 @@
   <!-- These package version may be overridden or updated by automation. -->
   <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
     <MicrosoftCSharpPackageVersion>4.5.0-preview2-26308-02</MicrosoftCSharpPackageVersion>
+    <MicrosoftDotNetArchivePackageVersion>0.2.0-beta-62606-02</MicrosoftDotNetArchivePackageVersion>
     <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-26308-02</MicrosoftDotNetPlatformAbstractionsPackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-26308-02</MicrosoftExtensionsDependencyModelPackageVersion>
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
diff --git a/build/tasks/CreateLzma.cs b/build/tasks/CreateLzma.cs
new file mode 100644
index 0000000000..88366fa886
--- /dev/null
+++ b/build/tasks/CreateLzma.cs
@@ -0,0 +1,44 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.DotNet.Archive;
+
+namespace RepoTasks
+{
+    public class CreateLzma : Task
+    {
+        [Required]
+        public string OutputPath { get; set; }
+
+        [Required]
+        public string[] Sources { get; set; }
+
+        public override bool Execute()
+        {
+            var progress = new ConsoleProgressReport();
+            using (var  archive = new IndexedArchive())
+            {
+                foreach (var source in Sources)
+                {
+                    if (Directory.Exists(source))
+                    {
+                        Log.LogMessage(MessageImportance.High, $"Adding directory: {source}");
+                        archive.AddDirectory(source, progress);
+                    }
+                    else
+                    {
+                        Log.LogMessage(MessageImportance.High, $"Adding file: {source}");
+                        archive.AddFile(source, Path.GetFileName(source));
+                    }
+                }
+
+                archive.Save(OutputPath, progress);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj
index 8c6e10cb3a..fbfd560a7c 100644
--- a/build/tasks/RepoTasks.csproj
+++ b/build/tasks/RepoTasks.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Archive" Version="$(MicrosoftDotNetArchivePackageVersion)" />
     <PackageReference Include="NuGet.Build.Tasks" Version="$(NuGetInMSBuildVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DevDependency_MicrosoftExtensionsDependencyModelPackageVersion)" PrivateAssets="All" />
     <PackageReference Include="WindowsAzure.Storage" Version="$(DevDependency_WindowsAzureStoragePackageVersion)" />
diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks
index 3bcd44e8f0..c91006135b 100644
--- a/build/tasks/RepoTasks.tasks
+++ b/build/tasks/RepoTasks.tasks
@@ -5,21 +5,17 @@
 
   <UsingTask TaskName="RepoTasks.AddArchiveReferences" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.AddMetapackageReferences" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.AddRSReferences" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.AnalyzeBuildGraph" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.ComposeNewStore" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.ConsolidateManifests" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.CopyPackagesToSplitFolders" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.CreateCommonManifest" AssemblyFile="$(_RepoTaskAssembly)" />
+  <UsingTask TaskName="RepoTasks.CreateLzma" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GenerateRestoreSourcesPropsFile" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.JoinItems" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.OrderBy" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.ProcessSharedFrameworkDeps" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.PublishToAzureBlob" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.ReplaceInFile" AssemblyFile="$(_RepoTaskAssembly)" />
+  <UsingTask TaskName="RepoTasks.ResolveSymbolsRecursivePath" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.TrimDeps" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.VerifyCoherentVersions" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.ResolveSymbolsRecursivePath" AssemblyFile="$(_RepoTaskAssembly)" />
 
   <!-- tools from dotnet-buildtools -->
   <PropertyGroup>