Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/referencesource/System.Web/UI/DataSourceCache.cs

@@ -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
+                                                            });
         }
 
 

mcs/class/referencesource/System.Web/UI/HTMLTextWriter.cs

@@ -98,7 +98,7 @@ namespace System.Web.UI {
         public const char StyleEqualsChar = ':';
         public const string DefaultTabString = "\t";
 
-        // The DesignerRegion attribute name must be kept in [....] with
+        // The DesignerRegion attribute name must be kept in sync with
         // System.Web.UI.Design.DesignerRegion.DesignerRegionNameAttribute
         internal const string DesignerRegionAttributeName = "_designerRegion";
 

mcs/class/referencesource/System.Web/UI/ObjectStateFormatter.cs

@@ -189,7 +189,7 @@ namespace System.Web.UI {
                     return null;
                 }
 
-                // Note: duplicated (somewhat) in GetMacKeyModifier, keep in [....]
+                // Note: duplicated (somewhat) in GetMacKeyModifier, keep in sync
                 // See that method for comments on why these modifiers are in place
 
                 List<string> specificPurposes = new List<string>() {
@@ -216,7 +216,7 @@ namespace System.Web.UI {
                     return null;
                 }
 
-                // Note: duplicated (somewhat) in GetSpecificPurposes, keep in [....]
+                // Note: duplicated (somewhat) in GetSpecificPurposes, keep in sync
 
                 // Use the page's directory and class name as part of the key (ASURT 64044)
                 uint pageHashCode = _page.GetClientStateIdentifier();

mcs/class/referencesource/System.Web/UI/Page.cs.REMOVED.git-id

@@ -1 +1 @@
-974680fd74222db0b425c15c2e38618f0c4c6439
+3fb982447120c4916167e60bb91e3c7aae999288

mcs/class/referencesource/System.Web/UI/WebControls/AdRotator.cs

@@ -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 });
                     }
                 }
             }

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

@@ -1 +1 @@
-4588444664e8f7bea2a92ce24d3affb509ffc916
+cd906e11df0930e8dbfbfa0f195ca9c19917d950

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

@@ -1 +1 @@
-c51c96272d6cba564e2d0f7cba8295f5801f64a9
+268143d08969bd4fd092b0e27abd66697eab84f2

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

@@ -1 +1 @@
-f75ce6aa4cdd565ff51895e4b2ea0775c8037452
+a236ddde52773400bc36cbc946b7b26a2875148c

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

@@ -1 +1 @@
-4aa0a6f25b369674e571d8a03ae37cbbc917d296
+882c5adcec85b0352e395b2e812f544b0c60d631

mcs/class/referencesource/System.Web/UI/WebControls/xml.cs

@@ -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 });
                     }
                 }
             }

mcs/class/referencesource/System.Web/UI/WebParts/CatalogZoneBase.cs

@@ -549,7 +549,7 @@ namespace System.Web.UI.WebControls.WebParts {
                 // Mozilla renders padding on an empty TD without this attribute
                 writer.AddStyleAttribute(HtmlTextWriterStyle.Padding, "0");
 
-                // Add an extra row with height of 100%, to [....] up any extra space
+                // Add an extra row with height of 100%, to Microsoft up any extra space
                 // if the height of the zone is larger than its contents
                 // Mac IE needs height=100% set on <td> instead of <tr>
                 writer.AddStyleAttribute(HtmlTextWriterStyle.Height, "100%");

mcs/class/referencesource/System.Web/UI/WebParts/EditorPart.cs

@@ -246,7 +246,7 @@ namespace System.Web.UI.WebControls.WebParts {
         }
 
         /// <devdoc>
-        /// Called by the Zone when the EditorPart should [....] its values because other EditorParts
+        /// Called by the Zone when the EditorPart should sync its values because other EditorParts
         /// may have changed control properties.  This is only called after all the ApplyChanges have returned.
         /// </devdoc>
         public abstract void SyncChanges();

mcs/class/referencesource/System.Web/UI/WebParts/EditorZoneBase.cs

@@ -412,7 +412,7 @@ namespace System.Web.UI.WebControls.WebParts {
                 // Mozilla renders padding on an empty TD without this attribute
                 writer.AddStyleAttribute(HtmlTextWriterStyle.Padding, "0");
 
-                // Add an extra row with height of 100%, to [....] up any extra space
+                // Add an extra row with height of 100%, to Microsoft up any extra space
                 // if the height of the zone is larger than its contents
                 // Mac IE needs height=100% set on <td> instead of <tr>
                 writer.AddStyleAttribute(HtmlTextWriterStyle.Height, "100%");

mcs/class/referencesource/System.Web/UI/WebParts/WebPartManager.cs.REMOVED.git-id

@@ -1 +1 @@
-c5b3495230e3320334b1a4ecf8403ec279b62c5c
+136ff0bf10fc7018428010d9e7883bf3c343818d

mcs/class/referencesource/System.Web/UI/WebParts/WebPartZoneBase.cs

@@ -1261,7 +1261,7 @@ namespace System.Web.UI.WebControls.WebParts {
                 }
 
                 if (orientation == Orientation.Vertical) {
-                    // Add an extra row with height of 100%, to [....] up any extra space
+                    // Add an extra row with height of 100%, to Microsoft up any extra space
                     // if the height of the zone is larger than its contents
                     writer.RenderBeginTag(HtmlTextWriterTag.Tr);
 
@@ -1276,7 +1276,7 @@ namespace System.Web.UI.WebControls.WebParts {
                     writer.RenderEndTag(); // Tr
                 }
                 else {
-                    // Add an extra cell with width of 100%, to [....] up any extra space
+                    // Add an extra cell with width of 100%, to Microsoft up any extra space
                     // if the width of the zone is larger than its contents.
                     writer.AddStyleAttribute(HtmlTextWriterStyle.Width, "100%");