* PageParser.cs: handle several main directive attributes
specially, as they can have expressions as their values. Fixes bug
#603532
* MainDirectiveAttribute.cs: added - helper class to handle
directive attributes which can take either a value or an
expression.
* BaseParser.cs: IsDirective, IsExpression and IsDataBound methods
moved to here from TemplateControlCompiler.
2010-05-19 Marek Habersack <[email protected]>
* TemplateControlCompiler.cs: IsDirective, IsExpression and
IsDataBound methods moved to System.Web.UI.BaseParser.
Made CompileExpression and GetFieldOrProperty methods internal.
* PageCompiler.cs: check several of the Page directive attributes
for expressions. Fixes bug #603532
* AspGenerator.cs, TagAttributes.cs: use IDictionary instead of
Hashtable
svn path=/trunk/mcs/; revision=157519
- made sure invariant culture is used with String.ToLower, String.ToUpper and String.Compare
- replaced all calls to CultureInfo.InvariantCulture with a reference to a static field System.Web.Util.Helpers.InvariantCulture
svn path=/trunk/mcs/; revision=143587
* BuildManager.cs: when BuildInner catches a compilation
exception, wrap it in HttpException before re-throwing.
2009-04-30 Marek Habersack <[email protected]>
* TemplateParser.cs: removed the PageParserFilterTypeName
property, the filter type name is looked up on demand now.
* ApplicationFileParser.cs, MasterPageParser.cs,
UserControlParser.cs: load config defaults explicitly after
initializing the instance.
svn path=/trunk/mcs/; revision=133169
* All of the below are part of the fix for bug #489687
* ThemeDirectoryCompiler.cs: pass VirtualPath instances to parser
constructors.
* BuildProvider.cs: associated virtual path is stored internally
as an instance of VirtualPath, accessible via new
VirtualPathInternal property.
* BuildManagerDirectoryBuilder.cs: VirtualPath.IsFake is used to
detect fake virtual paths.
GetBuildProvider now takes a VirtualPath instead of string for the
virtualPath parameter. The passed VirtualPath instance is passed
unchanged to BuildProvider.
* BuildManager.cs: AssertVirtualPathExists now uses
VirtualPath.IsFake to check for fake virtual paths.
* ApplicationFileBuildProvider.cs, GenericBuildProvider.cs,
MasterPageBuildProvider.cs, PageBuildProvider.cs,
ThemeBuildProvider.cs, UserControlBuildProvider.cs,
WebHandlerBuildProvider.cs, WebServiceBuildProvider.cs:
CreateParser overloads now take a VirtualPath instead of a string
for the virtualPath parameter.
* ThemeBuildProvider.cs: use new parser constructors which take
VirtualPath instances instead of strings.
2009-03-31 Marek Habersack <[email protected]>
* VirtualPath.cs: added code to detect whether the VirtualPath
instance represents a fake virtual path (IsFake property).
Added new property DirectoryNoNormalize which returns
non-normalized directory for the VirtualPath instance.
Made ToString () a bit more friendly and well-behaved.
2009-03-31 Marek Habersack <[email protected]>
* ApplicationFileParser.cs, MasterPageParser.cs, PageParser.cs,
PageThemeFileParser.cs, PageThemeParser.cs, UserControlParser.cs,
WebHandlerParser.cs, WebServiceParser.cs: 2.0 constructors take a
VirtualPath instance for the virtualPath parameter, instead of a
string.
svn path=/trunk/mcs/; revision=130665
* AspParser.cs: added an event raised when parsing is complete.
* AspGenerator.cs: added support for PageParserFilter which, if
found, is used to control certain aspects of code parsing
(accepting/rejecting control types, accepting/rejecting code
snippets, parsing completion)
Added the AddControl method, used by PageParserFilter when a
custom filter wants to inject a control in the current control
builder tree.
2009-02-13 Marek Habersack <[email protected]>
* TemplateParser.cs: PageParserFilter handling moved to here.
PagesConfig must use the current virtual path when retrieving the
section, or otherwise we'll miss the lower level web.configs.
Added the AddControl method, used by PageParserFilter.
Implementing filtering of: parsed directives and the base type, if
a page parser filter is present.
* PageParserFilter.cs: added missing 3.5 members and implemented
everything.
* PageParser.cs: moved PageParserFilter processing to
TemplateParser.
VirtualPath must be set before anything else.
Call page parser filter's directive preprocessing code from
AddDirective if a filter is present and a mastertype or
previouspagetype directive is parsed.
* MasterPageParser.cs: when PageParserFilter is present use it to
preprocess the MasterType directive.
svn path=/trunk/mcs/; revision=126855
* MasterPageParser.cs: do not compile anything while
parsing. MasterType virtual path is not compiled, but stored for
later. It is compiled when the MasterType property is requested
from within MasterPageCompiler.
* PageParser.cs: do not compile anything while
parsing. MasterPageFile, MasterType and PreviousPageType virtual
paths aren't compiled but checked for existence and stored for
later. Actual compilation happens when the MasterType and
PreviousPageType are requested from within PageCompiler.
* BaseParser.cs: added a new helper method, ThrowParseFileNotFound.
2008-12-10 Marek Habersack <[email protected]>
* ParseException.cs: made serializable.
* PageCompiler.cs: CreateStronglyTypedProperty calls
AddReferencedAssembly to add type's assembly to the unit's
references after the typed property has been created.
* BaseCompiler.cs: added a new helper method,
AddReferencedAssembly to be used whenever an assembly location
needs to be added to the compilation unit's list after the parsing
is done (e.g. when processing PreviousPageType or MasterPageType
properties in PageParser)
2008-12-10 Marek Habersack <[email protected]>
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/MissingMasterFile.aspx
* System.Web_test.dll.sources: added System.Web.UI/PageParserTest.cs
2008-12-10 Marek Habersack <[email protected]>
* NunitWebResources/MissingMasterFile.aspx: added
2008-12-10 Marek Habersack <[email protected]>
* PageParserTest.cs: added
svn path=/trunk/mcs/; revision=121181
* System.Web.dll.sources: added
System.Web.Compilation/AspComponent.cs
2008-11-25 Marek Habersack <[email protected]>
* RootBuilder.cs: use new API in AspComponentFoundry to retrieve
registered control type.
* TemplateControlParser.cs: AddControlImports () removed. Its
functionality is now implemented in ControlBuilder.AddChild in a
more elegant, fine grained and correct way.
* TemplateParser.cs: replaced some "" with String.Empty
* ControlBuilder.cs: AddChild now adds an import for child's
namespace if the control being added has been registered in the
web.config file. Possible fix for #447896 and #447898
* PageParser.cs, MasterPageParser.cs: do not call
AddControlImports, it no longer exists.
2008-11-25 Marek Habersack <[email protected]>
* AspComponentFoundry.cs: GetComponentType methods replaced with
GetComponent returning an instance of AspComponent which fully
describes the registered item. Components are cached, indexed by
full tag name.
* AspComponent.cs: added
svn path=/trunk/mcs/; revision=119893
* TemplateControlParser.cs: added internal method
AddControlImports which adds namespaces named in the
pages/controls section of web.config
* MasterPageParser.cs: unconditionally add namespaces named in the
pages/controls section of web.config.
* PageParser.cs: add namespaces named in the pages/controls
section of web.config to the page whenever it uses a master page.
svn path=/trunk/mcs/; revision=116858
* WebHandlerBuildProvider.cs: derive from the new
SimpleBuildProvider class.
* BuildManager.cs: full implementation of the batch compilation
for the 2.0 profile. The implementation is most probably different
to MS.NET's but the effects are the same (or nearly the same -
there are some minor differences). There are missing bits and
pieces, but minor ones - to be added later.
* SimpleBuildProvider.cs: new build provider abstract class
deriving from the GenericBuildProvider that implements common code
for building web handlers and web services.
* GenericBuildProvider.cs: new generic abstract class used to
implement base builder code for all the build provider types and
maximize code reuse.
* PageBuildProvider.cs: derive from the new TemplateBuildProvider
class and implement all the necessary abstract members.
Handle "fake" virtual paths, to properly support generating of the
WSDL helper code.
* BuildProvider.cs: SetVirtualPath now converts the passed path to
absolute URL.
Added internal virtual method GenerateCode, used by derived
classes.
SetCommonParameters no longer sets the referenced assemblies, this
is done in BuildManager now.
Added an internal virtual property CodeUnit which returns the
build provider's compilation unit.
* PageCompiler.cs: fix assignment of base types for asynchronous
pages, to match MS.NET.
For asynchronous pages, add the necessary methods generation.
* BaseCompiler.cs: default namespace is now set using a constant.
Renamed the Init method into ConstructType, to better reflect its
purpose and made the method internal - it is used by the build
providers.
Added several CreateProvider overloads for easier and more unified
compilation provider creation.
Added an internal MainClassType property to enable class type name
retrieval from other parts of the class hierarchy.
* ApplicationFileBuildProvider.cs: new build provider deriving
from the TemplateBuildProvider class to compile the global.asax
file.
* AspGenerator.cs: properly handle parsers which have no input
file path given, but use TextReader instead.
Dependencies are virtual paths now, convert them to physical ones
before creating cache dependency.
* CachingCompiler.cs: parser dependencies are virtual paths now,
convert them to physical ones before creating cache dependency.
* AssemblyBuilder.cs: full implementation of the documented
functionality as well as a lot of internal build code
added. Produces assemblies using the same style what MS.NET for
temporary and target file naming. Handles partial type squashing
if the same partial type is used by several code compile units
added to the same builder instance.
* MasterPageBuildProvider.cs: use the new TemplateBuildProvider
base class and add implementation of all the abstract methods
required by it.
* ThemeDirectoryBuildProvider.cs: new build provider to compile
theme directories. Replaces the old ThemeDirectoryCompiler class.
* UserControlBuildProvider.cs: use the new TemplateBuildProvider
base class and add implementation of all the abstract methods
required by it.
* TemplateBuildProvider.cs: new internal abstract class which
implements the common tasks for all the template control build
providers.
* WebServiceBuildProvider.cs: use the new SimpleBuildProvider base
type to implement building.
2008-01-24 Marek Habersack <[email protected]>
* PageThemeFileParser.cs: the DefaultBaseType property removed.
* ApplicationFileParser.cs: added constructor which takes a
TextReader.
Removed the DefaultBaseType property.
Added the Reader property.
* MasterPage.cs: use BuildManager to create page instance.
* WebHandlerParser.cs: added a compatibility constructor.
* TemplateControl.cs: GetTypeFromControlPath uses
BuildManager.GetCompiledType for the 2.0+ profile.
* WebServiceParser.cs: added a compatibility internal
constructor.
* SimpleWebHandlerParser.cs: properly treat context and
physicalPath parameters to the constructor, especially for the
2.0+ profile where they are obsolete.
Dependencies are added using virtual paths.
* PageThemeParser.cs: DefaultBaseType property removed.
* Page.cs: Style sheets and themes are compiled using
BuildManager.
Previous page instance is compiled using BuildManager for the 2.0+
profile.
* MasterPageParser.cs: Use BuildManager to create instance and
compile types.
Dependencies are added using virtual paths.
* SimpleHandlerFactory.cs: Use
BuildManager.CreateInstanceFromVirtualPath for the 2.0+ profile.
* UserControlParser.cs: if the parser is created using a
TextReader, take the input file path from the virtual path.
Added a new internal constructor which takes both a TextReader and
an inputFile parameters.
Set base type to the default in the constructors.
Use virtual path when setting master page dependency.
DefaultBaseTypename doesn't use a literal string in the 2.0+
profile, it gets the base type from the application
configuration.
* TemplateControlParser.cs: Dependency on a control/page mentioned
in the Reference directive is registered using the virtual path.
TextReader property is an override now.
* TemplateParser.cs: RegisterCustomControl adds a dependency on
the virtual path, not the physical path. The custom control is
compiled using BuildManager.GetCompiledType for the 2.0+ profile.
RegisterNamespace does not add a dependency on the assembly.
LoadType does not add a dependency on the assembly.
Legacy Src attribute is handled properly now.
Dependency on code-behind (Src and CodeFile directive attributes)
is added using the code-behind file's virtual path.
GetAssemblyFromSource adds a dependency using the virtual path.
DefaultBaseType implemented here, using DefaultBaseTypeName which
is implemented in the descendant classes.
Added internal CodeBehindSource property, used by build
providers.
ClassName property works correctly if inputFile is missing
(e.g. when the parser has been created using a TextReader)
Added a virtual internal property TextReader to return the readed
which has been used to create the parser instance.
* PageHandlerFactory.cs: GetHandler uses
BuildManager.CreateInstanceFromVirtualPath for the 2.0+ profile.
* PageParser.cs: set the default base type in the constructors.
If the input file is not passed to a constructor, take the input
file path from the virtual path.
GetCompiledPageInstance uses BuildManager.CreateInstanceFromVirtualPath
for the 2.0+ profile.
MasterPage dependency is set using the virtual path of the master
page.
MasterPage is compiled into a type using BuildManager.GetCompiledType.
GetCompiledPageType uses BuildManager.GetCompiledType for the 2.0
profile.
DefaultBaseType override removed, it is implemented in the
TemplateParser class.
DefaultBaseTypename doesn't use a literal string in the 2.0+
profile, it gets the base type from the application
configuration.
2008-01-24 Marek Habersack <[email protected]>
* HttpApplicationFactory.cs: use BuildManager.GetCompiledType to
build the application (global.asax) file.
svn path=/trunk/mcs/; revision=93848
* ClientScriptManager.cs, MasterPageParser.cs, Control.cs,
Page.cs: speed optimization - use String.Concat instead of
String.Format in some cases.
2007-12-13 Marek Habersack <[email protected]>
* Menu.cs, TreeView.cs: optimize use of String.Format in
OnPreRender.
Speed optimization - use String.Concat instead of String.Format in
some cases.
* GridView.cs, DetailsView.cs: optimize use of String.Format in
OnPreRender.
* CheckBox.cs, AccessDataSource.cs, WebColorConverter.cs,
WebControl.cs,TextBox.cs, DropDownList.cs, ValidationSummary.cs,
ListBox.cs, Panel.cs, BaseValidator.cs, LinkButton.cs: speed
optimization - use String.Concat instead of String.Format in some cases.
2007-12-13 Marek Habersack <[email protected]>
* HtmlForm.cs, HtmlButton.cs: speed optimization - use String.Concat
instead of String.Format in some cases.
2007-12-13 Marek Habersack <[email protected]>
* AssemblyResourceLoader.cs: speed optimization - use String.Concat
instead of String.Format in some cases.
2007-12-13 Marek Habersack <[email protected]>
* SessionId.cs:
speed optimization - use String.Concat
instead of String.Format in some cases.
2007-12-13 Marek Habersack <[email protected]>
* SqlProfileProvider.cs, ProfileParser.cs: speed optimization -
use String.Concat instead of String.Format in some cases.
2007-12-13 Marek Habersack <[email protected]>
* ApplicationManager.cs, ApplicationHost.cs,
DefaultVirtualPathProvider.cs: speed optimization - use
String.Concat instead of String.Format in some cases.
svn path=/trunk/mcs/; revision=91230
* TemplateParser.cs: add the file pointed to by the Src or
CodeFile attributes to the list of page cache dependencies.
* PageParser.cs, UserControlParser.cs: Add the MasterPage file to
the list of page cache dependencies.
* MasterPageParser.cs: add the source pointed to by VirtualPath to
the list of cache dependencies.
svn path=/trunk/mcs/; revision=88403
* MasterPage.cs: use the place holder IDs collection instead of
the placholder collection to see if we have the place holder in
the master page. Fixes bug #82485.
* MasterPageParser.cs: store the content place holder ids in the
internal cache to gain access to them when needed.
2007-08-20 Marek Habersack <[email protected]>
* ContentPlaceHolderBuilder.cs: store place holder id in the
parser's internal place holder id list for later reference. Fixes
bug #82485.
svn path=/trunk/mcs/; revision=84441
* Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs:
* Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master:
* Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx:
* System.Web.UI/MasterPageParser.cs:
* System.Web.dll.sources:
* System.Web.Compilation/MasterPageCompiler.cs:
* System.Web.Compilation/AspGenerator.cs: add support for the MasterType
directive for master pages.
Patch by Joel Reed.
svn path=/trunk/mcs/; revision=65748
* MasterPage.cs: rework this file, adding some static methods
gleaned from MS stack traces, and clear up the propogation of
content templates between nested master pages.
* Control.cs (TemplateControl): implement.
* TemplateControl.cs: re-indent some of the code.
(ReadStringRecource): according to msdn2, these throw
NotSupportedException.
* MasterPageParser.cs (HandleOption): implement. assign our
master page's MasterPageFile from the UserControl property.
* UserControl.cs (InitializeAsUserControlInternal): new method
that allows initialization without a page.
* UserControlParser.cs (ProcessMainAttributes): for 2.0 handle
MasterPageFile attributes, so we can have nested master pages.
(MasterPageFile): add a 2.0 specific property.
* TemplateControlParser.cs: in .net 2.0, our base class is
BaseTemplateParser.
(HandleOptions): be consistent and call base.HandleOptions.
* BaseTemplateParser.cs: new (stubbed) class.
* MasterPageControlBuilder.cs: new file, not filled in (and really
not used either.)
* Page.cs (InternalProcessRequest): call ApplyMasterPage.
(SaveExistingContentTemplates): nuke.
(ReapplyExistingContentTemplate): nuke.
(ApplyMasterPage): if we have a master page, call
MasterPage.ApplyMasterPageRecursive with it and add it to our
controls.
(set_MasterPageFile): remove call to SaveExistingContentTemplates.
(get_Master): call MasterPage.CreateMasterPage.
(AddContentTemplate): keep track of the page's content templates
in a local Hashtable - they aren't our master page's content
templates.
svn path=/trunk/mcs/; revision=56620
* PageParser.cs: Added MasterType property. Get the type from the
MasterType directive.
* MasterPageParser.cs: Added GetCompiledMasterType method.
svn path=/trunk/mcs/; revision=45884
* PageParser.cs: Read the MasterPageFile attribute.
* UserControlParser.cs: Not sealed any more since we need to inherit from
it. Added new constructor with an additional "type" parameter.
* MasterPageParser.cs: Parser for master pages.
* Page.cs: Added support for master pages.
* MasterPage.cs: Implemented.
svn path=/trunk/mcs/; revision=39318