Updates referencesource to .NET 4.7

4 files changed, 33 insertions, 239 deletions

diff --git a/mcs/class/System.Runtime.Caching/Makefile b/mcs/class/System.Runtime.Caching/Makefile
index 8a42eff58b0..380b02e3e79 100644
--- a/mcs/class/System.Runtime.Caching/Makefile
+++ b/mcs/class/System.Runtime.Caching/Makefile
@@ -6,6 +6,9 @@ LIBRARY = System.Runtime.Caching.dll
 LIB_REFS = System System.Data System.Configuration System.Core
 LIB_MCS_FLAGS = -nowarn:414
 
+RESX_RESOURCE_STRING = \
+	../referencesource/System.Runtime.Caching/R.resx
+
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs
deleted file mode 100644
index 2fdeb996965..00000000000
--- a/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-// This is a copy of external/referencesource/System.Runtime.Caching/Resources/R.Designer.cs
-// This version does not use ResourceManager, instead it uses hard coded strings.
-// This should be removed once Mono has access to .NET resources.
-
-namespace System.Runtime.Caching.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class R {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Grandfathered suppression from original caching code checkin")]
-        internal R() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Runtime.Caching.Resources.R", typeof(R).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; must be greater than or equal to &apos;{1}&apos; and less than or equal to &apos;{2}&apos;..
-        /// </summary>
-        internal static string Argument_out_of_range {
-            get {
-                return "Argument_out_of_range";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The collection &apos;{0}&apos; contains a null element..
-        /// </summary>
-        internal static string Collection_contains_null_element {
-            get {
-                return "Collection_contains_null_element";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The collection &apos;{0}&apos; contains a null or empty string..
-        /// </summary>
-        internal static string Collection_contains_null_or_empty_string {
-            get {
-                return "Collection_contains_null_or_empty_string";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to retrieve configuration section &apos;{0}&apos;..
-        /// </summary>
-        internal static string Config_unable_to_get_section {
-            get {
-                return "Config_unable_to_get_section";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Default is a reserved MemoryCache name..
-        /// </summary>
-        internal static string Default_is_reserved {
-            get {
-                return "Default_is_reserved";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The collection &apos;{0}&apos; is empty..
-        /// </summary>
-        internal static string Empty_collection {
-            get {
-                return "Empty_collection";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Initialization has not completed yet.  The InitializationComplete method must be invoked before Dispose is invoked..
-        /// </summary>
-        internal static string Init_not_complete {
-            get {
-                return "Init_not_complete";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to One of the following parameters must be specified: dependencies, absoluteExpiration, slidingExpiration..
-        /// </summary>
-        internal static string Invalid_argument_combination {
-            get {
-                return "Invalid_argument_combination";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Only one callback can be specified.  Either RemovedCallback or UpdateCallback must be null..
-        /// </summary>
-        internal static string Invalid_callback_combination {
-            get {
-                return "Invalid_callback_combination";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to AbsoluteExpiration must be DateTimeOffset.MaxValue or SlidingExpiration must be TimeSpan.Zero..
-        /// </summary>
-        internal static string Invalid_expiration_combination {
-            get {
-                return "Invalid_expiration_combination";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid state..
-        /// </summary>
-        internal static string Invalid_state {
-            get {
-                return "Invalid_state";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The method has already been invoked, and can only be invoked once..
-        /// </summary>
-        internal static string Method_already_invoked {
-            get {
-                return "Method_already_invoked";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The property has already been set, and can only be set once..
-        /// </summary>
-        internal static string Property_already_set {
-            get {
-                return "Property_already_set";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid configuration: {0}=&quot;{1}&quot;.  The {0} value must be a time interval that can be parsed by System.TimeSpan.Parse..
-        /// </summary>
-        internal static string TimeSpan_invalid_format {
-            get {
-                return "TimeSpan_invalid_format";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to CacheItemUpdateCallback must be null..
-        /// </summary>
-        internal static string Update_callback_must_be_null {
-            get {
-                return "Update_callback_must_be_null";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid configuration: {0}=&quot;{1}&quot;.  The {0} value must be a non-negative 32-bit integer..
-        /// </summary>
-        internal static string Value_must_be_non_negative_integer {
-            get {
-                return "Value_must_be_non_negative_integer";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid configuration: {0}=&quot;{1}&quot;.  The {0} value must be a positive 32-bit integer..
-        /// </summary>
-        internal static string Value_must_be_positive_integer {
-            get {
-                return "Value_must_be_positive_integer";
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid configuration: {0}=&quot;{1}&quot;.  The {0} value cannot be greater than &apos;{2}&apos;..
-        /// </summary>
-        internal static string Value_too_big {
-            get {
-                return "Value_too_big";
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to An empty string is invalid..
-        /// </summary>
-        internal static string Empty_string_invalid {
-            get {
-                return "Empty_string_invalid";
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to The parameter regionName must be null..
-        /// </summary>
-        internal static string RegionName_not_supported {
-            get {
-                return "RegionName_not_supported";
-            }
-        }
-
-    }
-}
diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/R.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/R.cs
new file mode 100644
index 00000000000..6e8cb9f4f21
--- /dev/null
+++ b/mcs/class/System.Runtime.Caching/ReferenceSources/R.cs
@@ -0,0 +1,28 @@
+//
+// This file was generated by resx2sr tool
+//
+
+partial class R
+{
+	public const string Config_unable_to_get_section = "Unable to retrieve configuration section '{0}'.";
+	public const string TimeSpan_invalid_format = "Invalid configuration: {0}=\"{1}\".  The {0} value must be a time interval that can be parsed by System.TimeSpan.Parse.";
+	public const string Value_must_be_non_negative_integer = "Invalid configuration: {0}=\"{1}\".  The {0} value must be a non-negative 32-bit integer.";
+	public const string Value_must_be_positive_integer = "Invalid configuration: {0}=\"{1}\".  The {0} value must be a positive 32-bit integer.";
+	public const string Value_too_big = "Invalid configuration: {0}=\"{1}\".  The {0} value cannot be greater than '{2}'.";
+	public const string Empty_collection = "The collection '{0}' is empty.";
+	public const string Collection_contains_null_element = "The collection '{0}' contains a null element.";
+	public const string Collection_contains_null_or_empty_string = "The collection '{0}' contains a null or empty string.";
+	public const string Method_already_invoked = "The method has already been invoked, and can only be invoked once.";
+	public const string Property_already_set = "The property has already been set, and can only be set once.";
+	public const string Invalid_state = "Invalid state.";
+	public const string Init_not_complete = "Initialization has not completed yet.  The InitializationComplete method must be invoked before Dispose is invoked.";
+	public const string Default_is_reserved = "Default is a reserved MemoryCache name.";
+	public const string Invalid_expiration_combination = "AbsoluteExpiration must be DateTimeOffset.MaxValue or SlidingExpiration must be TimeSpan.Zero.";
+	public const string Invalid_callback_combination = "Only one callback can be specified.  Either RemovedCallback or UpdateCallback must be null.";
+	public const string Invalid_argument_combination = "One of the following parameters must be specified: dependencies, absoluteExpiration, slidingExpiration.";
+	public const string Update_callback_must_be_null = "CacheItemUpdateCallback must be null.";
+	public const string Argument_out_of_range = "'{0}' must be greater than or equal to '{1}' and less than or equal to '{2}'.";
+	public const string Empty_string_invalid = "An empty string is invalid.";
+	public const string RegionName_not_supported = "The parameter regionName must be null.";
+	public const string Value_must_be_boolean = "Invalid configuration: {0}=\"{1}\".  The {0} value must be a boolean.";
+}
diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.dll.sources b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.dll.sources
index 46aa74c47c0..010a8e456d9 100644
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.dll.sources
+++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.dll.sources
@@ -7,7 +7,8 @@ Assembly/AssemblyInfo.cs
 ReferenceSources/CacheEntryCollection.cs
 ReferenceSources/CacheExpires.cs
 ReferenceSources/CacheUsage.cs
-ReferenceSources/R.Designer.cs
+ReferenceSources/R.cs
+
 ../referencesource/System.Runtime.Caching/Resources/RH.cs
 ../referencesource/System.Runtime.Caching/System/Caching/CacheEntryChangeMonitor.cs
 ../referencesource/System.Runtime.Caching/System/Caching/CacheEntryRemovedArguments.cs