Remove unused tasks and targets (#15233)

src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceAndVersionProps.cs

@@ -1,156 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using NuGet.Versioning;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.DotNet.Build.Tasks
-{
-    public class WriteRestoreSourceAndVersionProps : Task
-    {
-        private static readonly Regex InvalidElementNameCharRegex = new Regex(@"(^|[^A-Za-z0-9])(?<FirstPartChar>.)");
-
-        public const string CreationTimePropertyName = "BuildOutputPropsCreationTime";
-
-        [Required]
-        public ITaskItem[] RestoreSources { get; set; }
-
-        [Required]
-        public ITaskItem[] NuGetPackages { get; set; }
-
-        [Required]
-        public string OutputPath { get; set; }
-
-        /// <summary>
-        /// Adds a second PropertyGroup to the output XML containing a property with the time of
-        /// creation in UTC DateTime Ticks. This can be used to track creation time in situations
-        /// where file metadata isn't reliable or preserved.
-        /// </summary>
-        public bool IncludeCreationTimeProperty { get; set; }
-
-        /// <summary>
-        /// Properties to add to the build output props, which may not exist as nupkgs.
-        /// FOr example, this is used to pass the version of the CLI toolset archives.
-        /// 
-        /// %(Identity): Package identity.
-        /// %(Version): Package version.
-        /// </summary>
-        public ITaskItem[] ExtraProperties { get; set; }
-
-        /// <summary>
-        /// Additional assets to be added to the build output props.
-        /// i.e. /bin/obj/x64/Release/blobs/Toolset/3.0.100
-        /// This parameter is the <pathToAsset>/<assetName> portion only, and the asset
-        /// must be in a <AdditionalAssetDir>/<assetVersion> folder.
-        /// </summary>
-        public string[] AdditionalAssetDirs { get; set; }
-
-        public override bool Execute()
-        {
-            PackageIdentity[] latestPackages = NuGetPackages
-                .Select(item =>
-                {
-                    using (var reader = new PackageArchiveReader(item.GetMetadata("FullPath")))
-                    {
-                        return reader.GetIdentity();
-                    }
-                })
-                .GroupBy(identity => identity.Id)
-                .Select(g => g.OrderBy(id => id.Version).Last())
-                .OrderBy(id => id.Id)
-                .ToArray();
-
-            var additionalAssets = (AdditionalAssetDirs ?? new string[0])
-                .Where(Directory.Exists)
-                .Where(dir => Directory.GetDirectories(dir).Count() > 0)
-                .Select(dir => new {
-                    Name = new DirectoryInfo(dir).Name + "Version",
-                    Version = new DirectoryInfo(Directory.EnumerateDirectories(dir).OrderBy(s => s).Last()).Name
-                }).ToArray();
-
-            Directory.CreateDirectory(Path.GetDirectoryName(OutputPath));
-
-            using (var outStream = File.Open(OutputPath, FileMode.Create))
-            using (var sw = new StreamWriter(outStream, new UTF8Encoding(false)))
-            {
-                sw.WriteLine(@"<?xml version=""1.0"" encoding=""utf-8""?>");
-                sw.WriteLine(@"<Project ToolsVersion=""14.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">");
-                sw.WriteLine(@"  <PropertyGroup>");
-                sw.WriteLine(@"    <DotNetRestoreSources>");
-                foreach (ITaskItem restoreSourceItem in RestoreSources)
-                {
-                    sw.WriteLine($"      {restoreSourceItem.ItemSpec};");
-                }
-                sw.WriteLine(@"    </DotNetRestoreSources>");
-                sw.WriteLine(@"  </PropertyGroup>");
-
-                sw.WriteLine(@"  <PropertyGroup>");
-                foreach (PackageIdentity packageIdentity in latestPackages)
-                {
-                    string propertyName = GetPropertyName(packageIdentity.Id);
-                    string shortPropertyName = GetShortPropertyName(packageIdentity.Id);
-
-                    sw.WriteLine($"    <{propertyName}>{packageIdentity.Version}</{propertyName}>");
-                    sw.WriteLine($"    <{shortPropertyName}>{packageIdentity.Version}</{shortPropertyName}>");
-                }
-                foreach (var extraProp in ExtraProperties ?? Enumerable.Empty<ITaskItem>())
-                {
-                    string propertyName = extraProp.GetMetadata("Identity");
-                    bool doNotOverwrite = false;
-                    string overwriteCondition = string.Empty;
-                    if (bool.TryParse(extraProp.GetMetadata("DoNotOverwrite"), out doNotOverwrite) && doNotOverwrite)
-                    {
-                        overwriteCondition = $" Condition=\"'$({propertyName})' == ''\"";
-                    }
-                    sw.WriteLine($"    <{propertyName}{overwriteCondition}>{extraProp.GetMetadata("Version")}</{propertyName}>");
-                }
-                foreach (var additionalAsset in additionalAssets)
-                {
-                    sw.WriteLine($"    <{additionalAsset.Name}>{additionalAsset.Version}</{additionalAsset.Name}>");
-                }
-                sw.WriteLine(@"  </PropertyGroup>");
-
-                if (IncludeCreationTimeProperty)
-                {
-                    sw.WriteLine(@"  <PropertyGroup>");
-                    sw.WriteLine($@"    <{CreationTimePropertyName}>{DateTime.UtcNow.Ticks}</{CreationTimePropertyName}>");
-                    sw.WriteLine(@"  </PropertyGroup>");
-                }
-
-                sw.WriteLine(@"</Project>");
-            }
-
-            return true;
-        }
-
-        public static string GetPropertyName(string id)
-        {
-            string formattedId = InvalidElementNameCharRegex.Replace(
-                id,
-                match => match.Groups?["FirstPartChar"].Value.ToUpperInvariant()
-                    ?? string.Empty);
-
-            return $"{formattedId}PackageVersion";
-        }
-
-        public static string GetShortPropertyName(string id)
-        {
-            string formattedId = InvalidElementNameCharRegex.Replace(
-                id,
-                match => match.Groups?["FirstPartChar"].Value.ToUpperInvariant()
-                    ?? string.Empty);
-
-            return $"{formattedId}Version";
-        }
-    }
-}

src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteRestoreSourceProps.cs

@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using System.IO;
-using System.Text;
-
-namespace Microsoft.DotNet.Build.Tasks
-{
-    public class WriteRestoreSourceProps : Task
-    {
-        [Required]
-        public ITaskItem[] RestoreSources { get; set; }
-
-        [Required]
-        public string OutputPath { get; set; }
-
-        public override bool Execute()
-        {
-            Directory.CreateDirectory(Path.GetDirectoryName(OutputPath));
-
-            using (var outStream = File.Open(OutputPath, FileMode.Create))
-            using (var sw = new StreamWriter(outStream, new UTF8Encoding(false)))
-            {
-                sw.WriteLine(@"<?xml version=""1.0"" encoding=""utf-8""?>");
-                sw.WriteLine(@"<Project ToolsVersion=""14.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">");
-                sw.WriteLine(@"  <PropertyGroup>");
-                sw.WriteLine(@"    <DotNetRestoreSources>");
-                foreach (ITaskItem restoreSourceItem in RestoreSources)
-                {
-                    sw.WriteLine($"      {restoreSourceItem.ItemSpec};");
-                }
-                sw.WriteLine(@"    </DotNetRestoreSources>");
-                sw.WriteLine(@"  </PropertyGroup>");
-                sw.WriteLine(@"</Project>");
-            }
-
-            return true;
-        }
-    }
-}

src/SourceBuild/content/repo-projects/Directory.Build.targets

@@ -15,8 +15,6 @@
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ValidateUsageAgainstBaseline" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteBuildOutputProps" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WritePackageUsageData" />
-  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteRestoreSourceProps" />
-  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteRestoreSourceAndVersionProps" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteUsageReports" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteVersionsFile" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ZipFileExtractToDirectory" />
@@ -54,7 +52,6 @@
   </PropertyGroup>
   <!-- Source override arguments -->
   <PropertyGroup Condition="'$(SourceOverrideRepoApiImplemented)' == 'true'">
-    <RepoApiArgs>$(RepoApiArgs) /p:DotNetRestoreSourcePropsPath=$(RestoreSourcePropsPath)</RepoApiArgs>
     <RepoApiArgs>$(RepoApiArgs) /p:DotNetBuildOffline=true</RepoApiArgs>
   </PropertyGroup>
   <!-- Output placement arguments -->
@@ -335,29 +332,6 @@
     <WriteLinesToFile File="$(RepoCompletedSemaphorePath)CreateBuildOutputProps.complete" Overwrite="true" />
   </Target>
 
-  <Target Name="CreateCombinedRestoreSourceAndVersionProps"
-          BeforeTargets="Build"
-          Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(RepoCompletedSemaphorePath)CreateCombinedRestoreSourceAndVersionProps.complete">
-    <ItemGroup>
-      <_DotNetRestoreSources Include="$(ExtraRestoreSourcePath)" Condition="'$(ExtraRestoreSourcePath)' != ''"/>
-      <_DotNetRestoreSources Include="$(SourceBuiltPackagesPath)" />
-      <_DotNetRestoreSources Include="$(ReferencePackagesDir)"/>
-      <_DotNetRestoreSources Include="$(PrebuiltPackagesPath)"/>
-      <_DotNetRestoreSources Include="$(PrebuiltSourceBuiltPackagesPath)"/>
-      <PreviouslySourceBuiltPackages Include="$(SourceBuiltPackagesPath)*.nupkg"
-                                      Exclude="$(SourceBuiltPackagesPath)*.symbols.nupkg" />
-      <_AdditionalAssetDirs Include="$(SourceBuiltToolsetDir)" Condition="Exists('$(SourceBuiltToolsetDir)')" />
-    </ItemGroup>
-    <WriteRestoreSourceAndVersionProps NuGetPackages="@(PreviouslySourceBuiltPackages)"
-                                       ExtraProperties="@(ExtraPackageVersionPropsPackageInfo)"
-                                       AdditionalAssetDirs="@(_AdditionalAssetDirs)"
-                                       RestoreSources="@(_DotNetRestoreSources)"
-                                       OutputPath="$(RestoreSourcePropsPath)" />
-
-    <WriteLinesToFile File="$(RepoCompletedSemaphorePath)CreateCombinedRestoreSourceAndVersionProps.complete" Overwrite="true" />
-  </Target>
-
   <Target Name="Build"
           DependsOnTargets="BuildRepoReferences"
           Inputs="$(MSBuildProjectFullPath)"