From 5d53df55c45d1ad9b7e490ef3169bb5a3586550c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 20 Dec 2017 15:42:26 -0800 Subject: [PATCH] Update analyze build graph to ignore unknown artifact types --- build/RepositoryBuild.targets | 2 +- build/tasks/Utilities/ArtifactInfo.cs | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index f13bb407af..957d9630d9 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -48,7 +48,7 @@ $(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild) $(RepositoryBuildArguments) /noconsolelogger '/l:RepoTasks.FlowLogger,$(MSBuildThisFileDirectory)tasks\bin\publish\RepoTasks.dll;Summary;FlowId=$(RepositoryToBuild)' - $(_RepositoryBuildTargets) $(RepositoryBuildArguments) + /t:CleanArtifacts $(_RepositoryBuildTargets) $(RepositoryBuildArguments) $(BuildRepositoryRoot)artifacts $(RepositoryArtifactsRoot)\build\ $(RepositoryArtifactsRoot)\msbuild\ diff --git a/build/tasks/Utilities/ArtifactInfo.cs b/build/tasks/Utilities/ArtifactInfo.cs index c03cdacefb..7116daae48 100644 --- a/build/tasks/Utilities/ArtifactInfo.cs +++ b/build/tasks/Utilities/ArtifactInfo.cs @@ -26,11 +26,8 @@ namespace RepoTasks.Utilities case "nugetsymbolspackage": info = new Package { PackageInfo = GetPackageInfo(item), IsSymbolsArtifact = true }; break; - case "vsixpackage": - info = new Vsix { Name = Path.GetFileNameWithoutExtension(item.ItemSpec) }; - break; default: - throw new InvalidDataException($"Unrecognized artifact type: {item.GetMetadata("ArtifactType")} for artifact {item.ItemSpec}"); + return UnknownType.Singleton; } info.RepositoryRoot = item.GetMetadata("RepositoryRoot")?.TrimEnd(new [] { '\\', '/' }); @@ -46,9 +43,10 @@ namespace RepoTasks.Utilities public string RepositoryRoot { get; private set; } public string RepoName { get; private set; } - public class Vsix : ArtifactInfo + public class UnknownType : ArtifactInfo { - public string Name { get; set; } + private UnknownType() { } + public static UnknownType Singleton { get; } = new UnknownType(); } public class Package : ArtifactInfo