Fix JoinItems namespace collision (#6302)

jkotalik · web-flow · commit 7e0d6323d1ec · 2019-01-02T12:06:08.000-08:00
diff --git 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/JoinRepoItems.cs b/build/tasks/JoinRepoItems.cs
@@ -10,7 +10,7 @@
 
 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
@@ -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)" />

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace RepoTasks`
`12`	`12`	`{`
`13`		`- public class JoinItems : Task`
	`13`	`+ public class JoinRepoItems : Task`
`14`	`14`	`{`
`15`	`15`	`[Required]`
`16`	`16`	`public ITaskItem[] Left { get; set; }`