mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs
View File

@ -30,7 +30,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Collections;
using System.Collections.Specialized;
using System.Drawing;
@ -150,13 +149,11 @@ namespace System.Web.UI.WebControls {
string GetDataKey ()
{
#if NET_4_0
if (String.IsNullOrEmpty (DataFile) && !String.IsNullOrEmpty (Data)) {
string key = CacheKeyContext;
if (!String.IsNullOrEmpty (key))
return key;
}
#endif
Page page = Page;
string p = page != null ? page.ToString () : "NullPage";
@ -388,14 +385,11 @@ namespace System.Web.UI.WebControls {
}
}
}
#if NET_4_0
[DefaultValue ("")]
public virtual string CacheKeyContext {
get { return ViewState.GetString ("CacheKeyContext", String.Empty); }
set { ViewState ["CacheKeyContext"] = value; }
}
#endif
}
}
#endif