* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/FullTagsInText.aspx
Test/mainsoft/NunitWebResources/TagsExpressionsAndCommentsInText.aspx
2009-07-23 Marek Habersack <[email protected]>
* AspGenerator.cs: TextParsed takes a different approach to
post-processing text blocks now. It applies, in order, client-side
comment, tag and expression regular expressions to the text
and splits it into blocks of different types. Then the blocks are
processed accordingly.
svn path=/trunk/mcs/; revision=138474
* AspGenerator.cs: TextParsed must remove client-side comments
from the passed text before attempting to parse the text for
server side controls and expressions. Fixes bug #517656
2009-06-30 Marek Habersack <[email protected]>
* TemplateControlCompilerTest.cs: added test for bug #517656
2009-06-30 Marek Habersack <[email protected]>
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/ServerControlInClientSideComment.aspx
2009-06-30 Marek Habersack <[email protected]>
* NunitWebResources/ServerControlInClientSideComment.aspx: added
svn path=/trunk/mcs/; revision=137137
* AspGenerator.cs: CreateRootBuilder quits when root builder
already exist. This can happen when recursively parsing an include
file. Fixes bug #512028
svn path=/trunk/mcs/; revision=136096
* AspGenerator.cs: if plain text is parsed and it contains
server-side controls, parse and process them. Fixes bug #508888
2009-06-04 Marek Habersack <[email protected]>
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx
2009-06-04 Marek Habersack <[email protected]>
* TemplateControlCompilerTest.cs: added test for bug #508888
svn path=/trunk/mcs/; revision=135486
* AspGenerator.cs: before including a file specified with the
<!--#include file="" --> directive, check if it's within the
current application's root.
svn path=/trunk/mcs/; revision=134747
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx
2009-05-10 Marek Habersack <[email protected]>
* AspGenerator.cs: keep processing the tag if it is not a server
one and contains expressions and no code render blocks.
2009-05-10 Marek Habersack <[email protected]>
* TemplateControlCompilerTest.cs: added a test for expressions in
list control items.
svn path=/trunk/mcs/; revision=133861
* BuildManager.cs: RemoveFailedAssemblies wraps the compilation
exception to be rethrown in a HttpException instance.
* AspGenerator.cs: create a Location and pass it to the parser
before calling AddDirective from GetInheritedType, so that we get
meaningful exception messages with source, line information etc.
svn path=/trunk/mcs/; revision=133568
* ThemeDirectoryBuildProvider.cs: use new AspGenerator constructor
which takes AspComponentFoundery as its
parameter. AspGenerator.RootBuilder isn't initialized until after
the parser is initialized.
* TemplateControlCompiler.cs: make sure to call
ProcessGeneratedCode on each instance of ControlBuilder after it's
fully generated. Fixes bug #500075
* TemplateBuildProvider.cs: moved the directive regex to
AspGenerator
* BaseCompiler.cs: added two internal properties, BaseType and
DerivedType, which are used in calls to
ControlBuilder.ProcessGeneratedCode. Fixes bug #500075
* AspGenerator.cs: implemented a work around for our parser
limitation which is unable to extract the page/control's base type
before parsing the actual file contents. This is necessary to
support ASP.NET MVC's "generic" Inherits attribute. The reason we
need to find out what the base type is before parsing the file is
that we need to look at the type's custom attributes to see if a
root control builder type is specified (which is what ASP.NET MVC
does) and, if yes, use it instead of the default type. Fixes bug
#500075
2009-05-04 Marek Habersack <[email protected]>
* TemplateParser.cs: take RootBuilder from the associated
generator.
Allow the main page directive to be added twice if the parser
needs it. Used by AspGenerator when extracting the inherited type
name before actual parsing. Fixes bug #500075
* FileLevelControlBuilderAttribute.cs,
FileLevelPageControlBuilder.cs, FileLevelUserControlBuilder.cs:
implemented
* ControlBuilder.cs: added a new internal property,
DataBindingMethod.
Implemented ProcessGeneratedCode.
svn path=/trunk/mcs/; revision=133500
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx
2009-04-28 Marek Habersack <[email protected]>
* TemplateControlCompilerTest.cs: added test for bug #498637
2009-04-28 Marek Habersack <[email protected]>
* AspGenerator.cs: ProcessTag doesn't process a tag which is not
server-side and which has declarative expressions embedded. Fixes
bug #498637
2009-04-28 Marek Habersack <[email protected]>
* NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx: added
svn path=/trunk/mcs/; revision=132812
* System.Web_test.dll.sources: added
System.Web.UI/PageParserFilterTest.cs
2009-04-24 Marek Habersack <[email protected]>
* TemplateParser.cs: PageParserFilter.Initialize now takes just
one parameter.
* PageParserFilter.cs: a few alignments for .NET compatibility in
the default behavior.
2009-04-24 Marek Habersack <[email protected]>
* AspGenerator.cs: ProcessCode should _not_ stop processing the
passed code string if the filter's ProcessCodeConstruct returns
false. Fixes bug #497775
2009-04-24 Marek Habersack <[email protected]>
* PageParserFilterTest.cs: added
svn path=/trunk/mcs/; revision=132607
* AspGenerator.cs: if thead/tbody are parsed as children of a
server-side table control, ignore them. Fixes bug #481622
svn path=/trunk/mcs/; revision=131977
* AspParser.cs: local copy of checksum generated by the tokenizer
is made right after parsing is done.
* AspGenerator.cs: set tparser.MD5Checksum in Parse instead of in
InitParser. Avoids empty checksums in #pragma checksum.
svn path=/trunk/mcs/; revision=130971
* 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
* AspGenerator.cs:
TagParsed now better handles <script> tags. For both server and
client tags ProcessScript is called and the input text, in case of
client tags, is read verbatim to be processed when ProcessScript
is called to close the tag. At this point the verbatim text is
checked whether it contains server-side tags and/or expressions.
svn path=/trunk/mcs/; revision=129491
* AspGenerator.cs: when parsing nested tags (includes tags inside
client-side javascript script blocks) pass the closing tag up to
the containing parser.
Instead of parsing the whole plain text contents, plus the two
constructs we're interested in from it using regexs. This is
necessary as we might be passed JavaScript code and without
understanding its syntax we'll confuse the '<' character for the
start of a tag.
svn path=/trunk/mcs/; revision=129449
* AspGenerator.cs: when parsing nested tags (includes tags inside
client-side javascript script blocks) pass the closing tag up to
the containing parser.
svn path=/trunk/mcs/; revision=129412
* TagAttributes.cs: modified ToString to return string formatted
in a more helpful way.
* AspParser.cs: added ToString, helpful when debugging.
* AspGenerator.cs: properly print leading and trailing plain text
when looking for embedded tags in ProcessTagsInAttributes.
svn path=/trunk/mcs/; revision=128091
* AspTokenizer.cs: put_back now uses a stack and allows more than
one invocation when called inside a tag.
* AspGenerator.cs: when a nested parser is used, pay attention to
server tags found inside client tags and add them to the control
tree.
svn path=/trunk/mcs/; revision=127935
* 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
* AspGenerator.cs: implemented a work around which allows the
server controls embedded in client tag attributes to be parsed and
compiled.
svn path=/trunk/mcs/; revision=123397
* CodeBuilder.cs, RootBuilder.cs, CollectionBuilder.cs: updates
related to ControlBuilder cleanup.
* ControlBuilder.cs: code cleanup - no field should be visible
outside the class unless it's a constant or a read-only field.
2009-01-13 Marek Habersack <[email protected]>
* XmlBuilder.cs: updates related to ControlBuilder cleanup.
2009-01-13 Marek Habersack <[email protected]>
* TemplateControlCompiler.cs, AspGenerator.cs, BaseCompiler.cs,
GlobalAsaxCompiler.cs, PageThemeCompiler.cs: updates related to
ControlBuilder cleanup.
svn path=/trunk/mcs/; revision=123229
* LiteralStringControlBuilder.cs: added. Fixes bug #461214
* ControlBuilder.cs: added location tracking for literal string
children. Fixes bug #461214
* TemplateParser.cs: line pragmas are on by default. Fixes bug
#460479
2009-01-12 Marek Habersack <[email protected]>
* TemplateControlCompiler.cs: the LiteralStringControlBuilder
class is now used to track the location of the plain strings being
output to the generated code. Fixes bug #461214
* AspGenerator.cs: AppendLiteralString is called with the current
parser location as one of its parameters in FlushText (). Fixes
bug #461214
2009-01-12 Marek Habersack <[email protected]>
* System.Web.dll.sources: added
System.Web.UI/LiteralStringControlBuilder.cs
svn path=/trunk/mcs/; revision=123106
* AspGenerator.cs: ignore whitespace only if it's between
CodeRender blocks, not between DataBinding and
CodeRenderExpression.
svn path=/trunk/mcs/; revision=113844
* ControlBuilder.cs: CreatePropertyBuilder now correctly processes
property names with prefixes (e.g. 'prefix:PropertyName').
Original, parsed, tag name is stored to properly handle closing
tags.
2008-09-01 Marek Habersack <[email protected]>
* AspGenerator.cs:
CloseControl uses ControlBuilder's OriginalTagName property,
should the property/tag name be prefixed with 'prefix:'
svn path=/trunk/mcs/; revision=112003
* TemplateControl.cs: changed the way in which ParseControl is
implemented for the 2.0+ profile. Still not quite there, but
better and closer to .NET
2008-09-01 Marek Habersack <[email protected]>
* BaseCompiler.cs: AssignAppRelativeVirtualPath works with
null/empty parser.InputFile now.
* AspGenerator.cs: AddTypeToCache works checks whether inputFile
is null or empty and does not assume the dependencies ArrayList is
present.
* CachingCompiler.cs: expect the dependencies ArrayList to be null
or empty.
svn path=/trunk/mcs/; revision=111998
* TemplateParser.cs: added support for #pragma checksum
2008-05-28 Marek Habersack <[email protected]>
* AspParser.cs, AspGenerator.cs, BaseCompiler.cs: added support
for #pragma checksum
svn path=/trunk/mcs/; revision=104321
* AspGenerator.cs: if the last tag parsed was a code directive,
ignore any accumulated text if it's 100% whitespace.
svn path=/trunk/mcs/; revision=103541
* TemplateParser.cs: added a stack of include directories, to
properly resolve file relative paths when the #include file=""
directive is used. Fixes bug #324536
2008-05-07 Marek Habersack <[email protected]>
* AspGenerator.cs: push the include file directory to the parser
include directory stack and pop it after parsing the include, so
that the relative file paths are resolved correctly. Fixes bug
#324536
svn path=/trunk/mcs/; revision=102729
* SimpleWebHandlerParser.cs: refactoring - move code between
constructors, reader should be set before initializing the rest of
the object. Fixes bug #381364
* TemplateParser.cs: RegisterCustomControl must use absolute
virtual path when querying the virtual path provider for
file. Fixes bug #381364
2008-04-19 Marek Habersack <[email protected]>
* BuildManager.cs: use absolute virtual path to query the
VirtualPathProvider for path existence.
When ASP.NET is self-hosted, force
non-batch compilation. Fixes bug #380985
* ILocation.cs: added a new property, FileText.
* Location.cs: added implementation of the ILocation.FileText
property.
* ParseException.cs: use the new ILocation.FileText, if defined,
to get the file source.
* AspGenerator.cs: when TextReader is present, use it to read with
the VirtualPathProvider to read the file source. Fixes bug #381364
* AspParser.cs: added a new property FileText to provide the file
contents which was read in the constructor.
svn path=/trunk/mcs/; revision=101177
* SimpleWebHandlerParser.cs, TemplateParser.cs, AspGenerator.cs:
make sure streams are disposed the way they should be.
svn path=/trunk/mcs/; revision=100685
* AspGenerator.cs: in 2.0+, aspx files which contain the Content
controls can contain only them, whitespace and directives. Fixes
bug #339747
svn path=/trunk/mcs/; revision=96837
* AspGenerator.cs: introduced a new overload for the Parse method
which accepts a bool indicating whether or not to initialize the
parser. The overload is used when parsing server-side
includes. Fixes bug #357498
svn path=/trunk/mcs/; revision=94869
* 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
* TemplateParser.cs: added a wrapper class for server-side script
snippets, to keep track of locations.
Store main directive location for later use in DirectiveLocation
internal property.
2008-01-02 Marek Habersack <[email protected]>
* TemplateControlCompiler.cs: add line pragma wherever necessary.
* PageCompiler.cs: reorder the statements to match MS.NET output.
Output line pragma information for directive attributes.
* BaseCompiler.cs: add a set of AddLinePragma methods for various
CodeDOM elements.
Output line pragmas when adding server-side scripts to the CodeDOM
tree.
* AspGenerator.cs: use ServerSideScript to store script location
in the original file.
* UserControlCompiler.cs: output line pragmas for the init
method.
svn path=/trunk/mcs/; revision=92125
* OutputCacheModule.cs: use Context.InternalCache.
* Cache.cs: 2.0 profile uses generic containers to keep the cache
entries.
Gotten rid of the InsertPrivate and InsertInternal methods. The
latter was moved to one of the Insert overloads.
Private entries are no longer handled specifically, because the
internal cache is now kept in a separate object.
2007-06-20 Marek Habersack <[email protected]>
* AppResourcesCompiler.cs: use HttpRuntime.InternalCache to keep
private entries.
* CachingCompiler.cs: as above
* AspGenerator.cs: as above
2007-06-20 Marek Habersack <[email protected]>
* DataSourceCacheManager.cs: use HttpContext.Current.InternalCache
to keep private entries.
* XmlDataSource.cs: as above
2007-06-20 Marek Habersack <[email protected]>
* SessionInProcHandler.cs: use HttpRuntime.InternalCache to keep
private entries.
2007-06-20 Marek Habersack <[email protected]>
* SessionInProcHandler.cs: use HttpRuntime.InternalCache to keep
the internal entries.
2007-06-20 Marek Habersack <[email protected]>
* BasePartialCachingControl.cs: use HttpRuntime.InternalCache to
keep the private entries.
2007-06-20 Marek Habersack <[email protected]>
* HttpRuntime.cs: added new internal property, InternalCache, to
keep all the internal cache entries instead of mixing them with
the public cache ones.
Do not invoke Cache.InvokePrivateCallbacks - this method no longer
exists.
* HttpResponse.cs: private entries are now kept in
Context.InternalCache.
* HttpContext.cs: added new internal property, InternalCache,
which returns the HttpRuntime.InternalCache value.
Fixes bug #81690
svn path=/trunk/mcs/; revision=80321
* TemplateParser.cs: added support for implicit language
detection. If the language isn't set explicitly in the Page
directive, the language value taken from the configuration
considered to be implicit - that is, it can be overwritten by the
first <script> with the runat="server" and language="xx" sets the
language for the parser. This makes it possible to have the
default language set to "C#" and the inline code in, e.g.,
VisualBasic.
2007-05-07 Marek Habersack <[email protected]>
* AspGenerator.cs: if the parser's language is implicit (i.e. set
from the default configuration), the first script with the
language attribute present sets the language of the parser.
svn path=/trunk/mcs/; revision=76870