Running into some resource not found issues at build time and suspect this is why.
This commit is contained in:
Redth 2018-10-29 17:41:24 -04:00
Родитель 042242424b
Коммит db74a74af8
2 изменённых файлов: 10 добавлений и 9 удалений

Просмотреть файл

@ -70,6 +70,15 @@
</ItemGroup> </ItemGroup>
} }
<ItemGroup>
@foreach (var art in @Model.MavenArtifacts) {
if (art.MavenArtifactPackaging == "aar") {
<LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
}
}
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Additions\" /> <Folder Include="Additions\" />
<Folder Include="Jars\" /> <Folder Include="Jars\" />
@ -93,7 +102,7 @@
<ItemGroup> <ItemGroup>
@foreach (var art in @Model.MavenArtifacts) { @foreach (var art in @Model.MavenArtifacts) {
if (art.MavenArtifactPackaging == "aar") { if (1==2 && art.MavenArtifactPackaging == "aar") {
<None Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" /> <None Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />
} }
} }

Просмотреть файл

@ -28,14 +28,6 @@
</ItemGroup> </ItemGroup>
} }
<ItemGroup>
@foreach (var art in @Model.MavenArtifacts) {
if (art.MavenArtifactPackaging == "aar") {
<AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\..\aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
}
}
</ItemGroup>
@{ @{
string mergeTargets = Path.Combine(Model.Config.BasePath, "source", Model.MavenGroupId, Model.Name, "merge.targets"); string mergeTargets = Path.Combine(Model.Config.BasePath, "source", Model.MavenGroupId, Model.Name, "merge.targets");
if (File.Exists(mergeTargets)) { if (File.Exists(mergeTargets)) {