Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build #1384

Merged
merged 1 commit into from
Mar 9, 2018
Merged

Fix build #1384

merged 1 commit into from
Mar 9, 2018

Conversation

grendello
Copy link
Contributor

The test didn't use the correct UpdateXmlResource overload. This commit makes
the build work.

@@ -66,7 +68,7 @@ public void MenuActionLayout ()
app:showAsAction = ""never"" />

</menu>");
Monodroid.AndroidResource.UpdateXmlResource (actions, new Dictionary<string, string> (), null);
Monodroid.AndroidResource.UpdateXmlResource (actions, xmlFilePath, new Dictionary<string, string> (), null);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be Path.Combine (path, "res")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean instead of actions?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of xmlFilePath. The ‘res’ Param should be te root of the resource directory. I know why this happened now. There were two PR's one altered the UpdateXmlResource signature, bother were open at the the time the commits were made so they both passed. One was merged, the other which added the test was not rebased before merging, so it looked like it was working.

The test didn't use the correct `UpdateXmlResource` overload. This commit makes
the build work.
@dellis1972 dellis1972 merged commit 6641a32 into dotnet:master Mar 9, 2018
@grendello grendello deleted the fix-resourcetests-build branch March 9, 2018 10:13
jonpryor pushed a commit that referenced this pull request Mar 9, 2018
The test didn't use the correct `UpdateXmlResource` overload. This commit makes
the build work.
@github-actions github-actions bot locked and limited conversation to collaborators Feb 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants