Commit Graph
1157 Commits
Author SHA1 Message Date
Marek Habersack 885455cc37 [asp.net] Fix for bug #681421. Use VirtualPathProvider.CombineVirtualPaths
The method is used by the parsers to look up dependencies, sources, controls
and master pages.
2011-03-22 21:24:59 +01:00
Marek Habersack 5f5d73fbdb [asp.net] Use List <string> instead of ArrayList to keep assembly locations in TemplateParser 2011-03-22 21:24:59 +01:00
Marek Habersack bc0cb19ea9 [asp.net] Use List <string> instead of ArrayList to keep file dependencies 2011-03-22 21:24:58 +01:00
Marek Habersack 11161ffcfb [asp.net] Implemented the 4.0 type, FileLevelMasterPageControlBuilder 2011-01-13 20:11:15 +01:00
Jérémie Laval 09185b9e81 Add support for storing elements with the same hashcode in ConcurrentDictionary. Add corresponding unit test. 2010-12-16 13:39:32 +00:00
Jérémie Laval 8e89861961 Plug SplitOrderedList inside TemplateControl. 2010-11-22 18:05:20 +00:00
Marek Habersack 90248a3bd1 [asp.net] Part of fix for bug #653013. StateManagedCollection must perform a full clear in LoadViewState
If all the items in the collections were saved to the view state, the collection must call the Clear ()
method in order for the OnClear and OnClearComplete methods to be invoked. Telerik RadComboBox depends
on it to remove dynamically added entries before they are recreated when the view state is loaded by
the control.
2010-11-17 14:11:11 +01:00
Daniel J Sell d53c11003d [asp.net] Fix for bug #653192. making MasterPageFile handle relative paths
MasterPageFile should be relative to the file being parsed, not the
request path
2010-11-12 11:21:40 +01:00
Marek Habersack 218262b92a [asp.net] A micro-optimization to not call String.Format too much in a loop. 2010-11-09 01:39:49 +01:00
Gonzalo Paniagua Javier fc51c16274 Avoid locking in WireupAutomaticEvents
Replace a big lock with a ReaderWriterLockSlim.
2010-11-03 16:29:05 -04:00
Marek Habersack 19e5207189 [asp.net] Fix for bug #649551. The LosFormatter (bool, string) constructor does not expect a base64-encoded string.
Telerik controls pass the string "string" as the macKeyModifier parameter to the constructor. Tests show that .NET
accepts such input without throwing an error. The passed string is now converted into a byte array and passed to
the LosFormatter (bool, byte[]) constructor.
2010-10-29 15:53:19 +02:00
Marek Habersack 67ad55bc49 [asp.net] Fix for bug #649034. Control.FindControl continues to search for controls above itself if it's a naming container.
When a control is a naming container and an attempt to find a control with non-segmented id (e.g. 'myControl') is made,
the search continues to the control's naming container if pathOffset is 0, that is we're at the start of the search.
2010-10-29 14:44:56 +02:00
Marek Habersack 244ae1ff20 [asp.net] Fix for bug #646479. Do not call control's OnLoad twice when it is dynamically added.
Control.AddedControl will call the new control's LoadRecursive which would trigger its OnLoad
handler. OnLoad must be called only if control hasn't already been loaded.
2010-10-28 15:59:18 +02:00
Marek Habersack 30bbf985d2 [asp.net] Fix for bug #646984. Theme stylesheets must be output in correct order.
This patch changes the way we output theme stylesheets to match .NET behavior. Theme
.css files are sorted using an ordinal and case-insensitive comparer and are output
to the page at the top of the <head> element's contents instead of at the end.
2010-10-27 14:23:21 +02:00
Marek Habersack 8af1840778 [asp.net] Added encryption notes to ObjectStateFormatter.{Serialize,Deserialize} 2010-10-27 01:09:13 +02:00
Marek Habersack 94d7d01269 [asp.net] Fix for bug #649198. Implement MasterPage.InstantiateInContentPlaceHolder
Code based on patch from Rikard Johansson <[email protected]>, thanks!
2010-10-26 12:00:29 +02:00
Marek Habersack 8aa83da53e [asp.net] ObjectStateFormatter.{De}serialize methods taking stream use a magic value to mark the stream. 2010-10-21 01:21:53 +02:00
Marek Safar aad016fd87 Clean up few more warnings 2010-10-15 15:20:25 +01:00
Sebastien Pouliot 21d2c6aedb A few moves/changes following previous patch review
* Makefile: Compile tests with TEST defined (to include System.Web.Util.
MachineKeySectionUtils unit tests)
* System.Web.dll.sources: Move MachineKeySectionUtils.cs from System.
Web.Configuration_2.0 to System.Web.Util
* System.Web_test.dll.sources: Move MachineKeySectionUtilsTest.cs from
System.Web.Configuration_2.0 to System.Web.Util

* System.Web.Configuration_2.0/MachineKeySection.cs: Adjust using
clauses. Uncomment some code. Fix TripleDES versus 3DES for Validation
under NET_4_0. Remove 'private' on fields/methods.
* System.Web.Handlers/AssemblyResourceLoader.cs: Adjust using clauses
* System.Web.Security/MembershipHelper.cs: Adjust using clauses
* System.Web.Security/RolePrincipal.cs: Adjust using clauses
* System.Web.SessionState_2.0/SessionId.cs: Adjust using clauses
* System.Web.UI/LosFormatter.cs: Adjust using clauses.
* System.Web.Util/MachineKeySectionUtils.cs: Moved from System.Web.
Configuration_2.0. Rename namespace and remove 'internal' on type
declaration

* Test/System.Web.Util/MachineKeySectionUtilsTest.cs: Moved from Test/
System.Web.Configuration/MachineKeySectionTest.cs. Add test case for
TripleDES versus 3DES
2010-10-12 11:38:48 -04:00
Sebastien Pouliot a22389fde2 Normalization of cryptographic uses in asp.net
* System.Web.Configuration_2.0/MachineKeyRegistryStorage.cs:
Remove key length check and generic key generation.

* System.Web.Configuration_2.0/MachineKeySection.cs: Add support for 4.0
ValidationAlgorithm and the use of custom algorithms (validation and
decryption). Allow the use of any, valid, key length (based on the
algorithm). Let each algorithm creates its own key (e.g. special needs,
default length...)

* System.Web.Configuration_2.0/MachineKeySectionUtils.cs: Remove key
generation (from random) code and 192bits key length hack (won't work
with custom algorithms). Add support for new (4.0) algorithms, including
custom ones. Provide uniform/shared code to Encrypt/Decrypt, Sign/Verify
and EncryptSign/VerifyDecrypt using MachineKeySection data.

* System.Web.Configuration_2.0/MachineKeyValidation.cs: Add new (4.0)
values.

* System.Web.Configuration_2.0/MachineKeyValidationConverter.cs: Add
support for new (4.0) algorithms.

* System.Web.Handlers/AssemblyResourceLoader.cs: Use the new common
cryptographic code and base64 the encrypted data.

* System.Web.Security/FormsAuthentication.cs: Use the new common
cryptographic code and base64 the signed and/or encrypted data.

* System.Web.Security/MembershipHelper.cs: Use the new common
cryptographic code - this should be 100% compatible with existing data.

* System.Web.Security/RolePrincipal.cs: Use the new common cryptographic
code.

* System.Web.Security/SqliteMembershipProvider.cs: Adapt code for
internal API change.

* System.Web.UI/LosFormatter.cs: Adapt code for internal API change.
Fix some small behaviro changes wrt NET_4_0

* System.Web.UI/ObjectStateFormatter.cs: Use the new common cryptographic
code.

* System.Web.UI/Page.cs: Remove code that is now unneeded (with the new
common cryptogrraphic code).

* System.Web.Configuration_2.0/MachineKeyCompatibilityMode.cs: New.

* Test/System.Web.Configuration/MachineKeyValidationConverterTest.cs:
Add more, mostly 4.0, test cases.

* Test/System.Web.Security/FormsAuthenticationTest.cs: Add test case to
ensure HashPasswordForStoringInConfigFile is not case sensitive.

* Test/System.Web.UI/LosFormatterTest.cs: Add some rountrip test cases
with the different ctors
2010-10-12 11:38:47 -04:00
Marek Habersack 6a5b23824c [asp.net] HiddenFieldPageStatePersister must not attempt to deserialize an empty/null string 2010-10-12 15:33:19 +02:00
Marek Habersack 83876018b4 [asp.net] Fix for bug #643298. A typo prevented the EnableViewStateMac from being recognized in the Page directive. 2010-10-05 08:04:16 +02:00
Marek Habersack 8fd3e7fae6 [asp.net] Fix for bug #636709. ClientID must be reset when ID is assigned. 2010-09-07 23:20:28 +02:00
Marek Habersack e5ec9150cb [asp.net] Fix for bug #633756. Children processed as properties must be instantiated before using.
When a server-side control processes its children (in the markup) as properties, it needs to instantiate
an object of the property type and assign it to the appropriate property of the control. Failing to do so
will cause markup which references properties to fail in certain cases (for instance when the control's
property type is a class and it is not instantiated by the control's constructor).
2010-08-24 01:02:47 +02:00
Marek Habersack 51e6b86309 [asp.net,4.0] Added support for setting default base types for various kinds of resources.
ASP.NET 4.0 allows one to set base types for Pages, User Controls, Application and PageParserFilter
from the pre-application start method(s). This commit implements support for this mechanism.

* ApplicationFileParser.cs: added override of DefaultBaseType property which checks whether
  PageParser.DefaultApplicationBaseType is set and, if yes, uses it to set application base type
  if there's no custom Global.asax
* PageParser.cs: implemented the EnableLongStringsAsResources, DefaultPageBaseType, DefaultApplicationBaseType,
  DefaultPageParserFilterType and DefaultUserControlBaseType properties.
* TemplateParser.cs: if PageParser.DefaultPageParserFilterType is set, use it as the default type to create instance
  of the page parser filter
* Added tests for the new properties.
* Added support in standalone runner for setting custom application domain data on domain creation, just before
  the test is ran.
2010-08-06 22:27:08 +02:00
Marek Habersack 3a84414136 [asp.net] Made TemplateParser.CompileIntoType internal
This method was present only in 1.0 and 1.1 profiles. It's made internal because
we use it throughout our code.
2010-08-06 22:27:08 +02:00
Marek Habersack 8731e553a7 [asp.net,4.0] Added support for declarative per-user control output cache provider selection
This adds support for the ProviderName attribute of the OutputCache directive in user controls.
Also implemented missing support for SqlDependency attribute.

* TemplateControlCompiler.cs: StaticPartialCachingControl instantiation now uses the constructor overloads
  which accept sqlDependency (2.0+) and providerName (4.0+)
* UserControlCompiler.cs: added code to output PartialCachingAttribute which accepts sqlDependency (2.0+) and
  ProviderName (4.0+) arguments
* PartialCachingAttribute.cs added the 4.0 ProviderName property
* StaticPartialCachingControl.cs: implemented two missing constructors (one 2.0 and the other 4.0)
  Added a missing BuildCachedControl overload which accepts providerName (4.0)
* TemplateParser.cs: factored out OutputCache attribute processing to a separate internal virtual method.
* UserControlParser.cs: added support for the ProviderName attribute of the OutputCache directive.
2010-08-06 01:27:34 +02:00
Marek Habersack 80244984a0 [asp.net,4.0] added ability to store cached user controls in specified output cache provider
This commit implements the ability to programmatically set the name of the output cache provider
to hold cached control data.

* OutputCache.cs: added DefaultProvider internal property to return whatever default provider is
  configured.
  Added GetProvider() method to return instance of a named provider
* BasePartialCachingControl.cs: cache key and cached data are store in instance fields.
  Added 4.0 internal property ProviderName which names the output cache provider to use for storage.
  Removed OnInit from 4.0 profile, replaced with an override of Control's InitRecursive. Control is
  created only when cached data is not found in the provider.
* Control.cs: made InitRecursive virtual for the benefit of BasePartialCachingControl above.
* ControlCachePolicy.cs: added 4.0 property ProviderName
2010-08-06 01:27:34 +02:00
Marek Habersack 2b02fff231 [asp.net] use auto-generated backing fields for all properties 2010-08-05 15:24:49 +02:00
Marek Habersack 6ab66d483e [asp.net] implemented several missing properties in BoundPropertyEntr
* BoundPropertyEntry.cs: implemented the ControlID, ControlType, ExpressionBuilder, FieldName,
  FormatString, ParsedExpressionData, ReadOnlyProperty and TwoWayBound properties (2.0+)
2010-08-05 15:19:37 +02:00
Marek Habersack b0f59ebc86 [asp.net] implemented BaseTemplateParser.{GetReferencedType,GetUserControlType} methods
* BuildProvider.cs: factored out build provider type retrieval code to a separate method
* BuildProviderCollection.cs: factored out build provider type retrieval code to a separate method
* BuildManagerDirectoryBuilder.cs: system.web/compilation section is not an application section - it can
  be defined in web.config on any level.
2010-08-04 21:50:33 +02:00
Marek Habersack 4e74254594 2010-07-23 Marek Habersack <[email protected]>
* ClientScriptManager.cs: 4.0 adds a class="aspNetHidden"
	attribute to the div element surrounding the hidden elements.
2010-07-23 18:40:02 +02:00
Marek Habersack 84cf768d2d 2010-07-21 Marek Habersack <[email protected]>
* Wizard.cs: made rendering 100% compliant with .NET (button IDs,
	2.0+)
	Implemented LayoutTemplate (4.0+)

	* LinkButton.cs: render id first

	* CreateUserWizard.cs: CreateUserNavigationContainer.UpdateState
	doesn't add a previous button if we're on the first step.

svn path=/trunk/mcs/; revision=160657
2010-07-21 12:58:22 +00:00
Marek Habersack f9aca58e82 4.0/2.0 metadata updates + some test updates
svn path=/trunk/mcs/; revision=160378
2010-07-14 19:46:01 +00:00
Marek Habersack 3e86dae309 2010-07-13 Marek Habersack <[email protected]>
* Control.cs: moved 4.0 ClientID code to a separate method, so
	that the ID_SET flag isn't set when necessary.

2010-07-13  Marek Habersack  <[email protected]>

	* Wizard.cs: wizard table doesn't contain any instances of
	HtmlAnchor or Image controls. Moved rendering of the skip link
	anchor to the TableCellNamingContainer class, which does that in
	RenderChildren by directly writing to the passed writer. Fixes 4.0
	rendering and all the failing Wizard tests.

svn path=/trunk/mcs/; revision=160304
2010-07-13 16:34:23 +00:00
Marek Safar d2cf197fe9 Clean up 2 warnings
svn path=/trunk/mcs/; revision=160247
2010-07-12 14:22:44 +00:00
Marek Habersack 66f503db3e 2010-07-10 Marek Habersack <[email protected]>
* Control.cs: when setting ClientIDMode remember the value when
	setting the property for the first time.

svn path=/trunk/mcs/; revision=160187
2010-07-10 00:25:15 +00:00
Marek Habersack 203ea304e7 2010-07-08 Marek Habersack <[email protected]>
* Control.cs: if generating a predictable ID and the current
	control is a naming container, ensure that an ID is generated if
	not specified by user.

svn path=/trunk/mcs/; revision=160050
2010-07-08 13:09:32 +00:00
Marek Habersack d8838a6414 This commit introduces a few 4.0 rendering changes which break some tests. The broken tests
fail to work on .NET 4.0 as well, for the most part. I will fix them next week.

    2010-07-02  Marek Habersack  <[email protected]>

    	* TemplateControlParser.cs: added support for ClientIDMode
    	property

    	* Control.cs: implemented 4.0 features - ClientIDMode and
    	RenderingCompatibility.

    	* ClientIDMode.cs, IDataKeysControl.cs: added

    2010-07-02  Marek Habersack  <[email protected]>

    	* Menu.cs: 4.0 API updates.

    	* GridView.cs: implemented 4.0 properties -
    	SortedAscendingCellStyle, SortedAscendingHeaderStyle,
    	SortedDescendingCellStyle, SortedDescendingHeaderStyle,
    	ClientIDRowSuffix, ClientIDRowSuffixDataKeys, ShowHeaderWhenEmpty
    	along with associated rendering changes.

    	* DetailsView.cs, FormView.cs, GridView.cs: 4.0 API changes -
    	renamed ShowPage to SetPageIndex and made it public.
    	Added 4.0 interfaces to inheritance list and implemented them.

    	* DataKeyArray.cs: added internal constructor which accepts IList
    	instead of ArrayList. Changed the 'keys' field type to IList.

    	* ContainedTable.cs: the 'id' attribute must be rendered last.

    	* CheckBox.cs, CheckBoxList.cs, SiteMapPath.cs, Table.cs,
    	TableStyle.cs, TextBox.cs, WebControl.cs: 4.0 rendering changes.

    	* Calendar.cs, CompositeControl.cs, DropDownList.cs, HyperLink.cs,
    	Image.cs, ImageButton.cs, Label.cs, LinkButton.cs, LoginName.cs,
    	Panel.cs, Table.cs, TableCell.cs, TableRow.cs:
    	added new 4.0 property, SupportsDisabledAttribute.

    2010-07-02  Marek Habersack  <[email protected]>

    	* VersionConverter.cs: added support for checking whether the
    	passed version is equal or more than a specified minimal version.

    	* PagesSection.cs: added two 4.0 properties - ClientIDMode and
    	ControlRenderingCompatibilityVersion

    2010-07-02  Marek Habersack  <[email protected]>

    	* TemplateControlCompiler.cs: added support for ClientIDMode 4.0
    	property

    	* PageCompiler.cs, UserControlCompiler.cs: AddStatementsToInitTop
    	must call the base implementation.

svn path=/trunk/mcs/; revision=159826
2010-07-02 19:12:31 +00:00
Marek Habersack 7e02dfbdc9 Fixes to a bunch of unit tests which would fail when running on .NET and few updates to
our system.web controls.

svn path=/trunk/mcs/; revision=159495
2010-06-24 12:55:00 +00:00
Marek Habersack 63cc5053cc 2010-06-17 Marek Habersack <[email protected]>
* RootBuilder.cs: both LINK and META HTML tags must be represented
	as instances of HtmlGenericControl. Fixes bug #603541

svn path=/trunk/mcs/; revision=159046
2010-06-17 00:56:12 +00:00
Marek Habersack 4a49acbd3b 2010-06-02 Marek Habersack <[email protected]>
* ViewStateMode.cs: added

	* Control.cs: implemented 4.0 ViewStateMode

svn path=/trunk/mcs/; revision=158368
2010-06-02 21:36:29 +00:00
Marek Habersack 0ada47adf6 2010-06-02 Marek Habersack <[email protected]>
* Page.cs: implemented 4.0 properties AutoPostBackControl and
	RouteData

svn path=/trunk/mcs/; revision=158367
2010-06-02 21:36:20 +00:00
Marek Habersack 6a4765982a Don't link against System.Design
svn path=/trunk/mcs/; revision=158361
2010-06-02 19:24:32 +00:00
Marek Habersack 15e158a0e1 - updated obsolete types/members
- added missing type/member attributes
- use generic types in Page wherever possible

svn path=/trunk/mcs/; revision=158360
2010-06-02 19:04:08 +00:00
Marek Habersack 0b08553dbc 2010-06-01 Marek Habersack <[email protected]>
* HtmlHead.cs: added code to render description and keywords metas
	if the corresponding HtmlMeta controls aren't found and the user
	set either Description or Keywords properties.

2010-06-01  Marek Habersack  <[email protected]>

	* TemplateControlCompiler.cs: added new virtual method,
	AddStatementsToInitMethodBottom and renamed
	AddStatementsToInitMethod to AddStatementsToInitMethodTop.

	* PageCompiler.cs: code to set Meta{Description,Keywords}
	properties, if present.

2010-06-01  Marek Habersack  <[email protected]>

	* PageParser.cs: added support for MetaDescription and
	MetaKeywords main directive attributes

	* Page.cs: implemented MetaDescription and MetaKeywords
	4.0 properties.

svn path=/trunk/mcs/; revision=158303
2010-06-01 22:01:28 +00:00
Marek Habersack 6193eeb004 2010-05-19 Marek Habersack <[email protected]>
* DataSourceCacheDurationConverter.cs: implemented. Fixes bug
	#603083

svn path=/trunk/mcs/; revision=157547
2010-05-19 12:54:23 +00:00
Marek Habersack 5411dd0e2a 2010-05-19 Marek Habersack <[email protected]>
* 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
2010-05-19 01:28:09 +00:00
Marek Habersack fbbf51a5e4 2010-05-14 Marek Habersack <[email protected]>
* AssemblyInfo.cs: this assembly should be signed with winfx.pub

2010-05-15  Marek Habersack  <[email protected]>

	* HttpResponse.cs: added internal Context property

	* HttpRequest.cs: added a setter to the internal Context property

	* HttpContext.cs: set request and response Context properties to
	'this' in the constructor.

2010-05-15  Marek Habersack  <[email protected]>

	* Control.cs: implemented 4.0 GetRouteUrl overloads and
	GetUniqueIDRelativeTo

2010-05-15  Marek Habersack  <[email protected]>

	* RouteValueExpressionBuilder.cs: added

	* RouteUrlExpressionBuilder.cs: implemented

svn path=/trunk/mcs/; revision=157378
2010-05-15 02:29:09 +00:00
Marek Habersack 36571ed72b 2010-05-05 Marek Habersack <[email protected]>
* CollectionBuilder.cs: if a type has more than on indexer, check
	all of them for type compliance in GetChildControlType. Fixes bug
	#601290. Patch from Kalyanov Dmitry <[email protected]>,
	thanks!

svn path=/trunk/mcs/; revision=156714
2010-05-05 09:34:46 +00:00