Merge pull request #559 from mono/develop

🚢 5.8.3

Author: anmeng10101

external/Windows/Windows.Foundation.FoundationContract.winmd

@@ -3,7 +3,7 @@ namespace Mono.Documentation
 {
 	public static class Consts
 	{
-		public static string MonoVersion = "5.8.2";
+		public static string MonoVersion = "5.8.3";
 		public const string DocId = "DocId";
 		public const string CppCli = "C++ CLI";
 	    public const string CppCx = "C++ CX";

external/Windows/Windows.Foundation.UniversalApiContract.winmd

@@ -139,6 +139,14 @@ Test/DocTest-enumerations.dll:
 Test/DocTest-embedded-type.dll: 
 	$(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-embedded-type.cs
 
+Test/DocTest-differentTypeDefinitions-First.dll:
+	rm -f $@
+	$(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-differentTypeDefinitions.cs /define:FIRST
+
+Test/DocTest-differentTypeDefinitions-Second.dll:
+	rm -f $@
+	$(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-differentTypeDefinitions.cs /define:SECOND
+
 Test/DocTest-typeForwards-First.dll:
 	rm -f $@
 	$(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-typeForwards.cs /define:FIRST
@@ -199,6 +207,20 @@ Test/FrameworkTestData-fx-inheritance: Test/DocTest-framework-inheritance-one.dl
 	cp Test/DocTest-framework-inheritance-three.dll Test/FrameworkTestData-fx-inheritance/Three/
 	$(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-inheritance
 
+.PHONY: check-monodocer-differentTypeDefinitions
+check-monodocer-differentTypeDefinitions : Test/DocTest-differentTypeDefinitions-First.dll Test/DocTest-differentTypeDefinitions-Second.dll
+	-rm -Rf Test/en.actual
+
+	-rm -Rf Test/FrameworkTestData-fx-differentTypeDefinitions
+	mkdir Test/FrameworkTestData-fx-differentTypeDefinitions
+	mkdir Test/FrameworkTestData-fx-differentTypeDefinitions/One
+	cp Test/DocTest-differentTypeDefinitions-First.dll Test/FrameworkTestData-fx-differentTypeDefinitions/One
+	cp Test/DocTest-differentTypeDefinitions-Second.dll Test/FrameworkTestData-fx-differentTypeDefinitions/One
+	$(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-differentTypeDefinitions
+
+	$(MONO) $(PROGRAM) update -o Test/en.actual -frameworks Test/FrameworkTestData-fx-differentTypeDefinitions
+	$(DIFF) Test/en.expected.differentTypeDefinitions Test/en.actual
+
 .PHONY: check-monodocer-typeForwards
 check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest-typeForwards-Second.dll Test/DocTest-typeForwards-Third.dll
 	-rm -Rf Test/en.actual
@@ -726,6 +748,9 @@ check-monodocer-attached-entities:
 Test/TestClass.dll:
 	$(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ mdoc.Test/SampleClasses/Test*.cs
 
+Test/GuidClass.dll:
+	$(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ mdoc.Test/SampleClasses/GuidClass.cs
+
 .PHONY: check-monodocer-operators-work
 check-monodocer-operators-work: Test/TestClass.dll
 	rm -Rf Test/en.actual
@@ -742,6 +767,11 @@ check-monodocer-operators-update: check-monodocer-operators-work
 	rm -Rf Test/en.expected-operators
 	mv Test/en.actual Test/en.expected-operators
 
+check-monodocer-guid: Test/GuidClass.dll
+	rm -Rf Test/en.actual
+	$(MONO) $(PROGRAM) update -o Test/en.actual Test/GuidClass.dll -lang c++/cx -lang c++/winrt
+	$(DIFF) Test/en.expected-guid Test/en.actual
+
 check-mdoc-export-html-update: 
 	find Test/html.expected -name \*.html -exec rm "{}" \;
 	$(MONO) $(PROGRAM) export-html -o Test/html.expected \
@@ -827,6 +857,7 @@ run-test-local: check-doc-tools
 run-test-update : check-doc-tools-update
 
 check-doc-tools:  \
+	check-monodocer-differentTypeDefinitions \
 	check-monodocer-typeForwards \
 	check-monodocer-nestedType-typeForwards \
 	check-monodocer-Eii-importslashdoc \
@@ -856,6 +887,7 @@ check-doc-tools:  \
 	check-monodocer-frameworks-inheritance \
 	check-monodocer-docid \
 	check-monodocer-operators \
+	check-monodocer-guid \
 	check-monodocer-fx-statistics-remove \
 	check-overwrite-attribute \
 	check-monodocer-vbnet \
@@ -887,5 +919,5 @@ check-doc-tools-update: check-monodocer-since-update \
 	check-mdoc-export-msxdoc-update \
 	check-mdoc-validate-update 
 
-check: nunit check-doc-tools 
+check: nunit check-doc-tools
 	@echo "mdoc Tests Complete!"

mdoc/Consts.cs

@@ -320,6 +320,9 @@ public override void Run (IEnumerable<string> args)
                 if (File.Exists(typeMapPath))
                 {
                     Console.WriteLine($"Loading typemap file at {typeMapPath}");
+                    if (!Directory.Exists(srcPath))
+                        Directory.CreateDirectory(srcPath);
+                    File.Copy(typeMapPath, Path.Combine(srcPath, "TypeMap.xml"), true);
                     TypeMap map = TypeMap.FromXml(typeMapPath);
                     this.TypeMap = map;
                     FormatterManager.UpdateTypeMap(map);
@@ -2451,7 +2454,6 @@ private void UpdateMember (DocsNodeInfo info, FrameworkTypeEntry typeEntry, Dict
 
             info.Node = WriteElement (me, "Docs");
             MakeDocNode (info, typeEntry.Framework.Importers, typeEntry);
-
 
             foreach (MemberFormatter f in FormatterManager.MemberFormatters)
             {
@@ -3870,9 +3872,22 @@ public static void MakeAttributes(
             NormalizeWhitespace(e);
         }
 
+        private bool ProcessedMoreThanOnce(FrameworkTypeEntry typeEntry)
+        {
+            if (typeEntry.TimesProcessed <= 1)
+            {
+                return false;
+            }
+            else
+            {
+                var assemblies = this.assemblies.Where(a => a.Name == typeEntry.Framework.Name).ToList();
+                return assemblies.Any(a => a.IsTypeForwardingTo(typeEntry));
+            }
+        }
+
         public void MakeParameters (XmlElement root, MemberReference member, IList<ParameterDefinition> parameters, FrameworkTypeEntry typeEntry, ref bool fxAlternateTriggered, bool shouldDuplicateWithNew = false)
         {
-            if (typeEntry.TimesProcessed > 1)
+            if (ProcessedMoreThanOnce(typeEntry))
                 return;
 
             XmlElement e = WriteElement (root, "Parameters");
@@ -4407,9 +4422,9 @@ private static string GetDocTypeName (TypeReference type, bool useTypeProjection
             return docTypeFormatter.GetName (type, useTypeProjection: useTypeProjection);
         }
 
-        internal static string GetDocTypeFullName (TypeReference type, bool useTypeProjection = true)
+        internal static string GetDocTypeFullName (TypeReference type, bool useTypeProjection = true, bool isTypeofOperator = false)
         {
-            return DocTypeFullMemberFormatter.Default.GetName (type, useTypeProjection: useTypeProjection);
+            return DocTypeFullMemberFormatter.Default.GetName (type, useTypeProjection: useTypeProjection, isTypeofOperator: isTypeofOperator);
         }
 
         internal static string GetXPathForMember (DocumentationMember member)

mdoc/Makefile

@@ -2,13 +2,14 @@
 using Mono.Documentation.Util;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 
 namespace Mono.Documentation.Updater.Formatters
 {
     public class AttributeFormatter
     {
+        private AttributeValueFormatter valueFormatter = new AttributeValueFormatter();
+
         public virtual string PrefixBrackets { get; } = "";
         public virtual string SurfixBrackets { get; } = "";
         public virtual string Language { get; } = "";
@@ -119,37 +120,9 @@ protected virtual string MakeNamedArgumentString(string name, string value)
             return $"{name}={value}";
         }
 
-        public virtual string MakeAttributesValueString(object v, TypeReference valueType)
+        public virtual string MakeAttributesValueString(object argumentValue, TypeReference argumentType)
         {
-            var formatters = new[] {
-                new AttributeValueFormatter (),
-                new ApplePlatformEnumFormatter (),
-                new StandardFlagsEnumFormatter (),
-                new DefaultAttributeValueFormatter (),
-            };
-
-            ResolvedTypeInfo type = new ResolvedTypeInfo(valueType);
-
-            if (valueType is ArrayType && v is CustomAttributeArgument[])
-            {
-                ArrayType atype = valueType as ArrayType;
-                CustomAttributeArgument[] args = v as CustomAttributeArgument[];
-                var returnvalue = $"new {atype.FullName}{(atype.FullName.EndsWith("[]") ? "" : "[]")} {{ { string.Join(", ", args.Select(a => MakeAttributesValueString(a.Value, a.Type)).ToArray()) } }}";
-                return returnvalue;
-            }
-
-            foreach (var formatter in formatters)
-            {
-                string formattedValue;
-                if (formatter.TryFormatValue(v, type, out formattedValue))
-                {
-                    return formattedValue;
-                }
-            }
-
-            // this should never occur because the DefaultAttributeValueFormatter will always
-            // successfully format the value ... but this is needed to satisfy the compiler :)
-            throw new InvalidDataException(string.Format("Unable to format attribute value ({0})", v.ToString()));
+            return valueFormatter.Format(argumentType, argumentValue);
         }
 
         private bool IsIgnoredAttribute(CustomAttribute customAttribute)