From 9b8aa7c168c95a99ecdef1961e3bff41d5c0eb0b Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 17 Apr 2018 18:17:43 -0400 Subject: [PATCH] Fix API diff markdown and make sure wrench shows the link to the .md files (#3950) The existing Makefile copy api-diff.html to index.html before it was updated with the .md links. The mono-api-html.exe was reversing the diff (ole/new) sections. --- external/macios-binaries | 2 +- tools/apidiff/.gitignore | 1 + tools/apidiff/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/external/macios-binaries b/external/macios-binaries index 37d3c2ea43..452541f291 160000 --- a/external/macios-binaries +++ b/external/macios-binaries @@ -1 +1 @@ -Subproject commit 37d3c2ea433f21880538cd0ce449fcb6b552e8b1 +Subproject commit 452541f291d95f9bc884dc99e36c8fe9643d5927 diff --git a/tools/apidiff/.gitignore b/tools/apidiff/.gitignore index 7eec405da3..6b8ab67ec7 100644 --- a/tools/apidiff/.gitignore +++ b/tools/apidiff/.gitignore @@ -8,3 +8,4 @@ ios-*.md tvos-*.md watchos-*.md macos-*.md +xamarin-*.md diff --git a/tools/apidiff/Makefile b/tools/apidiff/Makefile index b05b3d1a78..2f8e4c6e5c 100644 --- a/tools/apidiff/Makefile +++ b/tools/apidiff/Makefile @@ -275,12 +275,12 @@ ifdef INCLUDE_TVOS endif endif $(Q) $(MAKE) all -j8 + $(Q) $(MAKE) -j8 ios-markdown tvos-markdown watchos-markdown macos-markdown $(Q) cp api-diff.html index.html @echo "@MonkeyWrench: AddFile: $(CURDIR)/index.html" @echo "@MonkeyWrench: AddFile: $(CURDIR)/api-diff.html" @# remove empty files so they're not uploaded @-find $(CURDIR)/diff -size 0 | xargs rm - $(MAKE) -j8 ios-markdown tvos-markdown watchos-markdown macos-markdown ifdef INCLUDE_IOS $(MAKE) verify-reference-assemblies-ios -j8 endif