Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479

mcs/class/monodoc/Makefile

@@ -87,6 +87,7 @@ EXTRA_DISTFILES = \
 	Test/monodoc_test/trees/tree-from-3-0-old.tree \
 	Test/monodoc_test/trees/tree-from-3-0.tree
 
+LIB_REFS = ICSharpCode.SharpZipLib System System.Core System.Xml System.Xml.Linq System.Configuration
 LIB_MCS_FLAGS = \
 	/unsafe                                                           \
 	/codepage:utf8                                                    \
@@ -111,13 +112,7 @@ LIB_MCS_FLAGS = \
 	/resource:Resources/mono-ecma.xsl,mono-ecma.xsl                   \
 	/resource:Resources/toc-html.xsl,toc-html.xsl                     \
 	$(IMAGE_RESOURCE_COMMAND)					                      \
-	/r:ICSharpCode.SharpZipLib                                        \
-	/r:$(corlib)                                                      \
-	/r:System.dll                                                     \
-	/r:System.Core.dll                                                \
-	/r:System.Xml.dll                                                 \
-	/r:System.Xml.Linq.dll                                            \
-	/r:System.Configuration.dll
+	/r:$(corlib)
 
 CLEAN_FILES += $(the_lib).config
 

mcs/class/monodoc/Monodoc.Ecma/EcmaDesc.cs

@@ -234,7 +234,9 @@ namespace Monodoc.Ecma
 
 			sb.Append ('.');
 			sb.Append (TypeName);
-			if (GenericTypeArguments != null) {
+			if (GenericTypeArguments != null && GenericTypeArgumentsIsNumeric) {
+				sb.AppendFormat ("`{0}", GenericTypeArgumentsCount);
+			} else if (GenericTypeArguments != null) {
 				sb.Append ('<');
 				int i=0;
 				foreach (var t in GenericTypeArguments) {

mcs/class/monodoc/Monodoc/generators/html/Ecma2Html.cs

@@ -101,7 +101,7 @@ namespace Monodoc.Generators.Html
 		{
 			if (ecma_transform == null) {
 				ecma_transform = new XslCompiledTransform ();
-				var assembly = System.Reflection.Assembly.GetCallingAssembly ();
+				var assembly = System.Reflection.Assembly.GetAssembly (typeof (Ecma2Html));
 			
 				Stream stream = assembly.GetManifestResourceStream ("mono-ecma-css.xsl");
 				XmlReader xml_reader = new XmlTextReader (stream);

mcs/class/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs

@@ -17,7 +17,7 @@ namespace Monodoc.Generators.Html
 			get {
 				if (css_ecmaspec != null)
 					return css_ecmaspec;
-				System.Reflection.Assembly assembly = System.Reflection.Assembly.GetCallingAssembly ();
+				System.Reflection.Assembly assembly = System.Reflection.Assembly.GetAssembly (typeof (Ecmaspec2Html));
 				Stream str_css = assembly.GetManifestResourceStream ("ecmaspec.css");
 				css_ecmaspec = (new StreamReader (str_css)).ReadToEnd ();
 				return css_ecmaspec;
@@ -46,7 +46,7 @@ namespace Monodoc.Generators.Html
 		{
 			if (ecma_transform == null){
 				ecma_transform = new XslTransform ();
-				System.Reflection.Assembly assembly = System.Reflection.Assembly.GetCallingAssembly ();
+				System.Reflection.Assembly assembly = System.Reflection.Assembly.GetAssembly (typeof (Ecmaspec2Html));
 				Stream stream;
 				stream = assembly.GetManifestResourceStream ("ecmaspec-html-css.xsl");
 

mcs/class/monodoc/Monodoc/generators/html/Toc2Html.cs

@@ -15,7 +15,7 @@ namespace Monodoc.Generators.Html
 		public Toc2Html ()
 		{
 			transform = new XslTransform ();
-			var assembly = Assembly.GetCallingAssembly ();
+			var assembly = Assembly.GetAssembly (typeof (Toc2Html));
 			var stream = assembly.GetManifestResourceStream ("toc-html.xsl");
 			XmlReader xml_reader = new XmlTextReader (stream);
 			transform.Load (xml_reader, null, null);

mcs/class/monodoc/Resources/mdoc-html-utils.xsl

@@ -839,6 +839,10 @@
 			<xsl:with-param name="child-id" select="concat ($linkid, ':Related:')" />
 			<xsl:with-param name="content">
 			  <div class="related">
+				<xsl:call-template name="CreateRelatedSection">
+				  <xsl:with-param name="section" select="'Platform Docs'" />
+				  <xsl:with-param name="type" select="'PlatformDocAPI'" />
+				</xsl:call-template>
 				<xsl:call-template name="CreateRelatedSection">
 				  <xsl:with-param name="section" select="'Articles'" />
 				  <xsl:with-param name="type" select="'article'" />

mcs/class/monodoc/Test/Monodoc.Ecma/EcmaUrlTests.cs

@@ -192,6 +192,17 @@ namespace MonoTests.Monodoc.Ecma
 			Assert.IsFalse (desc.GenericTypeArgumentsIsNumeric);
 		}
 
+		[Test]
+		public void GenericTypeArgsNumericToStringTest ()
+		{
+			string stringCref = "T:System.Collections.Generic.Dictionary`2";
+			var desc = parser.Parse (stringCref);
+			Assert.IsTrue (desc.GenericTypeArgumentsIsNumeric);
+			Assert.AreEqual (2, desc.GenericTypeArguments.Count);
+			string generatedEcmaCref = desc.ToEcmaCref ();
+			Assert.AreEqual (stringCref, generatedEcmaCref);
+		}
+
 		[Test]
 		public void MetaEtcNodeTest ()
 		{