[mapserver-commits] r10131 - in branches/branch-5-6/mapserver: . mapscript/csharp mapscript/csharp/config

[svn at osgeo.org]

Author: tamas
Date: 2010-05-02 08:34:21 -0400 (Sun, 02 May 2010)
New Revision: 10131

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapscript/csharp/Makefile.vc
   branches/branch-5-6/mapserver/mapscript/csharp/config/AssemblyInfo.cs
Log:
Fix security exception issue in C# with MSVC2010 (#3438)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-05-02 12:33:29 UTC (rev 10130)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-05-02 12:34:21 UTC (rev 10131)
@@ -15,6 +15,8 @@
 Version 5.6.4 (????-??-??):
 ---------------------------
 
+- Fix security exception issue in C# with MSVC2010 (#3438)
+
 - Write out join CONNECTIONTYPE when saving a mapfile. (#3435)
 
 - Fixed attribute queries to use an extent stored (and cached) as part of the queryObj

Modified: branches/branch-5-6/mapserver/mapscript/csharp/Makefile.vc
===================================================================
--- branches/branch-5-6/mapserver/mapscript/csharp/Makefile.vc	2010-05-02 12:33:29 UTC (rev 10130)
+++ branches/branch-5-6/mapserver/mapscript/csharp/Makefile.vc	2010-05-02 12:34:21 UTC (rev 10131)
@@ -47,6 +47,10 @@
 !ENDIF
 !ENDIF
 
+!IF $(MSVC_VER) >= 1600
+CSC = $(CSC) /define:CLR4 /debug:full
+!ENDIF
+
 #SWIG = swig
 
 !IFDEF DLLBUILD

Modified: branches/branch-5-6/mapserver/mapscript/csharp/config/AssemblyInfo.cs
===================================================================
--- branches/branch-5-6/mapserver/mapscript/csharp/config/AssemblyInfo.cs	2010-05-02 12:33:29 UTC (rev 10130)
+++ branches/branch-5-6/mapserver/mapscript/csharp/config/AssemblyInfo.cs	2010-05-02 12:34:21 UTC (rev 10131)
@@ -92,3 +92,7 @@
 // Web page that should be running under restricted permissions.
 [assembly: AllowPartiallyTrustedCallers]
 
+// Use the .NET Framework 2.0 transparency rules (level 1 transparency) as default
+#if (CLR4)
+[assembly: SecurityRules(SecurityRuleSet.Level1)]
+#endif
\ No newline at end of file