[mapserver-commits] r10130 - in branches/branch-5-4/mapserver: . mapscript/csharp mapscript/csharp/config

[svn at osgeo.org]

Author: tamas
Date: 2010-05-02 08:33:29 -0400 (Sun, 02 May 2010)
New Revision: 10130

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

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2010-05-02 12:02:51 UTC (rev 10129)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2010-05-02 12:33:29 UTC (rev 10130)
@@ -14,6 +14,8 @@
 Current Version:
 ----------------
 
+- Fix security exception issue in C# with MSVC2010 (#3438)
+
 - Check error returns from mapstring functions (#2988)
 
 - Avoid memory error when building SQL bbox (#3324)

Modified: branches/branch-5-4/mapserver/mapscript/csharp/Makefile.vc
===================================================================
--- branches/branch-5-4/mapserver/mapscript/csharp/Makefile.vc	2010-05-02 12:02:51 UTC (rev 10129)
+++ branches/branch-5-4/mapserver/mapscript/csharp/Makefile.vc	2010-05-02 12:33:29 UTC (rev 10130)
@@ -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-4/mapserver/mapscript/csharp/config/AssemblyInfo.cs
===================================================================
--- branches/branch-5-4/mapserver/mapscript/csharp/config/AssemblyInfo.cs	2010-05-02 12:02:51 UTC (rev 10129)
+++ branches/branch-5-4/mapserver/mapscript/csharp/config/AssemblyInfo.cs	2010-05-02 12:33:29 UTC (rev 10130)
@@ -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