Author: mhutch
Date: 2007-10-02 07:27:37 -0400 (Tue, 02 Oct 2007)
New Revision: 86737

Modified:
   trunk/monodevelop/Extras/AspNetAddIn/ChangeLog
   trunk/monodevelop/Extras/AspNetAddIn/Project/VerifyCodeBehindBuildStep.cs
Log:
* Project/VerifyCodeBehindBuildStep.cs: Make errors in Codebehind
  generation into warnings rather than preventing build.

Modified: trunk/monodevelop/Extras/AspNetAddIn/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/ChangeLog      2007-10-02 10:35:58 UTC 
(rev 86736)
+++ trunk/monodevelop/Extras/AspNetAddIn/ChangeLog      2007-10-02 11:27:37 UTC 
(rev 86737)
@@ -1,3 +1,8 @@
+2007-10-02  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * Project/VerifyCodeBehindBuildStep.cs: Make errors in Codebehind 
generation
+         into warnings rather than preventing build.
+
 2007-09-28  Michael Hutchinson <[EMAIL PROTECTED]> 
 
        * Project/AspNetAppProject.cs: Check for xsp before running it.

Modified: 
trunk/monodevelop/Extras/AspNetAddIn/Project/VerifyCodeBehindBuildStep.cs
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Project/VerifyCodeBehindBuildStep.cs   
2007-10-02 10:35:58 UTC (rev 86736)
+++ trunk/monodevelop/Extras/AspNetAddIn/Project/VerifyCodeBehindBuildStep.cs   
2007-10-02 11:27:37 UTC (rev 86737)
@@ -68,17 +68,21 @@
                                try {
                                        doc = aspProject.GetDocument (file);
                                } catch (Exception e) {
-                                       monitor.ReportWarning 
(string.Format("Parser failed on {0} with error {1}. Codebehind members for 
this file will not be added.", file, e.ToString ()));
+                                       monitor.ReportWarning (string.Format 
("Parser failed on {0} with error {1}. CodeBehind members for this file will 
not be added.", file, e.ToString ()));
                                }
                                
-                               if (doc != null) {
-                                       foreach (System.CodeDom.CodeMemberField 
member in doc.MemberList.List.Values) {
-                                               
MonoDevelop.Projects.Parser.IMember existingMember = 
BindingService.GetCompatibleMemberInClass (cls, member);
-                                               if (existingMember == null) {
-                                                       classesForMembers.Add 
(cls);
-                                                       membersToAdd.Add 
(member);
+                               try {
+                                       if (doc != null) {
+                                               foreach 
(System.CodeDom.CodeMemberField member in doc.MemberList.List.Values) {
+                                                       
MonoDevelop.Projects.Parser.IMember existingMember = 
BindingService.GetCompatibleMemberInClass (cls, member);
+                                                       if (existingMember == 
null) {
+                                                               
classesForMembers.Add (cls);
+                                                               
membersToAdd.Add (member);
+                                                       }
                                                }
                                        }
+                               } catch (Exception e) {
+                                       monitor.ReportWarning (string.Format 
("CodeBehind member generation failed on {0} with error {1}. Further CodeBehind 
members for this file will not be added.", file, e.ToString ()));
                                }
                        }
                        

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to