From 880768c333792c3246672ee74b41c65970e72c26 Mon Sep 17 00:00:00 2001 From: toshok Date: Mon, 7 Dec 2009 07:56:55 +0000 Subject: [PATCH] fix up SSC/SC attributes for netflix's json serialization git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/moon@147768 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- .../automatic/System.ServiceModel.Web.auto.sc | 14 +++++++++++++- .../automatic/System.ServiceModel.Web.auto.ssc | 3 ++- .../overrides/System.ServiceModel.Web.manual | 7 +++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.sc b/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.sc index e57216389..275ffb756 100644 --- a/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.sc +++ b/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.sc @@ -1,3 +1,15 @@ # [SecurityCritical] needed to execute code inside 'System.ServiceModel.Web, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e'. -# 0 methods needs to be decorated. +# 4 methods needs to be decorated. + +# overrides 'System.Object System.Runtime.Serialization.Json.TypeMapMember::GetMemberOf(System.Object)'. ++SC-M: System.Object System.Runtime.Serialization.Json.TypeMapField::GetMemberOf(System.Object) + +# overrides 'System.Object System.Runtime.Serialization.Json.TypeMapMember::GetMemberOf(System.Object)'. ++SC-M: System.Object System.Runtime.Serialization.Json.TypeMapProperty::GetMemberOf(System.Object) + +# overrides 'System.Void System.Runtime.Serialization.Json.TypeMapMember::SetMemberValue(System.Object,System.Object)'. ++SC-M: System.Void System.Runtime.Serialization.Json.TypeMapField::SetMemberValue(System.Object,System.Object) + +# overrides 'System.Void System.Runtime.Serialization.Json.TypeMapMember::SetMemberValue(System.Object,System.Object)'. ++SC-M: System.Void System.Runtime.Serialization.Json.TypeMapProperty::SetMemberValue(System.Object,System.Object) diff --git a/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.ssc b/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.ssc index 7b655a8cc..3997c92fd 100644 --- a/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.ssc +++ b/class/tuning/SecurityAttributes/automatic/System.ServiceModel.Web.auto.ssc @@ -1,4 +1,5 @@ # [SecuritySafeCritical] needed inside System.ServiceModel.Web to call all [SecurityCritical] methods -# 1 methods +# 2 methods ++SSC-M: System.Void System.Runtime.Serialization.Json.TypeMap::Serialize(System.Runtime.Serialization.Json.JsonSerializationWriter,System.Object) +SSC-M: System.Object System.Runtime.Serialization.Json.TypeMap::Deserialize(System.Runtime.Serialization.Json.JsonSerializationReader) diff --git a/class/tuning/SecurityAttributes/overrides/System.ServiceModel.Web.manual b/class/tuning/SecurityAttributes/overrides/System.ServiceModel.Web.manual index c910739b8..5451a9b2b 100644 --- a/class/tuning/SecurityAttributes/overrides/System.ServiceModel.Web.manual +++ b/class/tuning/SecurityAttributes/overrides/System.ServiceModel.Web.manual @@ -1 +1,8 @@ # manual override file for [SecurityCritical] and [SecuritySafeCritical] attributes + +# needs to use reflection to get at potentially private setters ++SC-M: System.Void System.Runtime.Serialization.Json.TypeMapMember::SetMemberValue(System.Object,System.Object) + +# needs to use reflection to get at potentially private getters ++SC-M: System.Object System.Runtime.Serialization.Json.TypeMapMember::GetMemberOf(System.Object) + -- 2.11.4.GIT