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

Imported Upstream version 5.4.0.167

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,8 +454,8 @@ namespace System.Web.UI.WebControls {
// try to get it from the ASP.NET cache
string fileKey = CacheInternal.PrefixAdRotator + ((!String.IsNullOrEmpty(physicalPath)) ?
physicalPath : virtualPath.VirtualPathString);
CacheInternal cacheInternal = System.Web.HttpRuntime.CacheInternal;
AdRec [] adRecs = cacheInternal[fileKey] as AdRec[];
CacheStoreProvider cacheInternal = System.Web.HttpRuntime.Cache.InternalCache;
AdRec[] adRecs = cacheInternal.Get(fileKey) as AdRec[];
if (adRecs == null) {
// Otherwise load it
@ -481,7 +481,7 @@ namespace System.Web.UI.WebControls {
if (dependency != null) {
using (dependency) {
// and store it in the cache, dependent on the file name
cacheInternal.UtcInsert(fileKey, adRecs, dependency);
cacheInternal.Insert(fileKey, adRecs, new CacheInsertOptions() { Dependencies = dependency });
}
}
}

2
mcs/class/referencesource/System.Web/UI/WebControls/ChangePassword.cs.REMOVED.git-id
View File

@ -1 +1 @@
4588444664e8f7bea2a92ce24d3affb509ffc916
cd906e11df0930e8dbfbfa0f195ca9c19917d950

2
mcs/class/referencesource/System.Web/UI/WebControls/DetailsView.cs.REMOVED.git-id
View File

@ -1 +1 @@
c51c96272d6cba564e2d0f7cba8295f5801f64a9
268143d08969bd4fd092b0e27abd66697eab84f2

2
mcs/class/referencesource/System.Web/UI/WebControls/PasswordRecovery.cs.REMOVED.git-id
View File

@ -1 +1 @@
f75ce6aa4cdd565ff51895e4b2ea0775c8037452
a236ddde52773400bc36cbc946b7b26a2875148c

2
mcs/class/referencesource/System.Web/UI/WebControls/Wizard.cs.REMOVED.git-id
View File

@ -1 +1 @@
4aa0a6f25b369674e571d8a03ae37cbbc917d296
882c5adcec85b0352e395b2e812f544b0c60d631

13
mcs/class/referencesource/System.Web/UI/WebControls/xml.cs
View File

@ -403,7 +403,7 @@ namespace System.Web.UI.WebControls {
string physicalPath;
ResolvePhysicalOrVirtualPath(_transformSource, out virtualPath, out physicalPath);
CacheInternal cacheInternal = HttpRuntime.CacheInternal;
CacheStoreProvider cacheInternal = HttpRuntime.Cache.InternalCache;
string key = CacheInternal.PrefixLoadXPath + ((physicalPath != null) ?
physicalPath : virtualPath.VirtualPathString);
@ -436,7 +436,8 @@ namespace System.Web.UI.WebControls {
// Cache it, but only if we got a dependency
if (dependency != null) {
using (dependency) {
cacheInternal.UtcInsert(key, ((_compiledTransform == null) ? (object)_transform : (object)_compiledTransform), dependency);
cacheInternal.Insert(key, ((_compiledTransform == null) ? (object)_transform : (object)_compiledTransform),
new CacheInsertOptions() { Dependencies = dependency });
}
}
}
@ -467,7 +468,7 @@ namespace System.Web.UI.WebControls {
// Make it absolute and check security
string physicalPath = MapPathSecure(_documentSource);
CacheInternal cacheInternal = System.Web.HttpRuntime.CacheInternal;
CacheStoreProvider cacheInternal = System.Web.HttpRuntime.Cache.InternalCache;
string key = CacheInternal.PrefixLoadXml + physicalPath;
_document = (XmlDocument) cacheInternal.Get(key);
@ -480,7 +481,7 @@ namespace System.Web.UI.WebControls {
_document = new XmlDocument();
_document.Load(XmlUtils.CreateXmlReader(stream, physicalPath));
cacheInternal.UtcInsert(key, _document, dependency);
cacheInternal.Insert(key, _document, new CacheInsertOptions() { Dependencies = dependency });
}
}
else {
@ -511,7 +512,7 @@ namespace System.Web.UI.WebControls {
string physicalPath;
ResolvePhysicalOrVirtualPath(_documentSource, out virtualPath, out physicalPath);
CacheInternal cacheInternal = HttpRuntime.CacheInternal;
CacheStoreProvider cacheInternal = HttpRuntime.Cache.InternalCache;
string key = CacheInternal.PrefixLoadXPath + ((physicalPath != null) ?
physicalPath : virtualPath.VirtualPathString);
@ -533,7 +534,7 @@ namespace System.Web.UI.WebControls {
// Cache it, but only if we got a dependency
if (dependency != null) {
using (dependency) {
cacheInternal.UtcInsert(key, _xpathDocument, dependency);
cacheInternal.Insert(key, _xpathDocument, new CacheInsertOptions() { Dependencies = dependency });
}
}
}