Merge pull request #3563 from lewurm/interpreter

[mono.git] / mcs / build / common / SR.cs

diff --git a/mcs/build/common/SR.cs b/mcs/build/common/SR.cs
index 02dc06fd68ad2608f24b825edefec74b04915427..a797d4bff685b89860eacf5112db7ee5b87a67b1 100644 (file)
--- a/mcs/build/common/SR.cs
+++ b/mcs/build/common/SR.cs
@@ -1,24 +1,5 @@
 using System.Globalization;
 
-static class AssemblyRef
-{
-       // FIXME
-       internal const string SystemConfiguration = "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
-       internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
-
-       public const string EcmaPublicKey = "b77a5c561934e089";
-       public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
- 
-       public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
-       public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
-       public const string SystemData = Consts.AssemblySystem_Data;
-       public const string SystemDesign = Consts.AssemblySystem_Design;
-       public const string SystemDrawing = Consts.AssemblySystem_Drawing;
-       public const string SystemWeb = Consts.AssemblySystem_Web;
-       public const string SystemWebExtensions =  "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
-       public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
-}
-
 static partial class SR
 {
        internal static string GetString(string name, params object[] args)
@@ -40,10 +21,36 @@ static partial class SR
        {
                return name;
        }
+
+       internal static string Format(string resourceFormat, params object[] args)
+       {
+               if (args != null) {
+                       return string.Format (CultureInfo.InvariantCulture, resourceFormat, args);
+               }
+
+               return resourceFormat;
+       }
+
+       internal static string Format(string resourceFormat, object p1)
+       {
+               return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1);
+       }
+
+       internal static string Format(string resourceFormat, object p1, object p2)
+       {
+               return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2);
+       }
+
+       internal static string Format(string resourceFormat, object p1, object p2, object p3)
+       {
+               return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2, p3);
+       }
 }
 
+#if !INSIDE_CORLIB
 namespace System.Runtime.CompilerServices
 {
        class FriendAccessAllowedAttribute : Attribute
        { }
 }
+#endif