Commit Graph
10 Commits
Author SHA1 Message Date
Marek Habersack b68b65ad17 2009-08-18 Marek Habersack <[email protected]>
* Makefile (TEST_RESOURCE_FILES): added
	Test/mainsoft/NunitWebResources/DuplicateControlsInClientComment.aspx

2009-08-18  Marek Habersack  <[email protected]>

	* ControlBuilder.cs: Location property makes a copy of assigned
	ILocation now.

2009-08-18  Marek Habersack  <[email protected]>

	* AspParser.cs: added a constructor which creates an internal
	parser, nested within the outer one, and adjusts its ILocation
	members to report correct locations in the outer parser for better
	error reporting. Inner parser also returns the outer's FileText,
	if available.

	* AspGenerator.cs: restored part of r138474 reverted in r138657,
	r138658 and r138659 to fix bug #525104
	BuilderLocation creates a copy of Location for its own use (since
	the ILocation passed is actually AspParser, the line numbers
	change between creating a BuilderLocation and using its Location
	member).
	The end of tag, expression and client comment regular expressions
	now use lazy quantifiers. This fixes bugs #525104 and #517656
	Client side comment blocks aren't ignored anymore, they are parsed
	just as the other parts of the document. Fixes bug #524358

2009-08-18  Marek Habersack  <[email protected]>

	* JavaScriptSerializer.cs: read converters from the config only if
	explicitly requested.

2009-08-18  Marek Habersack  <[email protected]>

	* TemplateControlCompilerTest.cs: added test for bug #525104 and
	improved test for bug #517656

svn path=/trunk/mcs/; revision=140161
2009-08-18 13:31:49 +00:00
Marek Habersack 83dfe82864 2009-08-17 Marek Habersack <[email protected]>
* ScriptingJsonSerializationSection.cs: MaxJsonLength default
	value is 2097152 for .NET 3.5+

2009-08-17  Marek Habersack  <[email protected]>

	* JsonSerializer.cs: serialize fields before properties.

	* JavaScriptSerializer.cs: MaxJsonLength default value for .NET
	3.5 is 2097152

2009-08-17  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: fixed broken tests

svn path=/trunk/mcs/; revision=140098
2009-08-17 20:43:45 +00:00
Marek Habersack 9ccd39fb07 2009-03-17 Marek Habersack <[email protected]>
* JavaScriptSerializer.cs: if conversion of IDictionary or
	IDictionary <K,V> to an object is requested, make sure that a
	concrete type is used (in both cases Dictionary <string, object>).
	Make sure that if the target type is an IDictionary<K,V> that the
	key is either an object or a string.

2009-03-17  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: added tests for conversion to
	IDictionary and IDictionary <K,V> types.

svn path=/trunk/mcs/; revision=129580
2009-03-17 13:21:57 +00:00
Marek Habersack 1dfc535d36 2009-03-06 Marek Habersack <[email protected]>
* JsonDeserializer.cs: unquoted key values must ignore leading
	and trailing whitespace

2009-03-06  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: added a test for unquoted tests
	surrounded with spaces.

svn path=/trunk/mcs/; revision=128801
2009-03-06 22:16:37 +00:00
Marek Habersack 51f5087bf2 2008-12-05 Marek Habersack <[email protected]>
* JsonSerializer.cs: StringBuilder extension methods aren't used
	anymore, changed to calls to static methods in
	StringBuilderExtensions.

	* StringBuilderExtensions.cs: cannot use extension methods here
	because this file is also used in the version 1.0 build which
	doesn't reference System.Core

svn path=/trunk/mcs/; revision=120823
2008-12-05 11:43:42 +00:00
Marek Habersack 0b087aff65 2008-10-22 Marek Habersack <[email protected]>
* JsonDeserializer.cs: object can contain more than one unquoted
	keys.

2008-10-22  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: added tests for deserialization of
	objects with more than one unquoted key names.

svn path=/trunk/mcs/; revision=116713
2008-10-22 00:46:42 +00:00
Marek Habersack 1905082013 2008-09-23 Marek Habersack <[email protected]>
* LogicalTypeInfo.cs: do not use
	LazyDictionary as enum serializer anymore.

	* ProfileService.cs: do not use
	LazyDictionary as ProfileService serializer anymore.

	* RestHandler.cs: do not use
	LazyDictionary as the Exception or NameValueCollection serializer
	anymore.

2008-09-23  Marek Habersack  <[email protected]>

	* JavaScriptSerializer.cs: removed the LazyDictionary class, it's
	not needed anymore.


svn path=/trunk/mcs/; revision=113832
2008-09-23 14:55:49 +00:00
Juraj Skripsky 0594b0199e 2008-09-23 Juraj Skripsky <[email protected]>
* JsonSerializer.cs: "SerializeGenericDictionary" is an instance method,
	fix retrieval of its MethodInfo.
	Initialize serializeGenericDictionaryMethods (lazily).
	Add and use GetClosedIDictionaryBase to also handle cases where a
	non-generic class implements a closed IDictionary<,> (e.g.
	SomeDictionary : IDictionary<string, object>). Fixes bug #424704.
	First check for IDictionary<,>, then for IDictionary.

2008-09-20  Juraj Skripsky  <[email protected]>

	* JavaScriptSerializerTest.cs: added test for bug #424704.


svn path=/trunk/mcs/; revision=113829
2008-09-23 14:33:54 +00:00
Marek Habersack b9c7ab7bc0 2008-09-20 Marek Habersack <[email protected]>
* JsonDeserializer.cs: added support for stand-alone NaN, Infinity
	and -Infinity values, as well as the same within an array.

2008-09-20  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: added some tests

svn path=/trunk/mcs/; revision=113596
2008-09-19 22:41:46 +00:00
Marek Habersack 93a1d2ad6c 2008-09-19 Marek Habersack <[email protected]>
* Json.cs: added new Serialize overload which takes a TextWriter
	for its output parameter.
	Added Deserialize methods.

	* JsonSerializer.cs: made InitialJavaScriptDateTicks internal.
	Added new Serialize overload which takes a TextWriter for its
	output parameter.
	Added WriteValue overloads for float and double - they must not be
	converted to strings as IConvertibles because their Max/MinValue
	end up converted incorrectly.

	* JavaScriptSerializer.cs: adjustments for the new JSON
	(de)serializer.

	* JsonDeserializer.cs: new JSON deserializer code, fully compliant
	with the .NET AJAX one.

2008-09-19  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: enabled some tests which were
	failing with the old (de)serializer, but work with the new one.

2008-09-19  Marek Habersack  <[email protected]>

	* System.Web.Extensions.dll.sources: removed most of the
	Newtonsoft JSON code, leaving only ReflectionUtils and
	JavaScriptUtils.


svn path=/trunk/mcs/; revision=113590
2008-09-19 21:13:55 +00:00