mono · deltragon · Jul 31, 2021 · Sep 6, 2021 · Sep 4, 2021 · Sep 6, 2021
@@ -21,5 +21,6 @@ static class AssemblyRef
 	public const string SystemDrawing = Consts.AssemblySystem_Drawing;
 	public const string SystemWeb = Consts.AssemblySystem_Web;
 	public const string SystemWebExtensions =  "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+	public const string SystemWebExtensionsDesign =  "System.Web.Extensions.Design, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
 	public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
 }
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.dll.sources b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.dll.sources
@@ -8,6 +8,7 @@ corefx/SR.cs
 ../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/DataTableExtensions.cs
 ../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/EnumerableRowCollection.cs
 ../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/EnumerableRowCollectionExtensions.cs
+../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/LinqDataView.cs
 ../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/OrderedEnumerableRowCollection.cs
 ../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/SortExpressionBuilder.cs
 ../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/TypedTableBase.cs

diff --git a/mcs/class/System.Data.DataSetExtensions/corefx/SR.cs b/mcs/class/System.Data.DataSetExtensions/corefx/SR.cs
@@ -11,4 +11,6 @@ partial class SR
 	public const string DataSetLinq_CannotCompareDeletedRow = "The DataRowComparer does not work with DataRows that have been deleted since it only compares current values.";
 	public const string DataSetLinq_CannotLoadDeletedRow = "The source contains a deleted DataRow that cannot be copied to the DataTable.";
 	public const string DataSetLinq_NonNullableCast = "Cannot cast DBNull. Value to type '{0}'. Please use a nullable type.";
+	public const string LDV_InvalidNumOfKeys = "Must provide '{0}' keys to find";
+	public const string LDVRowStateError = "DataViewRowState must be DataViewRowState.CurrentRows";
 }
diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
@@ -64,4 +64,4 @@
 [assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 
 //	[assembly: InternalsVisibleTo ("System.Data.Entity, PublicKey=00000000000000000400000000000000")]
-//	[assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=00000000000000000400000000000000")]
+[assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=00000000000000000400000000000000")]
@@ -36,6 +36,9 @@ NUNIT_RESOURCE_FILES= \
 	$(wildcard ../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/*.as?x) \
 	$(wildcard ../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/*.master)
 
+RESOURCE_DEFS = \
+	System.Web.Resources.AtlasWeb,../referencesource/System.Web.Extensions/Resources/AtlasWeb.resx
+
 CLASSLIB_DIR = $(topdir)/class/lib/$(PROFILE)
 
 STANDALONE_RUNNER_SUPPORT_ASSEMBLY = $(CLASSLIB_DIR)/standalone-runner-support.dll

@@ -2,6 +2,7 @@
 ../System.Web/System.Web.Configuration_2.0/MachineKeyRegistryStorage.cs
 ../System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
 ./Assembly/AssemblyInfo.cs
+../../build/common/AssemblyRef.cs
 ./System.Web.ClientServices/ClientFormsIdentity.cs
 ./System.Web.ClientServices/ClientRolePrincipal.cs
 ./System.Web.ClientServices/ConnectivityStatus.cs
@@ -29,8 +30,10 @@
 ./System.Web.DynamicData/IDynamicValidatorException.cs
 ./System.Web.Handlers/ScriptModule.cs
 ./System.Web.Handlers/ScriptResourceHandler.cs
-./System.Web.Query.Dynamic/DynamicClass.cs
-./System.Web.Query.Dynamic/ParseException.cs
+../referencesource/System.Web.Extensions/HttpResponseInternalBase.cs
+../referencesource/System.Web.Extensions/HttpResponseInternalWrapper.cs
+../referencesource/System.Web.Extensions/Resources/AtlasWeb.Designer.cs
+../referencesource/System.Web.Extensions/Script/AjaxFrameworkAssemblyAttribute.cs
 ./System.Web.Script.Serialization/JavaScriptConverter.cs
 ./System.Web.Script.Serialization/JavaScriptSerializer.cs
 ./System.Web.Script.Serialization/JavaScriptTypeResolver.cs
@@ -53,15 +56,23 @@
 ./System.Web.Script.Services/ScriptHandlerFactory.cs
 ./System.Web.Script.Services/ScriptMethodAttribute.cs
 ./System.Web.Script.Services/ScriptServiceAttribute.cs
+../referencesource/System.Web.Extensions/ui/AjaxFrameworkMode.cs
+../referencesource/System.Web.Extensions/ui/AssemblyCache.cs
 ./System.Web.UI/AsyncPostBackErrorEventArgs.cs
 ./System.Web.UI/AsyncPostBackTrigger.cs
+../referencesource/System.Web.Extensions/ui/ClientScriptManagerWrapper.cs
 ./System.Web.UI/CompositeEntry.cs
 ./System.Web.UI/CompositeScriptReference.cs
 ./System.Web.UI/CompositeScriptReferenceEventArgs.cs
 ./System.Web.UI/AuthenticationServiceManager.cs
 ./System.Web.UI/ExtenderControl.cs
+../referencesource/System.Web.Extensions/ui/HtmlFormWrapper.cs
 ./System.Web.UI/IExtenderControl.cs
+../referencesource/System.Web.Extensions/ui/IClientScriptManager.cs
+../referencesource/System.Web.Extensions/ui/IHtmlForm.cs
+../referencesource/System.Web.Extensions/ui/IPage.cs
 ./System.Web.UI/IScriptControl.cs
+../referencesource/System.Web.Extensions/ui/PageWrapper.cs
 ./System.Web.UI/PostBackTrigger.cs
 ./System.Web.UI/ProfileServiceManager.cs
 ./System.Web.UI/RegisteredArrayDeclaration.cs
@@ -70,6 +81,8 @@
 ./System.Web.UI/RegisteredHiddenField.cs
 ./System.Web.UI/RegisteredScript.cs
 ./System.Web.UI/RegisteredScriptType.cs
+../referencesource/System.Web.Extensions/ui/ResourceDescriptionAttribute.cs
+../referencesource/System.Web.Extensions/ui/ResourceDisplayNameAttribute.cs
 ./System.Web.UI/ScriptBehaviorDescriptor.cs
 ./System.Web.UI/ScriptComponentDescriptor.cs
 ./System.Web.UI/ScriptControl.cs
@@ -94,25 +107,37 @@
 ./System.Web.UI/UpdatePanelTrigger.cs
 ./System.Web.UI/UpdatePanelUpdateMode.cs
 ./System.Web.UI/UpdateProgress.cs
+../referencesource/System.Web.Extensions/ui/WebControls/ContextDataSourceContextData.cs
+../referencesource/System.Web.Extensions/ui/WebControls/ContextDataSourceView.cs
+../referencesource/System.Web.Extensions/ui/WebControls/ContextDataSource.cs
+../referencesource/System.Web.Extensions/ui/WebControls/DataSourceHelper.cs
 ./System.Web.UI.WebControls/DataPagerCommandEventArgs.cs
 ./System.Web.UI.WebControls/DataPager.cs
 ./System.Web.UI.WebControls/DataPagerFieldCollection.cs
 ./System.Web.UI.WebControls/DataPagerFieldCommandEventArgs.cs
 ./System.Web.UI.WebControls/DataPagerField.cs
 ./System.Web.UI.WebControls/DataPagerFieldItem.cs
+../referencesource/System.Web.Extensions/ui/WebControls/DynamicQueryableWrapper.cs
+../referencesource/System.Web.Extensions/ui/WebControls/Dynamic.cs
+../referencesource/System.Web.Extensions/ui/WebControls/Expressions/DataSourceExpression.cs
+../referencesource/System.Web.Extensions/ui/WebControls/Expressions/ParameterDataSourceExpression.cs
 ./System.Web.UI.WebControls/HelperExtensions.cs
+../referencesource/System.Web.Extensions/ui/WebControls/IDynamicQueryable.cs
+../referencesource/System.Web.Extensions/ui/WebControls/ILinqToSql.cs
 ./System.Web.UI.WebControls/InsertItemPosition.cs
 ./System.Web.UI.WebControls/IPageableItemContainer.cs
+../referencesource/System.Web.Extensions/ui/WebControls/IQueryableDataSource.cs
 ./System.Web.UI.WebControls/LinqDataSourceContextEventArgs.cs
-./System.Web.UI.WebControls/LinqDataSource.cs
+../referencesource/System.Web.Extensions/ui/WebControls/LinqDataSource.cs
 ./System.Web.UI.WebControls/LinqDataSourceDeleteEventArgs.cs
 ./System.Web.UI.WebControls/LinqDataSourceDisposeEventArgs.cs
 ./System.Web.UI.WebControls/LinqDataSourceInsertEventArgs.cs
 ./System.Web.UI.WebControls/LinqDataSourceSelectEventArgs.cs
 ./System.Web.UI.WebControls/LinqDataSourceStatusEventArgs.cs
 ./System.Web.UI.WebControls/LinqDataSourceUpdateEventArgs.cs
 ./System.Web.UI.WebControls/LinqDataSourceValidationException.cs
-./System.Web.UI.WebControls/LinqDataSourceView.cs
+../referencesource/System.Web.Extensions/ui/WebControls/LinqDataSourceView.cs
+../referencesource/System.Web.Extensions/ui/WebControls/LinqToSqlWrapper.cs
 ./System.Web.UI.WebControls/ListViewCancelEventArgs.cs
 ./System.Web.UI.WebControls/ListViewCancelMode.cs
 ./System.Web.UI.WebControls/ListViewCommandEventArgs.cs
@@ -138,4 +163,10 @@
 ./System.Web.UI.WebControls/NumericPagerField.cs
 ./System.Web.UI.WebControls/PageEventArgs.cs
 ./System.Web.UI.WebControls/PagePropertiesChangingEventArgs.cs
+../referencesource/System.Web.Extensions/ui/WebControls/QueryableDataSourceEditData.cs
+../referencesource/System.Web.Extensions/ui/WebControls/QueryableDataSourceHelper.cs
+../referencesource/System.Web.Extensions/ui/WebControls/QueryableDataSourceView.cs
+../referencesource/System.Web.Extensions/ui/WebControls/QueryableDataSource.cs
+../referencesource/System.Web.Extensions/ui/WebControls/QueryContext.cs
+../referencesource/System.Web.Extensions/ui/WebControls/QueryCreatedEventArgs.cs
 ./System.Web.UI.WebControls/TemplatePagerField.cs
@@ -1,4 +1,4 @@
-//
+//
 // ScriptResourceHandler.cs
 //
 // Authors:
@@ -200,7 +200,7 @@ protected virtual void ProcessRequest (HttpContext context)
 			TextWriter writer = response.Output;
 			foreach (ScriptResourceAttribute sra in assembly.GetCustomAttributes (typeof (ScriptResourceAttribute), false)) {
 				if (String.Compare (sra.ScriptName, res.Name, StringComparison.Ordinal) == 0) {
-					string scriptResourceName = sra.ScriptResourceName;
+					string scriptResourceName = sra.StringResourceName;
 					ResourceSet rset = null;
 					try {
 						rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);
@@ -216,11 +216,11 @@ protected virtual void ProcessRequest (HttpContext context)
 					if (rset == null)
 						break;
 					writer.WriteLine ();
-					string ns = sra.TypeName;
+					string ns = sra.StringResourceClientTypeName;
 					int indx = ns.LastIndexOf ('.');
 					if (indx > 0)
 						writer.WriteLine ("Type.registerNamespace('" + ns.Substring (0, indx) + "')");
-					writer.Write ("{0}={{", sra.TypeName);
+					writer.Write ("{0}={{", sra.StringResourceClientTypeName);
 					bool first = true;
 					foreach (DictionaryEntry de in rset) {
 						string value = de.Value as string;

@@ -37,14 +37,19 @@
 using System.Collections.Specialized;
 using System.Collections;
 using System.Web.Handlers;
+using System.Web.Hosting;
 using System.Reflection;
 using System.Web.Configuration;
+using System.Web.Compilation;
 using System.Web.UI.HtmlControls;
 using System.IO;
+using System.Linq;
 using System.Globalization;
 using System.Threading;
+using System.Web.Resources;
 using System.Web.Script.Serialization;
 using System.Web.Script.Services;
+using System.Web.Script;
 using System.Xml;
 using System.Collections.ObjectModel;
 using System.Web.Util;
@@ -88,6 +93,10 @@ public class ScriptManager : Control, IPostBackDataHandler, IScriptManager
 
 		static readonly object ScriptManagerKey = typeof (IScriptManager);
 
+		private static bool _ajaxFrameworkAssemblyConfigChecked;
+		private static Assembly _defaultAjaxFrameworkAssembly = null;
+		private Assembly _ajaxFrameworkAssembly = DefaultAjaxFrameworkAssembly;
+
 		int _asyncPostBackTimeout = 90;
 		List<Control> _asyncPostBackControls;
 		List<Control> _postBackControls;
@@ -97,6 +106,8 @@ public class ScriptManager : Control, IPostBackDataHandler, IScriptManager
 		ScriptReferenceCollection _scripts;
 		CompositeScriptReference _compositeScript;
 		ServiceReferenceCollection _services;
+		private bool _initCompleted;
+		private bool _preRenderCompleted;
 		bool _isInAsyncPostBack;
 		bool _isInPartialRendering;
 		string _asyncPostBackSourceElementID;
@@ -127,6 +138,20 @@ public class ScriptManager : Control, IPostBackDataHandler, IScriptManager
 		AuthenticationServiceManager _authenticationService;
 		ProfileServiceManager _profileService;
 		List<ScriptManagerProxy> _proxies;
+		private AjaxFrameworkMode _ajaxFrameworkMode = AjaxFrameworkMode.Enabled;
+		private bool _enableCdn;
+
+		[
+		ResourceDescription("ScriptManager_AjaxFrameworkAssembly"),
+		Browsable(false)
+		]
+		public virtual Assembly AjaxFrameworkAssembly {
+			get {
+				// value is set to the static DefaultAjaxFrameworkAssembly one at constructor time,
+				// so this property value can't change in the middle of a request.
+				return _ajaxFrameworkAssembly;
+			}
+		}
 
 		[DefaultValue (true)]
 		[Category ("Behavior")]
@@ -185,6 +210,82 @@ public AuthenticationServiceManager AuthenticationService {
 			}
 		}
 
+		internal static Assembly DefaultAjaxFrameworkAssembly {
+			get {
+				if ((_defaultAjaxFrameworkAssembly == null) && !_ajaxFrameworkAssemblyConfigChecked && AssemblyCache._useCompilationSection) {
+					IEnumerable<Assembly> referencedAssemblies;
+					// In a hosted environment we want to get the assemblies from the BuildManager. This will include
+					// dynamically added assemblies through the PreAppStart phase.
+					// In non-hosted scenarios (VS designer) we want to look the assemblies directly from the config system
+					// since the PreAppStart phase will not execute.
+					if (HostingEnvironment.IsHosted) {
+						referencedAssemblies = BuildManager.GetReferencedAssemblies().OfType<Assembly>();
+					}
+					else {
+						CompilationSection compilationSection = RuntimeConfig.GetAppConfig().Compilation;
+						referencedAssemblies = compilationSection.Assemblies.OfType<AssemblyInfo>().SelectMany(assemblyInfo => assemblyInfo.AssemblyInternal);
+					}
+
+					foreach (Assembly assembly in referencedAssemblies) {
+						if (assembly != AssemblyCache.SystemWebExtensions) {
+							AjaxFrameworkAssemblyAttribute attribute =
+								AssemblyCache.GetAjaxFrameworkAssemblyAttribute(assembly);
+							if (attribute != null) {
+								_defaultAjaxFrameworkAssembly = attribute.GetDefaultAjaxFrameworkAssembly(assembly);
+								break;
+							}
+						}
+						_ajaxFrameworkAssemblyConfigChecked = true;
+					}
+					_ajaxFrameworkAssemblyConfigChecked = true;
+				}
+				return _defaultAjaxFrameworkAssembly ?? AssemblyCache.SystemWebExtensions;
+			}
+			set {
+				if (value == null) {
+					throw new ArgumentNullException("value");
+				}
+				_defaultAjaxFrameworkAssembly = value;
+			}
+		}
+
+		[
+		ResourceDescription("ScriptManager_EnableCdn"),
+		Category("Behavior"),
+		DefaultValue(false),
+		]
+		public bool EnableCdn {
+			get {
+				return _enableCdn;
+			}
+			set {
+				if (_preRenderCompleted) {
+					throw new InvalidOperationException(AtlasWeb.ScriptManager_CannotChangeEnableCdn);
+				}
+				_enableCdn = value;
+			}
+		}
+
+		[
+		ResourceDescription("ScriptManager_AjaxFrameworkMode"),
+		Category("Behavior"),
+		DefaultValue(AjaxFrameworkMode.Enabled),
+		]
+		public AjaxFrameworkMode AjaxFrameworkMode {
+			get {
+				return _ajaxFrameworkMode;
+			}
+			set {
+				if (value < AjaxFrameworkMode.Enabled || value > AjaxFrameworkMode.Explicit) {
+					throw new ArgumentOutOfRangeException("value");
+				}
+				if (_initCompleted) {
+					throw new InvalidOperationException(AtlasWeb.ScriptManager_CannotChangeAjaxFrameworkMode);
+				}
+				_ajaxFrameworkMode = value;
+			}
+		}
+
 		[Category ("Behavior")]
 		[DefaultValue (false)]
 		public bool EnablePageMethods {
@@ -467,6 +568,7 @@ protected internal override void OnInit (EventArgs e) {
 
 			SetCurrent (Page, this);
 			Page.Error += new EventHandler (OnPageError);
+			Page.InitComplete += OnPageInitComplete;
 			_init = true;
 		}
 
@@ -475,10 +577,20 @@ void OnPageError (object sender, EventArgs e) {
 				OnAsyncPostBackError (new AsyncPostBackErrorEventArgs (Context.Error));
 		}
 
+		private void OnPageInitComplete(object sender, EventArgs e) {
+			if (Page.IsPostBack) {
+				if (IsInAsyncPostBack && !SupportsPartialRendering) {
+					throw new InvalidOperationException(AtlasWeb.ScriptManager_AsyncPostBackNotInPartialRenderingMode);
+				}
+			}
+
+			_initCompleted = true;
+		}
+
 		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 
-			Page.PreRenderComplete += new EventHandler (OnPreRenderComplete);
+			Page.PreRenderComplete += new EventHandler (OnPagePreRenderComplete);
 
 			if (IsInAsyncPostBack) {
 				Page.SetRenderMethodDelegate (RenderPageCallback);
@@ -532,8 +644,9 @@ ScriptReference CreateScriptReference (string path, string assembly)
 			return CreateScriptReference (path, assembly, true);
 		}
 
-		void OnPreRenderComplete (object sender, EventArgs e)
+		private void OnPagePreRenderComplete (object sender, EventArgs e)
 		{
+			_preRenderCompleted = true;
 			// Resolve Scripts
 			ScriptReference ajaxScript = CreateScriptReference ("MicrosoftAjax.js", String.Empty, false);
 			ScriptReference ajaxWebFormsScript = CreateScriptReference ("MicrosoftAjaxWebForms.js", String.Empty, false);
+24 −0		src/System.ComponentModel.TypeConverter/src/System/ComponentModel/DateTimeConverter.cs
+35 −0		src/System.Data.Common/src/System/Data/DataView.cs
+16 −0		src/System.Data.Common/src/System/Data/Selection.cs
+1 −1		src/System.Data.DataSetExtensions/src/Resources/Strings.resx
+2 −1		src/System.Data.DataSetExtensions/src/System/Data/DataRowComparer.cs
+2 −1		src/System.Data.DataSetExtensions/src/System/Data/DataTableExtensions.cs
+304 −0		src/System.Data.DataSetExtensions/src/System/Data/LinqDataView.cs