[Nettiers-commit] SF.net SVN: nettiers: [709] source/trunk/Source

[<ms...@us...>]

Revision: 709
          http://nettiers.svn.sourceforge.net/nettiers/?rev=709&view=rev
Author:   mshatny
Date:     2008-03-19 06:13:53 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------
[FIX] Fixed design-time entitygridview rendering in VS2008 (contrib. voracious, C#Bob)

Modified Paths:
--------------
    source/trunk/Source/DataAccessLayer/DataRepository.cst
    source/trunk/Source/NetTiers.cst
    source/trunk/Source/WebLibrary/UI/EntityGridView.cs.cst
    source/trunk/Source/changes.log

Modified: source/trunk/Source/DataAccessLayer/DataRepository.cst
===================================================================
--- source/trunk/Source/DataAccessLayer/DataRepository.cst	2008-03-16 23:34:04 UTC (rev 708)
+++ source/trunk/Source/DataAccessLayer/DataRepository.cst	2008-03-19 13:13:53 UTC (rev 709)
@@ -8,6 +8,7 @@
 <%@ Property Name="SourceTables" Type="SchemaExplorer.TableSchemaCollection" Category="Connection" Description="Tables of the system." %>
 <%@ Property Name="SourceViews" Type="SchemaExplorer.ViewSchemaCollection" Category="Connection" Description="Tables of the system." %>
 <%@ Property Name="IncludeDesignTimeSupport" Type="System.Boolean" Default="true" Category="05. WebLibrary - Advanced" Description="Indicates if Visual Studio design-time support should be provided for the Web Library controls." %>
+<%@ Property Name="VisualStudioVersion" Type="MoM.Templates.VSNetVersion" Default="v2005" Category="02. Framework Generation - Optional" Description="Indicates the Version of Visual Studio to target. Options include v2005 and v2008" %>
 #region Using directives
 
 using System;
@@ -238,7 +239,8 @@
 			String path = null;
 
 			// Get an instance of the currently running Visual Studio IDE.
-			EnvDTE80.DTE2 dte = (EnvDTE80.DTE2) System.Runtime.InteropServices.Marshal.GetActiveObject("VisualStudio.DTE.8.0");
+			EnvDTE80.DTE2 dte = <%=String.Format("(EnvDTE80.DTE2) System.Runtime.InteropServices.Marshal.GetActiveObject(\"VisualStudio.DTE.{0}\");", GetMSBuildExtensionsVersionString(VisualStudioVersion))%>
+			
 			if ( dte != null )
 			{
 				dte.SuppressUI = true;

Modified: source/trunk/Source/NetTiers.cst
===================================================================
--- source/trunk/Source/NetTiers.cst	2008-03-16 23:34:04 UTC (rev 708)
+++ source/trunk/Source/NetTiers.cst	2008-03-19 13:13:53 UTC (rev 709)
@@ -1,4 +1,4 @@
-<%@ CodeTemplate Src="TemplateLib/CommonSqlCode.cs" Inherits="MoM.Templates.CommonSqlCode" Language="C#" TargetLanguage="Text" Description="NetTiers main template." Debug="True" ResponseEncoding="UTF-8" NoWarn="0108,0618,1572,1573,1574,0162,2002"%>
+<%@ CodeTemplate Src="TemplateLib/CommonSqlCode.cs" Inherits="MoM.Templates.CommonSqlCode" Language="C#" TargetLanguage="Text" Description="NetTiers main template." Debug="True" ResponseEncoding="UTF-8" NoWarn="0108,0618,1572,1573,1574,0162,2002"%>
 <%@ Assembly Name="SchemaExplorer" %>
 <%@ Assembly Name="System.Design" %>
 <%@ Assembly Name="System.DirectoryServices" %>
@@ -1777,6 +1777,7 @@
 			this.GetTemplate("DataRepository.cst").SetProperty("SourceTables", templateSourceTables);
 			this.GetTemplate("DataRepository.cst").SetProperty("SourceViews", templateSourceViews);
 			this.GetTemplate("DataRepository.cst").SetProperty("IncludeDesignTimeSupport", IncludeDesignTimeSupport);
+			this.GetTemplate("DataRepository.cst").SetProperty("VisualStudioVersion", VisualStudioVersion);
 			this.RenderToFile("DataRepository.cst", rootPathDAL + "\\DataRepository.cs", true);
 			
 			AddFileNode(commonNode, "IEntityProvider.cs");

Modified: source/trunk/Source/WebLibrary/UI/EntityGridView.cs.cst
===================================================================
--- source/trunk/Source/WebLibrary/UI/EntityGridView.cs.cst	2008-03-16 23:34:04 UTC (rev 708)
+++ source/trunk/Source/WebLibrary/UI/EntityGridView.cs.cst	2008-03-19 13:13:53 UTC (rev 709)
@@ -361,7 +361,7 @@
 
             if (!String.IsNullOrEmpty(this.DataSourceID))
             {
-                if (Page.IsPostBack == false)
+                if (Page.IsPostBack == false && base.DesignMode == false)
                 {
                     this.Sort(DefaultSortColumnName, _defaultSortDirection);
                 }

Modified: source/trunk/Source/changes.log
===================================================================
--- source/trunk/Source/changes.log	2008-03-16 23:34:04 UTC (rev 708)
+++ source/trunk/Source/changes.log	2008-03-19 13:13:53 UTC (rev 709)
@@ -1,4 +1,7 @@
-.netTiers v2.2.0.708
+.netTiers v2.2.0.709
+
+03/19/2008
+	- [FIX] Fixed design-time entitygridview rendering in VS2008 (contrib. voracious, C#Bob)
 03/16/2008
 	- [ENH] Enhancement to the generated client-side javascript in EntityDropDownList.cs to pass the W3C validation (contrib. CitizenBane)
 03/09/2008


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.