Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -133,7 +133,7 @@ namespace System.Web.UI {
throw new InvalidOperationException(SR.GetString(SR.DataSourceCache_CacheMustBeEnabled));
}
HttpRuntime.CacheInternal.Remove(key);
HttpRuntime.Cache.InternalCache.Remove(key);
}
@ -151,7 +151,7 @@ namespace System.Web.UI {
throw new InvalidOperationException(SR.GetString(SR.DataSourceCache_CacheMustBeEnabled));
}
return HttpRuntime.CacheInternal.Get(key);
return HttpRuntime.Cache.InternalCache.Get(key);
}
@ -227,7 +227,11 @@ namespace System.Web.UI {
aggregateCacheDependency.Add(new CacheDependency[] { dependency });
}
HttpRuntime.CacheInternal.UtcInsert(key, data, aggregateCacheDependency, utcAbsoluteExpiryTime, slidingExpiryTimeSpan);
HttpRuntime.Cache.InternalCache.Insert(key, data, new CacheInsertOptions() {
Dependencies = aggregateCacheDependency,
AbsoluteExpiration = utcAbsoluteExpiryTime,
SlidingExpiration = slidingExpiryTimeSpan
});
}