Use full path to downloaded artifacts

Redth · Redth · commit 3e46e3c40b2b · 2019-08-28T13:33:46.000-04:00
Avoids .jar name collisions
diff --git a/config.json b/config.json
@@ -1,6 +1,7 @@
 [{
 	"mavenRepositoryType" : "Google",
 	"slnFile" : "generated/AndroidSupport.sln",
+	"downloadExternalsWithFullName" : true,
 	"additionalProjects": [
 		"source/buildtasks/support-annotations/Support-Annotations-BuildTasks.csproj",
 		"source/buildtasks/support-annotations-tests/Support-Annotations-BuildTasks-Tests.csproj",
diff --git a/source/AndroidSupportProject.cshtml b/source/AndroidSupportProject.cshtml
@@ -73,7 +73,7 @@
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.MavenArtifactPackaging == "aar") {
-    <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" />
+    <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
       }
     }   
   </ItemGroup>
@@ -119,7 +119,7 @@
       Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)\libs\*.jar" 
       />
       } else {
-    <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />
+    <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenGroupId).@(art.MavenArtifactId).jar" />
       }
     }
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`<ItemGroup>`
`74`	`74`	`@foreach (var art in @Model.MavenArtifacts) {`
`75`	`75`	`if (art.MavenArtifactPackaging == "aar") {`
`76`		`- <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" />`
	`76`	`+ <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`</ItemGroup>`
`@@ -119,7 +119,7 @@`
`119`	`119`	`Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)\libs\*.jar"`
`120`	`120`	`/>`
`121`	`121`	`} else {`
`122`		`- <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />`
	`122`	`+ <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenGroupId).@(art.MavenArtifactId).jar" />`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`</ItemGroup>`