From 7e0d6323d1ecf0ec3df1d6b5ea9132618fa5390e Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Wed, 2 Jan 2019 12:06:08 -0800
Subject: [PATCH] Fix JoinItems namespace collision (#6302)

---
 build/repo.targets                             | 4 ++--
 build/tasks/{JoinItems.cs => JoinRepoItems.cs} | 2 +-
 build/tasks/RepoTasks.tasks                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename build/tasks/{JoinItems.cs => JoinRepoItems.cs} (99%)

diff --git a/build/repo.targets b/build/repo.targets
index 150edb552e..6e4b31e51b 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -168,14 +168,14 @@
     <Move SourceFiles="%(SubmoduleGlobalJsonFiles.BackupPath)" DestinationFiles="%(SubmoduleGlobalJsonFiles.Identity)" Condition="Exists(%(SubmoduleGlobalJsonFiles.BackupPath))" />
 
     <!-- Join required because shipping category is stored in artifact.props (PackageArtifact), but information about package ID and version comes from repos (ArtifactInfo). -->
-    <RepoTasks.JoinItems
+    <RepoTasks.JoinRepoItems
       Left="@(_Temp)"
       LeftMetadata="*"
       Right="@(ArtifactInfo->WithMetadataValue('ArtifactType','NuGetPackage'));@(ShippedArtifactInfo->WithMetadataValue('ArtifactType','NuGetPackage'))"
       RightKey="PackageId"
       RightMetadata="Version">
       <Output TaskParameter="JoinResult" ItemName="PackageArtifact" />
-    </RepoTasks.JoinItems>
+    </RepoTasks.JoinRepoItems>
 
     <ItemGroup>
       <_PackageArtifactWithoutMatchingInfo Include="@(_Temp)" Exclude="@(PackageArtifact)" />
diff --git a/build/tasks/JoinItems.cs b/build/tasks/JoinRepoItems.cs
similarity index 99%
rename from build/tasks/JoinItems.cs
rename to build/tasks/JoinRepoItems.cs
index facfd4fa53..97f0ab9d0f 100644
--- a/build/tasks/JoinItems.cs
+++ b/build/tasks/JoinRepoItems.cs
@@ -10,7 +10,7 @@ using Microsoft.Build.Utilities;
 
 namespace RepoTasks
 {
-    public class JoinItems : Task
+    public class JoinRepoItems : Task
     {
         [Required]
         public ITaskItem[] Left { get; set; }
diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks
index 17919c3e90..43323cf2e2 100644
--- a/build/tasks/RepoTasks.tasks
+++ b/build/tasks/RepoTasks.tasks
@@ -6,7 +6,7 @@
   <UsingTask TaskName="RepoTasks.GenerateRestoreSourcesPropsFile" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GenerateGuid" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GetMsiProperty" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.JoinItems" AssemblyFile="$(_RepoTaskAssembly)" />
+  <UsingTask TaskName="RepoTasks.JoinRepoItems" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.OrderBy" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GenerateSharedFrameworkMetadataFiles" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.PublishToAzureBlob" AssemblyFile="$(_RepoTaskAssembly)" />