mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 01:41:18 -10:00
ReturnValue in MessageDescription was missing when there was MessageContract.
This commit is contained in:
1 parent
6bdb4baa47
commit
106fdeb492
2 files changed
+56
-14
No files matched your search
+24
-14
@@ -3,8 +3,10 @@
|
||||
//
|
||||
// Author:
|
||||
// Atsushi Enomoto <[email protected]>
|
||||
// Atsushi Enomoto <[email protected]>
|
||||
//
|
||||
// Copyright (C) 2005-2007 Novell, Inc. http://www.novell.com
|
||||
// Copyright (C) 2011 Xamarin, Inc. http://xamarin.com
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -413,9 +415,21 @@ namespace System.ServiceModel.Description
|
||||
cd.Namespace.Length == 0 ? "urn:" : cd.Namespace.EndsWith ("/") ? "" : "/", cd.Name, "/",
|
||||
od.Name, isRequest ? String.Empty : "Response");
|
||||
|
||||
MessageDescription md;
|
||||
if (mca != null)
|
||||
return CreateMessageDescription (messageType, cd.Namespace, action, isRequest, isCallback, mca);
|
||||
return CreateMessageDescription (oca, plist, od.Name, cd.Namespace, action, isRequest, isCallback, retType, mi.ReturnTypeCustomAttributes);
|
||||
md = CreateMessageDescription (messageType, cd.Namespace, action, isRequest, isCallback, mca);
|
||||
else
|
||||
md = CreateMessageDescription (oca, plist, od.Name, cd.Namespace, action, isRequest, isCallback, retType);
|
||||
|
||||
// ReturnValue
|
||||
if (!isRequest) {
|
||||
MessagePartDescription mp = CreatePartCore (GetMessageParameterAttribute (mi.ReturnTypeCustomAttributes), od.Name + "Result", md.Body.WrapperNamespace);
|
||||
mp.Index = 0;
|
||||
mp.Type = mca != null ? typeof (void) : retType;
|
||||
md.Body.ReturnValue = mp;
|
||||
}
|
||||
|
||||
return md;
|
||||
}
|
||||
|
||||
public static MessageDescription CreateMessageDescription (
|
||||
@@ -456,6 +470,13 @@ namespace System.ServiceModel.Description
|
||||
pd.MemberInfo = bmi;
|
||||
md.Headers.Add (pd);
|
||||
}
|
||||
var mpa = bmi.GetCustomAttribute<MessagePropertyAttribute> (false);
|
||||
if (mpa != null) {
|
||||
var pd = new MessagePropertyDescription (mpa.Name ?? mname);
|
||||
pd.Type = MessageFilterOutByRef (mtype);
|
||||
pd.MemberInfo = bmi;
|
||||
md.Properties.Add (pd);
|
||||
}
|
||||
var mba = GetMessageBodyMemberAttribute (bmi);
|
||||
if (mba != null) {
|
||||
var pd = CreatePartCore (mba, mname, defaultNamespace);
|
||||
@@ -467,12 +488,11 @@ namespace System.ServiceModel.Description
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: fill headers and properties.
|
||||
return md;
|
||||
}
|
||||
|
||||
public static MessageDescription CreateMessageDescription (
|
||||
OperationContractAttribute oca, ParameterInfo[] plist, string name, string defaultNamespace, string action, bool isRequest, bool isCallback, Type retType, ICustomAttributeProvider retTypeAttributes)
|
||||
OperationContractAttribute oca, ParameterInfo[] plist, string name, string defaultNamespace, string action, bool isRequest, bool isCallback, Type retType)
|
||||
{
|
||||
var dir = isRequest ^ isCallback ? MessageDirection.Input : MessageDirection.Output;
|
||||
MessageDescription md = new MessageDescription (action, dir) { IsRequest = isRequest };
|
||||
@@ -505,16 +525,6 @@ namespace System.ServiceModel.Description
|
||||
mb.Parts.Add (pd);
|
||||
}
|
||||
|
||||
// ReturnValue
|
||||
if (!isRequest) {
|
||||
MessagePartDescription mp = CreatePartCore (GetMessageParameterAttribute (retTypeAttributes), name + "Result", mb.WrapperNamespace);
|
||||
mp.Index = 0;
|
||||
mp.Type = retType;
|
||||
mb.ReturnValue = mp;
|
||||
}
|
||||
|
||||
// FIXME: fill properties.
|
||||
|
||||
return md;
|
||||
}
|
||||
|
||||
|
||||
+32
@@ -5,6 +5,7 @@
|
||||
// Atsushi Enomoto <[email protected]>
|
||||
//
|
||||
// Copyright (C) 2005 Novell, Inc. http://www.novell.com
|
||||
// Copyright (C) 2011 Xamarin, Inc. http://xamarin.com
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -555,6 +556,24 @@ namespace MonoTests.System.ServiceModel.Description
|
||||
Assert.IsNotNull (md.Body.ReturnValue, od.Name);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BugX206Contract ()
|
||||
{
|
||||
var cd = ContractDescription.GetContract (typeof (BugX206Service));
|
||||
bool examined = false;
|
||||
foreach (var md in cd.Operations.First ().Messages) {
|
||||
if (md.Direction == MessageDirection.Input)
|
||||
continue;
|
||||
var pd = md.Body.ReturnValue;
|
||||
Assert.IsNotNull (pd, "#1");
|
||||
Assert.AreEqual ("DoWorkResult", pd.Name, "#2");
|
||||
Assert.IsNull (pd.MemberInfo, "#3");
|
||||
Assert.AreEqual (typeof (void), pd.Type, "#4");
|
||||
examined = true;
|
||||
}
|
||||
Assert.IsTrue (examined, "end");
|
||||
}
|
||||
|
||||
// It is for testing attribute search in interfaces.
|
||||
public class Foo : IFoo
|
||||
{
|
||||
@@ -916,5 +935,18 @@ namespace MonoTests.System.ServiceModel.Description
|
||||
[XmlSerializerFormat]
|
||||
string Echo (string input);
|
||||
}
|
||||
|
||||
[ServiceContract]
|
||||
public interface BugX206Service
|
||||
{
|
||||
[OperationContract]
|
||||
BugX206Response DoWork ();
|
||||
}
|
||||
|
||||
[MessageContract (IsWrapped = true)]
|
||||
public partial class BugX206Response
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user