diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.Tool/Xamarin.AndroidBinderator.Tool.csproj b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.Tool/Xamarin.AndroidBinderator.Tool.csproj
index 0e34c38ef..69084d573 100644
--- a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.Tool/Xamarin.AndroidBinderator.Tool.csproj
+++ b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.Tool/Xamarin.AndroidBinderator.Tool.csproj
@@ -14,7 +14,7 @@
Xamarin.AndroidBinderator.Tool
- 0.5.6
+ 0.5.7
Xamarin Android Binderator
A tool for generating Xamarin.Android Binding projects from Razor templates and Maven Repository data.
https://go.microsoft.com/fwlink/?linkid=2100525
diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Engine.cs b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Engine.cs
index a4ad0c098..455fcdc81 100644
--- a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Engine.cs
+++ b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Engine.cs
@@ -318,14 +318,24 @@ static List BuildProjectModels(BindingConfig config, Dictio
MavenArtifactConfig = mavenArtifact
});
- // Gather maven dependencies to try and map out nuget dependencies
- foreach (var mavenDep in mavenProject.Dependencies.Concat(ParseExtraDependencies(mavenArtifact.ExtraDependencies)))
- {
+ List dependencies = new List();
+
+ // Find all the POM specified dependencies that we need to consider
+ foreach (var mavenDep in mavenProject.Dependencies) {
FixDependency(config, mavenArtifact, mavenDep, mavenProject);
if (!ShouldIncludeDependency(config, mavenArtifact, mavenDep, exceptions))
continue;
+ dependencies.Add(mavenDep);
+ }
+
+ // Add any "extraDependencies"
+ dependencies.AddRange(ParseExtraDependencies(mavenArtifact.ExtraDependencies));
+
+ // Try and map out nuget dependencies
+ foreach (var mavenDep in dependencies)
+ {
mavenDep.GroupId = mavenDep.GroupId.Replace ("${project.groupId}", mavenProject.GroupId);
mavenDep.Version = mavenDep.Version?.Replace ("${project.version}", mavenProject.Version);
diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj
index 4fa94a876..f00347e7b 100644
--- a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj
+++ b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj
@@ -10,7 +10,7 @@
- 2.3.6
+ 2.3.7
Xamarin.AndroidBinderator
Xamarin.AndroidBinderator
An engine to generate Xamarin Binding projects from Maven repositories with a JSON config and razor templates.