From 9d3f4da6f22e4d28268272633ea481ca6644de02 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 6 Feb 2017 19:34:54 +0100 Subject: [PATCH] [xharness] Process "$(ProjectDir)" in mtouch extra args when cloning project files. --- tests/xharness/ProjectFileExtensions.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/xharness/ProjectFileExtensions.cs b/tests/xharness/ProjectFileExtensions.cs index a781ab8903..cb9c14465c 100644 --- a/tests/xharness/ProjectFileExtensions.cs +++ b/tests/xharness/ProjectFileExtensions.cs @@ -669,6 +669,10 @@ namespace xharness new string [] { "ObjcBindingNativeLibrary", "Include" }, new string [] { "ObjcBindingNativeFramework", "Include" }, }; + var nodes_with_variables = new string [] + { + "MtouchExtraArgs", + }; Func convert = (input) => { if (input [0] == '/') @@ -685,6 +689,12 @@ namespace xharness foreach (var node in nodes) node.InnerText = convert (node.InnerText); } + foreach (var key in nodes_with_variables) { + var nodes = csproj.SelectElementNodes (key); + foreach (var node in nodes) { + node.InnerText = node.InnerText.Replace ("${ProjectDir}", Harness.Quote (System.IO.Path.GetDirectoryName (project_path))); + } + } foreach (var kvp in attributes_with_paths) { var element = kvp [0]; var attrib = kvp [1];