Update of /cvsroot/magicajax/magicajax/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9666/magicajax/Core
Modified Files:
AjaxCallHelper.cs AssemblyInfo.cs MagicAjax NET 2.0.csproj
MagicAjaxContext.cs
Log Message:
Index: AjaxCallHelper.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/AjaxCallHelper.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AjaxCallHelper.cs 6 Feb 2006 13:20:47 -0000 1.27
--- AjaxCallHelper.cs 7 Feb 2006 10:54:08 -0000 1.28
***************
*** 826,829 ****
--- 826,830 ----
/// Uses reflection to get the private dictionary field 'fieldName'.
/// Uses Page.ClientScript for .NET 2.0, and the Page-object for .NET 1.1
+ /// Note: if MEDIUM_TRUST flag is set, reflection is not allowed, so return null;
/// </summary>
/// <param name="fieldName"></param>
***************
*** 831,837 ****
private static IDictionary GetPageHiddenDictionary(Page page, string fieldName)
{
! #if NET_2_0
return (IDictionary)(Util.GetPrivateField(page.ClientScript, typeof(ClientScriptManager), fieldName));
! #else
return (IDictionary)(Util.GetPrivateField(page, typeof(Page), fieldName));
#endif
--- 832,842 ----
private static IDictionary GetPageHiddenDictionary(Page page, string fieldName)
{
! #if NET_2_0 && !MEDIUM_TRUST
return (IDictionary)(Util.GetPrivateField(page.ClientScript, typeof(ClientScriptManager), fieldName));
! #endif
! #if NET_2_0 && MEDIUM_TRUST
! return null;
! #endif
! #if !NET_2_0
return (IDictionary)(Util.GetPrivateField(page, typeof(Page), fieldName));
#endif
Index: MagicAjax NET 2.0.csproj
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjax NET 2.0.csproj,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MagicAjax NET 2.0.csproj 24 Jan 2006 22:25:04 -0000 1.15
--- MagicAjax NET 2.0.csproj 7 Feb 2006 10:54:09 -0000 1.16
***************
*** 35,39 ****
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
! <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
<DocumentationFile>
</DocumentationFile>
--- 35,39 ----
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
! <DefineConstants>TRACE;DEBUG;NET_2_0; !MEDIUM_TRUST</DefineConstants>
<DocumentationFile>
</DocumentationFile>
Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/AssemblyInfo.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssemblyInfo.cs 27 Jan 2006 23:59:08 -0000 1.9
--- AssemblyInfo.cs 7 Feb 2006 10:54:08 -0000 1.10
***************
*** 1,3 ****
--- 1,4 ----
using System.Reflection;
+ using System.Security;
using System.Runtime.CompilerServices;
using System.Web.UI;
***************
*** 25,28 ****
--- 26,31 ----
#endif
+ [assembly: AllowPartiallyTrustedCallers]
+
//
// Version information for an assembly consists of the following four values:
Index: MagicAjaxContext.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxContext.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MagicAjaxContext.cs 3 Jan 2006 01:49:09 -0000 1.13
--- MagicAjaxContext.cs 7 Feb 2006 10:54:09 -0000 1.14
***************
*** 215,219 ****
{
// Load configuration from web.config
! _configuration = (MagicAjaxConfiguration)ConfigurationSettings.GetConfig("magicAjax");
if (_configuration == null)
{
--- 215,221 ----
{
// Load configuration from web.config
! #if !NET_2_0 || !MEDIUM_TRUST
! _configuration = (MagicAjaxConfiguration)ConfigurationSettings.GetConfig("magicAjax");
! #endif
if (_configuration == null)
{
|
