Merge pull request #900 from Blewzman/FixAggregateExceptionGetBaseException

[mono.git] / mcs / build / common / Consts.cs.in

diff --git a/mcs/build/common/Consts.cs.in b/mcs/build/common/Consts.cs.in
index 5010a35a6f9b7ccb4466a0130fa029f99d10fb3e..5aa2f39908df44131d3c1caa31bb24491397bcfa 100644 (file)
--- a/mcs/build/common/Consts.cs.in
+++ b/mcs/build/common/Consts.cs.in
@@ -39,7 +39,19 @@ static class Consts
        public const string MonoProduct = "Mono Common Language Infrastructure";
        public const string MonoCopyright = "(c) Various Mono authors";
 
-#if NET_4_0
+#if NET_2_1
+       // Versions of .NET Framework for Silverlight 4.0
+       public const string FxVersion = "2.0.5.0";
+       public const string VsVersion = "9.0.0.0"; // unused, but needed for compilation
+       public const string FxFileVersion = "4.0.50524.0";
+       public const string VsFileVersion = "9.0.50727.42"; // unused, but needed for compilation
+#elif NET_4_5
+       public const string FxVersion = "4.0.0.0";
+       public const string FxFileVersion = "4.0.30319.17020";
+       
+       public const string VsVersion = "0.0.0.0"; // Useless ?
+       public const string VsFileVersion = "11.0.0.0"; // TODO:
+#elif NET_4_0
        public const string FxVersion = "4.0.0.0";
        public const string FxFileVersion = "4.0.30319.1";
        
@@ -56,12 +68,6 @@ static class Consts
        public const string VsVersion = "8.0.0.0";
        public const string FxFileVersion = "3.0.4506.648";
        public const string VsFileVersion = "6.0.6001.17014";
-#elif NET_2_1
-       // Versions of .NET Framework for Silverlight 4.0
-       public const string FxVersion = "2.0.5.0";
-       public const string VsVersion = "9.0.0.0"; // unused, but needed for compilation
-       public const string FxFileVersion = "4.0.50524.0";
-       public const string VsFileVersion = "9.0.50727.42"; // unused, but needed for compilation
 #elif NET_2_0
        // Versions of .NET Framework 2.0 RTM
        public const string FxVersion = "2.0.0.0";
@@ -76,6 +82,12 @@ static class Consts
 #error No profile symbols defined.
 #endif
 
+#if MOBILE
+       const string PublicKeyToken = "7cec85d7bea7798e";
+#else
+       const string PublicKeyToken = "b77a5c561934e089";
+#endif
+
        //
        // Use these assembly name constants to make code more maintainable.
        //
@@ -88,7 +100,7 @@ static class Consts
        public const string AssemblyMono_Posix = "Mono.Posix, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
        public const string AssemblyMono_Security = "Mono.Security, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
        public const string AssemblyMono_Messaging_RabbitMQ = "Mono.Messaging.RabbitMQ, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
-       public const string AssemblyCorlib = "mscorlib, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
+       public const string AssemblyCorlib = "mscorlib, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=" + PublicKeyToken;
        public const string AssemblySystem = "System, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
        public const string AssemblySystem_Data = "System.Data, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
        public const string AssemblySystem_Design = "System.Design, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
@@ -107,7 +119,9 @@ static class Consts
        public const string WindowsBase_3_0 = "WindowsBase, Version=3.0.0.0, PublicKeyToken=31bf3856ad364e35";
        public const string AssemblyWindowsBase = "WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
        public const string AssemblyPresentationCore_3_5 = "PresentationCore, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+       public const string AssemblyPresentationCore_4_0 = "PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
        public const string AssemblyPresentationFramework_3_5 = "PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+       public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #elif NET_2_1
        public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #elif NET_2_0