diff options
139 files changed, 390 insertions, 1294 deletions
diff --git a/mcs/bmcs/bmcs.exe.config b/mcs/bmcs/bmcs.exe.config index 16ccafe082e..8ec3867e9b7 100644 --- a/mcs/bmcs/bmcs.exe.config +++ b/mcs/bmcs/bmcs.exe.config @@ -1,6 +1,6 @@ <configuration>
<startup>
- <supportedRuntime version="v2.0.40607"/>
+ <supportedRuntime version="v2.0.50215"/>
</startup>
<system.diagnostics>
<trace autoflush="true" indentsize="4">
diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs new file mode 100644 index 00000000000..b458723b2eb --- /dev/null +++ b/mcs/build/common/Consts.cs @@ -0,0 +1,92 @@ +//
+// Consts.cs
+//
+// Author:
+// Kornél Pál <http://www.kornelpal.hu/>
+//
+// Copyright (C) 2005 Kornél Pál
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Runtime.InteropServices;
+
+internal
+#if NET_2_0
+ static
+#else
+ sealed
+#endif
+ class Consts
+{
+#if !NET_2_0
+ private Consts ()
+ {
+ }
+#endif
+
+ //
+ // Use these assembly version constants to make code more maintainable.
+ //
+
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+ public const string FxVersion = "2.0.0.0";
+ public const string VsVersion = "8.0.0.0";
+#elif NET_1_1
+ public const string FxVersion = "1.0.5000.0";
+ public const string VsVersion = "7.0.5000.0";
+#elif NET_1_0
+ public const string FxVersion = "1.0.3300.0";
+ public const string VsVersion = "7.0.3300.0";
+#else
+#error No profile symbols specified.
+#endif
+
+ //
+ // Use these assembly name constants to make code more maintainable.
+ //
+
+ public const string AssemblyI18N = "I18N, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
+ public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblyMono_Http = "Mono.Http, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
+ 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 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";
+ public const string AssemblySystem_DirectoryServices = "System.DirectoryServices, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblySystem_Drawing = "System.Drawing, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblySystem_Messaging = "System.Messaging, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblySystem_Security = "System.Security, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblySystem_ServiceProcess = "System.DirectoryServices, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+ public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
+
+#if INSIDE_CORLIB
+#if BOOTSTRAP_WITH_OLDLIB
+ public const UnmanagedType UnmanagedType_80 = UnmanagedType.mono_bootstrap_NativeTypeMax;
+#else
+ public const UnmanagedType UnmanagedType_80 = (UnmanagedType) 80;
+#endif
+#endif
+}
diff --git a/mcs/class/Accessibility/Accessibility.dll.sources b/mcs/class/Accessibility/Accessibility.dll.sources index fb8ab286712..49530747bda 100644 --- a/mcs/class/Accessibility/Accessibility.dll.sources +++ b/mcs/class/Accessibility/Accessibility.dll.sources @@ -1,3 +1,4 @@ Accessibility/IAccessible.cs Accessibility/IAccessibleHandler.cs Assembly/AssemblyInfo.cs +../../build/common/Consts.cs diff --git a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs index 9dbb9dd1aee..f79c8bce94c 100644 --- a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs +++ b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs @@ -37,17 +37,12 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle("Accessibility.dll")] diff --git a/mcs/class/ByteFX.Data/mysqlclient/Connection.resx b/mcs/class/ByteFX.Data/mysqlclient/Connection.resx index 6b3c4ce0a5f..6af13537217 100644 --- a/mcs/class/ByteFX.Data/mysqlclient/Connection.resx +++ b/mcs/class/ByteFX.Data/mysqlclient/Connection.resx @@ -34,9 +34,9 @@ <value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
diff --git a/mcs/class/ByteFX.Data/mysqlclient/command.resx b/mcs/class/ByteFX.Data/mysqlclient/command.resx index 6b3c4ce0a5f..6af13537217 100644 --- a/mcs/class/ByteFX.Data/mysqlclient/command.resx +++ b/mcs/class/ByteFX.Data/mysqlclient/command.resx @@ -34,9 +34,9 @@ <value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
diff --git a/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs b/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs index 1b1166374c8..d0a7fa24bec 100644 --- a/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs +++ b/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs @@ -33,13 +33,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] //[assembly: AssemblyTitle ("")] [assembly: AssemblyDescription ("Commons.Xml.Relaxng.dll")] diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.dll.sources b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.dll.sources index 1ccb8391925..cd2806fe232 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.dll.sources +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Commons.Xml/XmlDefaultReader.cs Commons.Xml.Relaxng/Misc.cs diff --git a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs index 570a231ecf0..2ae14eeb3b4 100644 --- a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs +++ b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs @@ -40,28 +40,29 @@ using System.Runtime.ConstrainedExecution; #endif using System.Runtime.InteropServices; +[assembly: AssemblyVersion (Consts.VsVersion)] +#if (NET_2_0) +[assembly: SatelliteContractVersion (Consts.VsVersion)] +#endif + #if (NET_1_0) [assembly: AssemblyDescription ("Managed interface for C# compiler")] [assembly: AssemblyFileVersion ("7.0.9466.0")] [assembly: AssemblyTitle ("Managed C# Compiler")] - [assembly: AssemblyVersion ("7.0.3300.0")] #elif (NET_2_0) [assembly: AssemblyDefaultAlias ("cscompmgd.dll")] [assembly: AssemblyDescription ("cscompmgd.dll")] [assembly: AssemblyFileVersion ("8.0.50215.44")] [assembly: AssemblyInformationalVersion ("8.0.50215.44")] [assembly: AssemblyTitle ("cscompmgd.dll")] - [assembly: AssemblyVersion ("8.0.3600.0")] [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)] [assembly: Debuggable(DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)] [assembly: NeutralResourcesLanguage ("en-US")] [assembly: ReliabilityContract(Consistency.MayCorruptProcess, Cer.None)] - [assembly: SatelliteContractVersion ("8.0.0.0")] #elif (NET_1_1) [assembly: AssemblyDescription ("Managed interface for C# compiler")] [assembly: AssemblyFileVersion ("7.10.3052.4")] [assembly: AssemblyTitle ("Managed C# Compiler")] - [assembly: AssemblyVersion ("7.0.5000.0")] #endif [assembly: CLSCompliant (true)] diff --git a/mcs/class/Cscompmgd/Cscompmgd.dll.sources b/mcs/class/Cscompmgd/Cscompmgd.dll.sources index b5366cf0ee4..8558e1d8cb0 100644 --- a/mcs/class/Cscompmgd/Cscompmgd.dll.sources +++ b/mcs/class/Cscompmgd/Cscompmgd.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Microsoft.CSharp/Compiler.cs Microsoft.CSharp/CompilerError.cs diff --git a/mcs/class/Custommarshalers/Assembly/AssemblyInfo.cs b/mcs/class/Custommarshalers/Assembly/AssemblyInfo.cs index 96786b21ed7..16e549c8075 100644 --- a/mcs/class/Custommarshalers/Assembly/AssemblyInfo.cs +++ b/mcs/class/Custommarshalers/Assembly/AssemblyInfo.cs @@ -32,14 +32,10 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -/* TODO COMPLETE INFORMATION +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif -#if (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +/* TODO COMPLETE INFORMATION [assembly: AssemblyTitle ("")] [assembly: AssemblyDescription ("")] diff --git a/mcs/class/Custommarshalers/System.Runtime.InteropServices.CustomMarshalers.dll.sources b/mcs/class/Custommarshalers/System.Runtime.InteropServices.CustomMarshalers.dll.sources index 8f712251af9..cb154ba9475 100644 --- a/mcs/class/Custommarshalers/System.Runtime.InteropServices.CustomMarshalers.dll.sources +++ b/mcs/class/Custommarshalers/System.Runtime.InteropServices.CustomMarshalers.dll.sources @@ -1,5 +1,6 @@ ./Assembly/AssemblyInfo.cs -./../../build/common/Locale.cs +../../build/common/Consts.cs +../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs ./System.Runtime.InteropServices.CustomMarshalers/EnumerableToDispatchMarshaler.cs ./System.Runtime.InteropServices.CustomMarshalers/ExpandoToDispatchExMarshaler.cs diff --git a/mcs/class/I18N/Assembly/AssemblyInfo.cs b/mcs/class/I18N/Assembly/AssemblyInfo.cs index 41cdc8fdb3b..d27db9ad22c 100644 --- a/mcs/class/I18N/Assembly/AssemblyInfo.cs +++ b/mcs/class/I18N/Assembly/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#else - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/I18N/CJK/I18N.CJK.dll.sources b/mcs/class/I18N/CJK/I18N.CJK.dll.sources index 4a8d61b9964..1d817f51972 100755 --- a/mcs/class/I18N/CJK/I18N.CJK.dll.sources +++ b/mcs/class/I18N/CJK/I18N.CJK.dll.sources @@ -1,4 +1,5 @@ ../Assembly/AssemblyInfo.cs +../../../build/common/Consts.cs Big5Convert.cs CP932.cs CP50221.cs diff --git a/mcs/class/I18N/Common/I18N.dll.sources b/mcs/class/I18N/Common/I18N.dll.sources index c79a337c7ae..24263e84dd0 100755 --- a/mcs/class/I18N/Common/I18N.dll.sources +++ b/mcs/class/I18N/Common/I18N.dll.sources @@ -1,4 +1,5 @@ ../Assembly/AssemblyInfo.cs +../../../build/common/Consts.cs ByteEncoding.cs Handlers.cs Manager.cs diff --git a/mcs/class/I18N/MidEast/I18N.MidEast.dll.sources b/mcs/class/I18N/MidEast/I18N.MidEast.dll.sources index a1ce9a1e494..c8f4ca56f6d 100755 --- a/mcs/class/I18N/MidEast/I18N.MidEast.dll.sources +++ b/mcs/class/I18N/MidEast/I18N.MidEast.dll.sources @@ -1,4 +1,5 @@ ../Assembly/AssemblyInfo.cs +../../../build/common/Consts.cs CP1254.cs CP1255.cs CP1256.cs diff --git a/mcs/class/I18N/Other/I18N.Other.dll.sources b/mcs/class/I18N/Other/I18N.Other.dll.sources index 578a16dfe89..f93e3fd3404 100755 --- a/mcs/class/I18N/Other/I18N.Other.dll.sources +++ b/mcs/class/I18N/Other/I18N.Other.dll.sources @@ -1,4 +1,5 @@ ../Assembly/AssemblyInfo.cs +../../../build/common/Consts.cs CP1251.cs CP1257.cs CP1258.cs diff --git a/mcs/class/I18N/Rare/I18N.Rare.dll.sources b/mcs/class/I18N/Rare/I18N.Rare.dll.sources index aa18564a56c..8359d47c7ec 100755 --- a/mcs/class/I18N/Rare/I18N.Rare.dll.sources +++ b/mcs/class/I18N/Rare/I18N.Rare.dll.sources @@ -1,4 +1,5 @@ ../Assembly/AssemblyInfo.cs +../../../build/common/Consts.cs CP866.cs CP1026.cs CP869.cs diff --git a/mcs/class/I18N/West/I18N.West.dll.sources b/mcs/class/I18N/West/I18N.West.dll.sources index 29cce8b0baa..1bc2dfbe110 100755 --- a/mcs/class/I18N/West/I18N.West.dll.sources +++ b/mcs/class/I18N/West/I18N.West.dll.sources @@ -1,4 +1,5 @@ ../Assembly/AssemblyInfo.cs +../../../build/common/Consts.cs CP10000.cs CP10079.cs CP1250.cs diff --git a/mcs/class/Managed.Windows.Forms/Assembly/AssemblyInfo.cs b/mcs/class/Managed.Windows.Forms/Assembly/AssemblyInfo.cs index 0597d79badf..2f390520b2a 100644 --- a/mcs/class/Managed.Windows.Forms/Assembly/AssemblyInfo.cs +++ b/mcs/class/Managed.Windows.Forms/Assembly/AssemblyInfo.cs @@ -16,17 +16,12 @@ using System.Runtime.InteropServices; // General Information about the System.Windows.Forms assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] - [assembly: SatelliteContractVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle("System.Windows.Forms.dll")] diff --git a/mcs/class/Managed.Windows.Forms/Assembly/Consts.cs b/mcs/class/Managed.Windows.Forms/Assembly/Consts.cs deleted file mode 100644 index 6de7a833c7e..00000000000 --- a/mcs/class/Managed.Windows.Forms/Assembly/Consts.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -//#elif (NET_1_1) -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -}
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/SWF.csproj b/mcs/class/Managed.Windows.Forms/SWF.csproj index 2607335e7a6..20c920c5cd2 100644 --- a/mcs/class/Managed.Windows.Forms/SWF.csproj +++ b/mcs/class/Managed.Windows.Forms/SWF.csproj @@ -89,7 +89,7 @@ <Files> <Include> <File - RelPath = "Assembly\Consts.cs" + RelPath = "..\..\build\common\Consts.cs" SubType = "Code" BuildAction = "Compile" /> diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.sources b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.sources index cc59d51c553..bd88c105b04 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.sources +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs Assembly/Locale.cs System.Resources/ResXNullRef.cs System.Resources/ResXFileRef.cs diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs index a6422a71295..2052ad44fe0 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs @@ -109,7 +109,7 @@ namespace System.Windows.Forms { #region AxHost.State Class [Serializable] - [TypeConverter("System.ComponentModel.TypeConverter, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [TypeConverter("System.ComponentModel.TypeConverter, " + Consts.AssemblySystem)] public class State : ISerializable { public State(Stream ms, int storageType, bool manualUpdate, string licKey) { throw new NotImplementedException("COM/ActiveX support is not implemented"); diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs index 665fd705968..345a7d6df99 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs @@ -31,8 +31,8 @@ using System.Reflection; namespace System.Windows.Forms { [DefaultEvent("CollectionChanged")] - [Editor("System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor))] - [TypeConverter("System.Windows.Forms.Design.ControlBindingsConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [Editor("System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing, typeof(System.Drawing.Design.UITypeEditor))] + [TypeConverter("System.Windows.Forms.Design.ControlBindingsConverter, " + Consts.AssemblySystem_Design)] public class ControlBindingsCollection : BindingsCollection { #region Fields private Control control; diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs index eb0c1f6a38a..68e0954c8df 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Runtime.Serialization; namespace System.Windows.Forms { - [Editor("System.Drawing.Design.CursorEditor, System.Drawing.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor))] + [Editor("System.Drawing.Design.CursorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof(System.Drawing.Design.UITypeEditor))] [Serializable] [TypeConverter(typeof(CursorConverter))] public sealed class Cursor : IDisposable, ISerializable { diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs index 31f0bef2a76..25ace7aeb59 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs @@ -508,7 +508,7 @@ namespace System.Windows.Forms } [DefaultValue(null)] - [Editor ("System.Windows.Forms.Design.DataMemberListEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [Editor ("System.Windows.Forms.Design.DataMemberListEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)] public string DataMember { get { return datamember; } set { @@ -528,7 +528,7 @@ namespace System.Windows.Forms [DefaultValue(null)] [RefreshProperties(RefreshProperties.Repaint)] - [TypeConverter("System.Windows.Forms.Design.DataSourceConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [TypeConverter("System.Windows.Forms.Design.DataSourceConverter, " + Consts.AssemblySystem_Design)] public object DataSource { get { return datasource; diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs index da242f3fe31..8cb5cee6b7f 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs @@ -33,9 +33,9 @@ using System.Drawing; namespace System.Windows.Forms { [ToolboxItemFilter("System.Windows.Forms")] - [ProvideProperty("IconAlignment", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - [ProvideProperty("IconPadding", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - [ProvideProperty("Error", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [ProvideProperty("IconAlignment", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] + [ProvideProperty("IconPadding", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] + [ProvideProperty("Error", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] public class ErrorProvider : Component, IExtenderProvider { #region Private Classes private class ErrorProperty { @@ -318,7 +318,7 @@ namespace System.Windows.Forms { [MonoTODO] [DefaultValue(null)] - [Editor ("System.Windows.Forms.Design.DataMemberListEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [Editor ("System.Windows.Forms.Design.DataMemberListEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)] public string DataMember { get { return datamember; @@ -332,7 +332,7 @@ namespace System.Windows.Forms { [MonoTODO] [DefaultValue(null)] - [TypeConverter("System.Windows.Forms.Design.DataSourceConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [TypeConverter("System.Windows.Forms.Design.DataSourceConverter, " + Consts.AssemblySystem_Design)] public object DataSource { get { return datasource; diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HelpProvider.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HelpProvider.cs index 4934f67d652..731947b9a2d 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HelpProvider.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HelpProvider.cs @@ -34,10 +34,10 @@ using System.Drawing; namespace System.Windows.Forms { [ToolboxItemFilter("System.Windows.Forms")] - [ProvideProperty("ShowHelp", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - [ProvideProperty("HelpNavigator", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - [ProvideProperty("HelpKeyword", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] - [ProvideProperty("HelpString", "System.Windows.Forms.Control, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [ProvideProperty("ShowHelp", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] + [ProvideProperty("HelpNavigator", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] + [ProvideProperty("HelpKeyword", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] + [ProvideProperty("HelpString", "System.Windows.Forms.Control, " + Consts.AssemblySystem_Windows_Forms)] public class HelpProvider : Component, IExtenderProvider { #region HelpProperty Class private class HelpProperty { @@ -106,7 +106,7 @@ namespace System.Windows.Forms { #region Public Instance Properties [DefaultValue(null)] - [Editor ("System.Windows.Forms.Design.HelpNamespaceEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [Editor ("System.Windows.Forms.Design.HelpNamespaceEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)] [Localizable(true)] public string HelpNamespace { get { diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs index f630955f32f..013e1ff1d37 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs @@ -39,7 +39,7 @@ namespace System.Windows.Forms { [DefaultProperty("Images")] [Designer("System.Windows.Forms.Design.ImageListDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")] [ToolboxItemFilter("System.Windows.Forms", ToolboxItemFilterType.Allow)] - [TypeConverter("System.Windows.Forms.ImageListConverter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [TypeConverter("System.Windows.Forms.ImageListConverter, " + Consts.AssemblySystem_Windows_Forms)] public sealed class ImageList : System.ComponentModel.Component { #region Local Variables private ColorDepth color_depth; diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs index c3e19d8e560..66341df5be3 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs @@ -60,7 +60,7 @@ namespace System.Windows.Forms [DefaultValue(null)] [RefreshProperties(RefreshProperties.Repaint)] - [TypeConverter("System.Windows.Forms.Design.DataSourceConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [TypeConverter("System.Windows.Forms.Design.DataSourceConverter, " + Consts.AssemblySystem_Design)] public object DataSource { get { return data_source; } set { @@ -80,7 +80,7 @@ namespace System.Windows.Forms [DefaultValue("")] [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, " + Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))] - [TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, " + Consts.AssemblySystem_Design)] public string DisplayMember { get { return display_member; diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs index d30f9661fd0..705216205bb 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs @@ -36,7 +36,7 @@ using System.Runtime.InteropServices; namespace System.Windows.Forms { - [Designer ("Microsoft.VisualStudio.Windows.Forms.MenuDesigner, Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.IDesigner")] + [Designer ("Microsoft.VisualStudio.Windows.Forms.MenuDesigner, " + Consts.AssemblyMicrosoft_VisualStudio, "System.ComponentModel.Design.IDesigner")] [ToolboxItemFilter("System.Windows.Forms", ToolboxItemFilterType.Allow)] [ListBindable(false)] public abstract class Menu : Component diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs index 7b7b3b950b8..3568ec9fa33 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs @@ -488,7 +488,7 @@ namespace System.Windows.Forms } [DefaultValue(null)] - [TypeConverter("System.Windows.Forms.PropertyGrid+SelectedObjectConverter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [TypeConverter("System.Windows.Forms.PropertyGrid+SelectedObjectConverter, " + Consts.AssemblySystem_Windows_Forms)] public object SelectedObject { get { return selected_objects[0]; diff --git a/mcs/class/Microsoft.JScript/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.JScript/Assembly/AssemblyInfo.cs index b0217470572..3a743f7e7c5 100644 --- a/mcs/class/Microsoft.JScript/Assembly/AssemblyInfo.cs +++ b/mcs/class/Microsoft.JScript/Assembly/AssemblyInfo.cs @@ -34,16 +34,15 @@ using System.Runtime.InteropServices; using System.Security; using System.Resources; +[assembly: AssemblyVersion (Consts.VsVersion)] #if (NET_2_0) - [assembly: AssemblyVersion ("8.0.3600.0")]
// [assembly: CLSCompliant (true)] -#elif (NET_1_1) - [assembly: AssemblyVersion("7.0.5000.0")] - [assembly: SatelliteContractVersion("7.0.5000.0")] - [assembly: TypeLibVersion(7, 1)] #else - [assembly: AssemblyVersion("7.0.3300.0")] - [assembly: SatelliteContractVersion("7.0.3300.0")] +[assembly: SatelliteContractVersion (Consts.VsVersion)] +#endif + +#if (ONLY_1_1) + [assembly: TypeLibVersion(7, 1)] #endif [assembly: AssemblyTitle ("Microsoft.JScript")] diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript.dll.sources b/mcs/class/Microsoft.JScript/Microsoft.JScript.dll.sources index 13156f3f5f4..30053cde8f3 100644 --- a/mcs/class/Microsoft.JScript/Microsoft.JScript.dll.sources +++ b/mcs/class/Microsoft.JScript/Microsoft.JScript.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Microsoft.JScript/ast.cs Microsoft.JScript/ASTList.cs diff --git a/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs index afa71cace28..4d95d61d91d 100644 --- a/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs +++ b/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs @@ -38,16 +38,15 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about the Microsoft.VisualBasic assembly -#if (NET_2_0) - [assembly: AssemblyVersion ("8.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("7.0.5000.0")] - [assembly: SatelliteContractVersion("7.0.5000.0")] - [assembly: ComCompatibleVersion(7, 0, 3300, 0)] - [assembly: TypeLibVersion(7, 1)] -#else - [assembly: AssemblyVersion("7.0.3300.0")] - [assembly: SatelliteContractVersion("7.0.3300.0")] + +[assembly: AssemblyVersion (Consts.VsVersion)] +#if (!NET_2_0) +[assembly: SatelliteContractVersion (Consts.VsVersion)] +#endif + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (7, 0, 3300, 0)] +[assembly: TypeLibVersion (7, 1)] #endif [assembly: AssemblyTitle("Microsoft Visual Basic .NET Runtime")] diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.dll.sources b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.dll.sources index 4114634e16f..6d1da16ec6e 100644 --- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.dll.sources +++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs Microsoft.VisualBasic/AppWinStyle.cs diff --git a/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs index 7cf6dad768e..3aef4df1386 100644 --- a/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs +++ b/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs @@ -33,16 +33,14 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Resources; -#if (NET_2_0) - [assembly: AssemblyVersion ("8.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("7.0.5000.0")] - [assembly: SatelliteContractVersion ("7.0.5000.0")] - [assembly: ComCompatibleVersion (7, 0, 3300, 0)] - [assembly: TypeLibVersion (7, 1)] -#else - [assembly: AssemblyVersion ("7.0.3300.0")] - [assembly: SatelliteContractVersion ("7.0.3300.0")] +[assembly: AssemblyVersion (Consts.VsVersion)] +#if (!NET_2_0) +[assembly: SatelliteContractVersion (Consts.VsVersion)] +#endif + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (7, 0, 3300, 0)] +[assembly: TypeLibVersion (7, 1)] #endif /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.dll.sources b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.dll.sources index d59b42aabb5..edaee2929fd 100644 --- a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.dll.sources +++ b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Microsoft.VisualC/DebugInfoInPDBAttribute.cs Microsoft.VisualC/DecoratedNameAttribute.cs diff --git a/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs index fbedc93068f..5b0973304cb 100644 --- a/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs +++ b/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs @@ -33,16 +33,14 @@ using System.Reflection; using System.Resources; using System.Runtime.InteropServices; -#if (NET_2_0) - [assembly: AssemblyVersion ("8.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("7.0.5000.0")] - [assembly: SatelliteContractVersion ("7.0.5000.0")] - [assembly: ComCompatibleVersion (7, 0, 3300, 0)] - [assembly: TypeLibVersion (7, 1)] -#else - [assembly: AssemblyVersion ("7.0.3300.0")] - [assembly: SatelliteContractVersion ("7.0.3300.0")] +[assembly: AssemblyVersion (Consts.VsVersion)] +#if (!NET_2_0) +[assembly: SatelliteContractVersion (Consts.VsVersion)] +#endif + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (7, 0, 3300, 0)] +[assembly: TypeLibVersion (7, 1)] #endif [assembly: AssemblyTitle ("")] diff --git a/mcs/class/Microsoft.Vsa/Microsoft.Vsa.dll.sources b/mcs/class/Microsoft.Vsa/Microsoft.Vsa.dll.sources index 8f7459c4747..89fcc599285 100644 --- a/mcs/class/Microsoft.Vsa/Microsoft.Vsa.dll.sources +++ b/mcs/class/Microsoft.Vsa/Microsoft.Vsa.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Microsoft.Vsa/IVsaCodeItem.cs Microsoft.Vsa/IVsaEngine.cs diff --git a/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs index 47a75ee4531..d28fb41bb80 100644 --- a/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs @@ -33,13 +33,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources b/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources index 20d9651248c..2e244f6eb7c 100644 --- a/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources +++ b/mcs/class/Mono.Cairo/Mono.Cairo.dll.sources @@ -1,5 +1,6 @@ ./Assembly/AssemblyInfo.cs -./../../build/common/Locale.cs +../../build/common/Consts.cs +../../build/common/Locale.cs ./Mono.Cairo/Cairo.cs ./Mono.Cairo/Matrix.cs ./Mono.Cairo/Graphics.cs diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs b/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs index 2720eeacb56..87b442c59bd 100644 --- a/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs @@ -33,13 +33,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.dll.sources b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.dll.sources index 0ea2a216396..a6aa391ac06 100644 --- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.dll.sources +++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs MonoSymbolWriter.cs MonoSymbolTable.cs diff --git a/mcs/class/Mono.Data.SqliteClient/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Data.SqliteClient/Assembly/AssemblyInfo.cs index 4ac7f602c2f..e06154cd236 100644 --- a/mcs/class/Mono.Data.SqliteClient/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Data.SqliteClient/Assembly/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.dll.sources b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.dll.sources index 99629c2a80f..1ccbe7fe54c 100644 --- a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.dll.sources +++ b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Mono.Data.SqliteClient/Sqlite.cs Mono.Data.SqliteClient/SqliteCommand.cs diff --git a/mcs/class/Mono.Data.SybaseClient/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Data.SybaseClient/Assembly/AssemblyInfo.cs index 4ac7f602c2f..e06154cd236 100644 --- a/mcs/class/Mono.Data.SybaseClient/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Data.SybaseClient/Assembly/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.dll.sources b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.dll.sources index de098182730..6c7ec82fd16 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.dll.sources +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs Mono.Data.SybaseClient/SybaseCommand.cs diff --git a/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs index 4ac7f602c2f..e06154cd236 100644 --- a/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.dll.sources b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.dll.sources index eda96e3bade..9a4dd4049b4 100644 --- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.dll.sources +++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Mono.Data.Tds/TdsMetaParameter.cs Mono.Data.Tds/TdsMetaParameterCollection.cs diff --git a/mcs/class/Mono.Data.TdsClient/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Data.TdsClient/Assembly/AssemblyInfo.cs index 4ac7f602c2f..e06154cd236 100644 --- a/mcs/class/Mono.Data.TdsClient/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Data.TdsClient/Assembly/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient.dll.sources b/mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient.dll.sources index 3fbef14b8c8..683ba1041b5 100644 --- a/mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient.dll.sources +++ b/mcs/class/Mono.Data.TdsClient/Mono.Data.TdsClient.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs Mono.Data.TdsClient/TdsCommand.cs diff --git a/mcs/class/Mono.Data/AssemblyInfo.cs b/mcs/class/Mono.Data/AssemblyInfo.cs index 4ac7f602c2f..e06154cd236 100644 --- a/mcs/class/Mono.Data/AssemblyInfo.cs +++ b/mcs/class/Mono.Data/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Data/Mono.Data.dll.sources b/mcs/class/Mono.Data/Mono.Data.dll.sources index 74b6adc25f5..6eeaebae41c 100644 --- a/mcs/class/Mono.Data/Mono.Data.dll.sources +++ b/mcs/class/Mono.Data/Mono.Data.dll.sources @@ -1,4 +1,5 @@ AssemblyInfo.cs +../../build/common/Consts.cs DataTools.cs Provider.cs ProviderCollection.cs diff --git a/mcs/class/Mono.GetOptions/Assembly/AssemblyInfo.cs b/mcs/class/Mono.GetOptions/Assembly/AssemblyInfo.cs index aa76bdfa79d..b98d0b15d36 100644 --- a/mcs/class/Mono.GetOptions/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.GetOptions/Assembly/AssemblyInfo.cs @@ -49,13 +49,7 @@ using System.Runtime.CompilerServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#else - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] [assembly: AssemblyDelaySign (true)] [assembly: AssemblyKeyFile ("../mono.pub")] diff --git a/mcs/class/Mono.GetOptions/Mono.GetOptions.dll.sources b/mcs/class/Mono.GetOptions/Mono.GetOptions.dll.sources index c7c6d126dc0..d63c33aa619 100644 --- a/mcs/class/Mono.GetOptions/Mono.GetOptions.dll.sources +++ b/mcs/class/Mono.GetOptions/Mono.GetOptions.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs Mono/AboutAttribute.cs Mono/AuthorAttribute.cs Mono/UsageComplementAttribute.cs diff --git a/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs index 592c24734fb..f4c03dc360c 100644 --- a/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs @@ -31,13 +31,8 @@ using System.Reflection; using System.Runtime.CompilerServices; -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#else - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] + [assembly: AssemblyTitle("Mono.Http.dll")] [assembly: AssemblyDescription("Http and ASP.NET utilities")] [assembly: AssemblyConfiguration("Development version")] diff --git a/mcs/class/Mono.Http/Mono.Http.dll.sources b/mcs/class/Mono.Http/Mono.Http.dll.sources index 9ab4f6e492f..6257d8735ca 100644 --- a/mcs/class/Mono.Http/Mono.Http.dll.sources +++ b/mcs/class/Mono.Http/Mono.Http.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs Mono.Http/GZipWebRequest.cs Mono.Http/GZipWebResponse.cs Mono.Http/GZipWriteFilter.cs diff --git a/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs index 59e0c6c0b01..87b442c59bd 100644 --- a/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs @@ -33,13 +33,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#elif (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/Mono.Posix/Mono.Posix.dll.sources b/mcs/class/Mono.Posix/Mono.Posix.dll.sources index 37360878072..4eb2f4b70f5 100644 --- a/mcs/class/Mono.Posix/Mono.Posix.dll.sources +++ b/mcs/class/Mono.Posix/Mono.Posix.dll.sources @@ -1,5 +1,6 @@ ./Assembly/AssemblyInfo.cs -./../../build/common/Locale.cs +../../build/common/Consts.cs +../../build/common/Locale.cs ./Mono.Unix/Catalog.cs ./Mono.Unix/CdeclFunction.cs ./Mono.Unix/IncludeAttribute.cs diff --git a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs index 3d5e42cc2af..b0b5ead71c0 100644 --- a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs @@ -19,16 +19,7 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] [assembly: AssemblyCompany ("MONO development team")] [assembly: AssemblyCopyright ("(c) 2003-2004 Various Authors")] diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.dll.sources b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.dll.sources index 31c6ce6c476..4d4de1e1d52 100644 --- a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.dll.sources +++ b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Mono.Security.Cryptography/CapiContext.cs Mono.Security.Cryptography/CapiHash.cs diff --git a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs index 32e9fddbac6..02820830eaa 100644 --- a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs @@ -40,16 +40,7 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] [assembly: AssemblyCompany ("MONO development team")] [assembly: AssemblyCopyright ("(c) 2003-2004 Various Authors")] diff --git a/mcs/class/Mono.Security/Mono.Security.dll.sources b/mcs/class/Mono.Security/Mono.Security.dll.sources index 54877ac23ed..cf9f3b184be 100644 --- a/mcs/class/Mono.Security/Mono.Security.dll.sources +++ b/mcs/class/Mono.Security/Mono.Security.dll.sources @@ -1,5 +1,6 @@ ./Assembly/AssemblyInfo.cs -./../../build/common/Locale.cs +../../build/common/Consts.cs +../../build/common/Locale.cs ./Mono.Math/BigInteger.cs ./Mono.Math.Prime/ConfidenceFactor.cs ./Mono.Math.Prime/PrimalityTests.cs diff --git a/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs index e93f900d23b..30ef7fd99f7 100644 --- a/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs @@ -37,16 +37,7 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] - [assembly: SatelliteContractVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] [assembly: AssemblyTitle("Mono.Xml.Ext.dll")] [assembly: AssemblyDescription("Mono.Xml.Ext.dll")] diff --git a/mcs/class/Mono.Xml.Ext/Mono.Xml.Ext.dll.sources b/mcs/class/Mono.Xml.Ext/Mono.Xml.Ext.dll.sources index c174a48943c..14eeb2116cc 100644 --- a/mcs/class/Mono.Xml.Ext/Mono.Xml.Ext.dll.sources +++ b/mcs/class/Mono.Xml.Ext/Mono.Xml.Ext.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/MonoTODOAttribute.cs Mono.Xml.XPath/DTMXPathDocument.cs Mono.Xml.XPath/DTMXPathDocumentBuilder.cs diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.dll.sources b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.dll.sources index 8cddba40654..a784a903599 100755 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.dll.sources +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.dll.sources @@ -1,4 +1,5 @@ Novell.Directory.Ldap/AssemblyInfo.cs +../../build/common/Consts.cs Novell.Directory.Ldap/SupportClass.cs Novell.Directory.Ldap.Utilclass/Base64.cs Novell.Directory.Ldap.Utilclass/DN.cs diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs index a414e87282f..b5563d56cd2 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs @@ -63,13 +63,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#else - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] #if (!TARGET_JVM) [assembly: AssemblyDelaySign (true)] diff --git a/mcs/class/Npgsql/Npgsql.dll.sources b/mcs/class/Npgsql/Npgsql.dll.sources index 50f2f4b339d..1608cf8712e 100755 --- a/mcs/class/Npgsql/Npgsql.dll.sources +++ b/mcs/class/Npgsql/Npgsql.dll.sources @@ -1,4 +1,5 @@ Npgsql/AssemblyInfo.cs +../../build/common/Consts.cs Npgsql/HashAlgorithm.cs Npgsql/MD5.cs Npgsql/MD5CryptoServiceProvider.cs diff --git a/mcs/class/Npgsql/Npgsql/AssemblyInfo.cs b/mcs/class/Npgsql/Npgsql/AssemblyInfo.cs index baf5971cbaf..92b3c259bea 100644 --- a/mcs/class/Npgsql/Npgsql/AssemblyInfo.cs +++ b/mcs/class/Npgsql/Npgsql/AssemblyInfo.cs @@ -48,13 +48,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#else - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/mcs/class/PEAPI/Assembly/AssemblyInfo.cs b/mcs/class/PEAPI/Assembly/AssemblyInfo.cs index b9815908d15..a461e90522f 100644 --- a/mcs/class/PEAPI/Assembly/AssemblyInfo.cs +++ b/mcs/class/PEAPI/Assembly/AssemblyInfo.cs @@ -12,13 +12,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#elif (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/PEAPI/PEAPI.dll.sources b/mcs/class/PEAPI/PEAPI.dll.sources index e5a830536a0..e052c1386db 100644 --- a/mcs/class/PEAPI/PEAPI.dll.sources +++ b/mcs/class/PEAPI/PEAPI.dll.sources @@ -1,3 +1,4 @@ ./Assembly/AssemblyInfo.cs -./../../build/common/Locale.cs +../../build/common/Consts.cs +../../build/common/Locale.cs PEAPI.cs diff --git a/mcs/class/PresentationFramework/Assembly/AssemblyInfo.cs b/mcs/class/PresentationFramework/Assembly/AssemblyInfo.cs index 9feda362032..3c5e64d9133 100644 --- a/mcs/class/PresentationFramework/Assembly/AssemblyInfo.cs +++ b/mcs/class/PresentationFramework/Assembly/AssemblyInfo.cs @@ -14,13 +14,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/PresentationFramework/PresentationFramework.dll.sources b/mcs/class/PresentationFramework/PresentationFramework.dll.sources index d3db2b1a460..aa60831d94a 100644 --- a/mcs/class/PresentationFramework/PresentationFramework.dll.sources +++ b/mcs/class/PresentationFramework/PresentationFramework.dll.sources @@ -7,3 +7,4 @@ Mono.Windows.Serialization/Exceptions.cs Mono.Windows.Serialization/XamlParser.cs Mono.Windows.Serialization/IXamlWriter.cs Assembly/AssemblyInfo.cs +../../build/common/Consts.cs diff --git a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs index fbfd16692af..b916c5516f0 100644 --- a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs @@ -37,17 +37,12 @@ using System.Runtime.InteropServices; // General Information about the System.Configuration.Install assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] - [assembly: ComCompatibleVersion (1, 0, 3300, 0)] - [assembly: TypeLibVersion (1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle ("System.Configuration.Install.dll")] diff --git a/mcs/class/System.Configuration.Install/Assembly/Consts.cs b/mcs/class/System.Configuration.Install/Assembly/Consts.cs deleted file mode 100644 index 8321482cd26..00000000000 --- a/mcs/class/System.Configuration.Install/Assembly/Consts.cs +++ /dev/null @@ -1,78 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#elif (NET_2_0) - - public const string AssemblySystem_Design = "System.Design, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -} diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.dll.sources b/mcs/class/System.Configuration.Install/System.Configuration.Install.dll.sources index 1a4d274b2f5..2fb06f15ef9 100644 --- a/mcs/class/System.Configuration.Install/System.Configuration.Install.dll.sources +++ b/mcs/class/System.Configuration.Install/System.Configuration.Install.dll.sources @@ -1,6 +1,6 @@ Assembly/AssemblyInfo.cs ../../build/common/Locale.cs -Assembly/Consts.cs +../../build/common/Consts.cs System.Configuration.Install/AssemblyInstaller.cs System.Configuration.Install/IManagedInstaller.cs System.Configuration.Install/Installer.cs diff --git a/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs index b9d92a2a356..f8f7fb42342 100644 --- a/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs @@ -37,8 +37,8 @@ using System.Runtime.InteropServices; // General Information about the System.Configuration.Install assembly -[assembly: AssemblyVersion("2.0.3600.0")] -[assembly: SatelliteContractVersion("2.0.3600.0")] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle ("System.Configuration.dll")] [assembly: AssemblyDescription ("System.Configuration.dll")] diff --git a/mcs/class/System.Configuration/System.Configuration.dll.sources b/mcs/class/System.Configuration/System.Configuration.dll.sources index 03d65250df6..2c7d0e3f52a 100644 --- a/mcs/class/System.Configuration/System.Configuration.dll.sources +++ b/mcs/class/System.Configuration/System.Configuration.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.Configuration.Internal/DelegatingConfigHost.cs System.Configuration.Internal/IConfigErrorInfo.cs diff --git a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs index 5b4955dc0b5..9b168a3cd45 100644 --- a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs @@ -16,17 +16,12 @@ using System.Runtime.InteropServices; // General Information about the System.Data.OracleClient assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] - [assembly: ComCompatibleVersion (1, 0, 3300, 0)] - [assembly: TypeLibVersion (1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle ("System.Data.OracleClient.dll")] diff --git a/mcs/class/System.Data.OracleClient/Assembly/Consts.cs b/mcs/class/System.Data.OracleClient/Assembly/Consts.cs deleted file mode 100644 index fc5c5dfb4fa..00000000000 --- a/mcs/class/System.Data.OracleClient/Assembly/Consts.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_2_0) - - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=8.0.1200.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -} diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.dll.sources b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.dll.sources index e83eabc8602..82f899f6a14 100755 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.dll.sources +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.dll.sources @@ -1,6 +1,6 @@ Assembly/AssemblyInfo.cs ../../build/common/Locale.cs -Assembly/Consts.cs +../../build/common/Consts.cs System.Data.OracleClient.Oci/OciAttributeType.cs System.Data.OracleClient.Oci/OciBindHandle.cs System.Data.OracleClient.Oci/OciCalls.cs diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs index d9c34bbeea1..e83b5de2d95 100644 --- a/mcs/class/System.Data/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data/Assembly/AssemblyInfo.cs @@ -39,17 +39,12 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle("System.Data.dll")] diff --git a/mcs/class/System.Data/Assembly/Consts.cs b/mcs/class/System.Data/Assembly/Consts.cs deleted file mode 100644 index b2e8d46201b..00000000000 --- a/mcs/class/System.Data/Assembly/Consts.cs +++ /dev/null @@ -1,74 +0,0 @@ -// -// Consts.cs -// -// Authors: -// Umadevi S (sumadevi@novell.com) -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// This class is similar to the Consts.cs class at System.Web/Assembly by Andreas Nhar -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -//#elif (NET_1_1) -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -} diff --git a/mcs/class/System.Data/System.Data.dll.sources b/mcs/class/System.Data/System.Data.dll.sources index 65801281f11..f211fab5303 100644 --- a/mcs/class/System.Data/System.Data.dll.sources +++ b/mcs/class/System.Data/System.Data.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.Data/AcceptRejectRule.cs System.Data/AdapterMappingException.cs diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs index b7a45d80698..1879666fd21 100644 --- a/mcs/class/System.Data/System.Data/DataTable.cs +++ b/mcs/class/System.Data/System.Data/DataTable.cs @@ -445,7 +445,7 @@ namespace System.Data { [DataCategory ("Data")]
[DataSysDescription ("Indicates the column(s) that represent the primary key for this table.")]
[EditorAttribute ("Microsoft.VSDesigner.Data.Design.PrimaryKeyEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
- [TypeConverterAttribute ("System.Data.PrimaryKeyTypeConverter, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+ [TypeConverterAttribute ("System.Data.PrimaryKeyTypeConverter, " + Consts.AssemblySystem_Data)]
public DataColumn[] PrimaryKey {
get {
if (_primaryKeyConstraint == null) {
diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs index 0850ce8de7d..708a5d0088f 100644 --- a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs @@ -270,7 +270,7 @@ namespace MonoTests.System.Data // This is original DataSet.WriteXmlSchema() output // AssertEquals ("test#16", " <xs:element name=\"second\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" type=\"xs:string\" minOccurs=\"0\" />", substring); #if NET_2_0 - AssertEquals ("test#16", " <xs:element minOccurs=\"0\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" name=\"second\" type=\"xs:string\" />", substring); + AssertEquals ("test#16", " <xs:element minOccurs=\"0\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" name=\"second\" type=\"xs:string\" />", substring); #else AssertEquals ("test#16", " <xs:element minOccurs=\"0\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" name=\"second\" type=\"xs:string\" />", substring); #endif diff --git a/mcs/class/System.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Design/Assembly/AssemblyInfo.cs index 021e79e39d8..8cd78b96c98 100644 --- a/mcs/class/System.Design/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Design/Assembly/AssemblyInfo.cs @@ -37,17 +37,12 @@ using System.Runtime.InteropServices; // General Information about the System.Design assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] - [assembly: ComCompatibleVersion (1, 0, 3300, 0)] - [assembly: TypeLibVersion (1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle ("System.Design.dll")] diff --git a/mcs/class/System.Design/System.Design.dll.sources b/mcs/class/System.Design/System.Design.dll.sources index fb0650d5028..984f3d073a0 100755 --- a/mcs/class/System.Design/System.Design.dll.sources +++ b/mcs/class/System.Design/System.Design.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs System.ComponentModel.Design/ArrayEditor.cs diff --git a/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs b/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs index b7c0af4024e..6450c9fcc14 100644 --- a/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs @@ -16,16 +16,8 @@ using System.Runtime.InteropServices; // General Information about the System.DirectoryServices assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle("System.DirectoryServices.dll")] [assembly: AssemblyDescription("System.DirectoryServices.dll")] diff --git a/mcs/class/System.DirectoryServices/Assembly/Consts.cs b/mcs/class/System.DirectoryServices/Assembly/Consts.cs deleted file mode 100644 index 629ec4cf8b0..00000000000 --- a/mcs/class/System.DirectoryServices/Assembly/Consts.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -//#elif (NET_1_1) -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -}
\ No newline at end of file diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.dll.sources b/mcs/class/System.DirectoryServices/System.DirectoryServices.dll.sources index 4785e74f417..9ac033bd01e 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices.dll.sources +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.DirectoryServices/AuthenticationTypes.cs System.DirectoryServices/DirectoryEntries.cs diff --git a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs index 617e34fdce3..83157cb4766 100644 --- a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs @@ -36,16 +36,8 @@ using System.Runtime.InteropServices; // General Information about the System.Drawing.Design assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle("System.Drawing.Design.dll")] [assembly: AssemblyDescription("System.Drawing.Design.dll")] diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design.dll.sources b/mcs/class/System.Drawing.Design/System.Drawing.Design.dll.sources index dbf435440d2..d601795e452 100644 --- a/mcs/class/System.Drawing.Design/System.Drawing.Design.dll.sources +++ b/mcs/class/System.Drawing.Design/System.Drawing.Design.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs System.Drawing.Design/BitmapEditor.cs diff --git a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs index b29c677ab11..77b0cbf04ed 100644 --- a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs @@ -39,17 +39,12 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle("System.Drawing.dll")] diff --git a/mcs/class/System.Drawing/Assembly/Consts.cs b/mcs/class/System.Drawing/Assembly/Consts.cs deleted file mode 100644 index 6a4ee51c46a..00000000000 --- a/mcs/class/System.Drawing/Assembly/Consts.cs +++ /dev/null @@ -1,71 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -//#elif (NET_1_1) -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -}
\ No newline at end of file diff --git a/mcs/class/System.Drawing/System.Drawing.dll.sources b/mcs/class/System.Drawing/System.Drawing.dll.sources index 88692618477..961966f8fd4 100755 --- a/mcs/class/System.Drawing/System.Drawing.dll.sources +++ b/mcs/class/System.Drawing/System.Drawing.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.Drawing/Bitmap.cs System.Drawing/Brush.cs diff --git a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs index d0f02cd9026..ba130cd3253 100644 --- a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs @@ -35,27 +35,23 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.EnterpriseServices; -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] - [assembly: ComVisible(true)] - [assembly: AssemblyTitle("System.EnterpriseServices.dll")] - [assembly: AssemblyDescription("System.EnterpriseServices.dll")] - [assembly: AssemblyConfiguration("Development version")] - [assembly: AssemblyCompany("MONO development team")] - [assembly: AssemblyProduct("MONO CLI")] - [assembly: AssemblyCopyright("(c) 2004 Various Authors")] - [assembly: AssemblyTrademark("")] - [assembly: AssemblyInformationalVersion("2.0.40301.9")] - [assembly: AssemblyFileVersion("2.0.40301.9")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: ComVisible(true)] +[assembly: AssemblyTitle("System.EnterpriseServices.dll")] +[assembly: AssemblyDescription("System.EnterpriseServices.dll")] +[assembly: AssemblyConfiguration("Development version")] +[assembly: AssemblyCompany("MONO development team")] +[assembly: AssemblyProduct("MONO CLI")] +[assembly: AssemblyCopyright("(c) 2004 Various Authors")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyInformationalVersion("2.0.40301.9")] +[assembly: AssemblyFileVersion("2.0.40301.9")] #endif [assembly: CLSCompliant(true)] diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.dll.sources b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.dll.sources index bd262034b2c..4078cc82acf 100644 --- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.dll.sources +++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs System.EnterpriseServices/AccessChecksLevelOption.cs System.EnterpriseServices/ActivationOption.cs System.EnterpriseServices/Activity.cs diff --git a/mcs/class/System.Management/Assembly/AssemblyInfo.cs b/mcs/class/System.Management/Assembly/AssemblyInfo.cs index 445e3ae245b..81d4fdd9ada 100644 --- a/mcs/class/System.Management/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Management/Assembly/AssemblyInfo.cs @@ -37,13 +37,9 @@ using System.Runtime.InteropServices; // General Information about the System.Management assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] +[assembly: AssemblyVersion (Consts.FxVersion)] +#if (NET_2_0) +[assembly: SatelliteContractVersion (Consts.FxVersion)] #endif [assembly: AssemblyTitle ("System.Management.dll")] diff --git a/mcs/class/System.Management/System.Management.dll.sources b/mcs/class/System.Management/System.Management.dll.sources index 79aef10b134..82029c94d08 100644 --- a/mcs/class/System.Management/System.Management.dll.sources +++ b/mcs/class/System.Management/System.Management.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.Management/AuthenticationLevel.cs System.Management/CimType.cs diff --git a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs index 1669ca9481b..abb88ec5bfb 100644 --- a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs @@ -37,16 +37,8 @@ using System.Runtime.InteropServices; // General Information about the System.Messaging assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle ("System.Messaging.dll")] [assembly: AssemblyDescription ("System.Messaging.dll")] diff --git a/mcs/class/System.Messaging/Assembly/Consts.cs b/mcs/class/System.Messaging/Assembly/Consts.cs deleted file mode 100644 index e9e9fffca9a..00000000000 --- a/mcs/class/System.Messaging/Assembly/Consts.cs +++ /dev/null @@ -1,84 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMono_Security = "Mono.Security, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Posix = "Mono.Posix, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#elif (NET_2_0) - - public const string AssemblySystem_Design = "System.Design, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMono_Security = "Mono.Security, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Posix = "Mono.Posix, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMono_Security = "Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Posix = "Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#endif - -} diff --git a/mcs/class/System.Messaging/System.Messaging.dll.sources b/mcs/class/System.Messaging/System.Messaging.dll.sources index 1a0fd3fca64..f0e99fab219 100644 --- a/mcs/class/System.Messaging/System.Messaging.dll.sources +++ b/mcs/class/System.Messaging/System.Messaging.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.Messaging/AccessControlEntry.cs System.Messaging/AccessControlEntryType.cs diff --git a/mcs/class/System.Messaging/System.Messaging/Message.resx b/mcs/class/System.Messaging/System.Messaging/Message.resx index 6b3c4ce0a5f..6af13537217 100644 --- a/mcs/class/System.Messaging/System.Messaging/Message.resx +++ b/mcs/class/System.Messaging/System.Messaging/Message.resx @@ -34,9 +34,9 @@ <value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueue.resx b/mcs/class/System.Messaging/System.Messaging/MessageQueue.resx index 6b3c4ce0a5f..6af13537217 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessageQueue.resx +++ b/mcs/class/System.Messaging/System.Messaging/MessageQueue.resx @@ -34,9 +34,9 @@ <value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs index 09248a4d516..1efc62da8aa 100644 --- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs @@ -37,17 +37,12 @@ using System.Runtime.InteropServices; // General Information about the System.Runtime.Remoting assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif //[assembly: AssemblyTitle("System.Runtime.Remoting.dll")] diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.dll.sources b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.dll.sources index d07b3ccbb2b..aea971e049d 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.dll.sources +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs index 0248ea310bc..6611c7f0c00 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs @@ -37,17 +37,12 @@ using System.Runtime.InteropServices; // General Information about the System.Runtime.Serialization.Formatters.Soap assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif //[assembly: AssemblyTitle("System.Runtime.Serialization.Formatters.Soap.dll")] diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.dll.sources b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.dll.sources index 431e97c86a3..7a8bb609998 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.dll.sources +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs System.Runtime.Serialization.Formatters.Soap/SoapReader.cs diff --git a/mcs/class/System.Security/Assembly/AssemblyInfo.cs b/mcs/class/System.Security/Assembly/AssemblyInfo.cs index c4c82052750..c20e81887db 100644 --- a/mcs/class/System.Security/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Security/Assembly/AssemblyInfo.cs @@ -37,16 +37,8 @@ using System.Security; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.0.0")] - [assembly: SatelliteContractVersion ("2.0.0.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: CLSCompliant (true)] [assembly: ComVisible (false)] diff --git a/mcs/class/System.Security/System.Security.dll.sources b/mcs/class/System.Security/System.Security.dll.sources index ac661e21abd..b507fedb876 100644 --- a/mcs/class/System.Security/System.Security.dll.sources +++ b/mcs/class/System.Security/System.Security.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Mono.Xml/XmlCanonicalizer.cs System.Security.Cryptography/AsnEncodedData.cs diff --git a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs index 166851c2b76..106488e4d4b 100644 --- a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs @@ -37,16 +37,8 @@ using System.Runtime.InteropServices; // General Information about the System.ServiceProcess assembly -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] - [assembly: SatelliteContractVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] - [assembly: SatelliteContractVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] - [assembly: SatelliteContractVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle ("System.ServiceProcess.dll")] [assembly: AssemblyDescription ("System.ServiceProcess.dll")] diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources b/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources index 6f2863778f8..da97633ce9a 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs System.ServiceProcess/PowerBroadcastStatus.cs diff --git a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs index 203b3196106..a27888d0996 100644 --- a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs @@ -37,16 +37,8 @@ using System.Runtime.InteropServices; // General Information about the System.Web.Services assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] - [assembly: SatelliteContractVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle("System.Web.Services.dll")] [assembly: AssemblyDescription("System.Web.Services.dll")] diff --git a/mcs/class/System.Web.Services/System.Web.Services.dll.sources b/mcs/class/System.Web.Services/System.Web.Services.dll.sources index af4e88227be..18128f881b8 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.dll.sources +++ b/mcs/class/System.Web.Services/System.Web.Services.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs System.Web.Services/WebMethodAttribute.cs diff --git a/mcs/class/System.Web/Assembly/AssemblyInfo.cs b/mcs/class/System.Web/Assembly/AssemblyInfo.cs index 2aa4bb14dd9..72c0c87fa94 100644 --- a/mcs/class/System.Web/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Web/Assembly/AssemblyInfo.cs @@ -38,16 +38,8 @@ using System.Web.UI; // General Information about the System.Web assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.0.0")] - [assembly: SatelliteContractVersion ("2.0.0.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle("System.Web.dll")] [assembly: AssemblyDescription("System.Web.dll")] diff --git a/mcs/class/System.Web/Assembly/Consts.cs b/mcs/class/System.Web/Assembly/Consts.cs deleted file mode 100644 index 5a1667601b4..00000000000 --- a/mcs/class/System.Web/Assembly/Consts.cs +++ /dev/null @@ -1,80 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#elif (NET_2_0) - - public const string AssemblySystem_Design = "System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -//#elif (NET_1_1) -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - -#endif - -} diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources index cd5924394a7..d8920963cc9 100644 --- a/mcs/class/System.Web/System.Web.dll.sources +++ b/mcs/class/System.Web/System.Web.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs System.Web.Administration/WebAdminUserControl.cs diff --git a/mcs/class/System.XML/Assembly/AssemblyInfo.cs b/mcs/class/System.XML/Assembly/AssemblyInfo.cs index a9ded1f5f7c..a9b8ae788cd 100644 --- a/mcs/class/System.XML/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.XML/Assembly/AssemblyInfo.cs @@ -37,16 +37,8 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif NET_2_0 || BOOTSTRAP_NET_2_0 - [assembly: AssemblyVersion ("2.0.3600.0")] - [assembly: SatelliteContractVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyTitle("System.Xml.dll")] [assembly: AssemblyDescription("System.Xml.dll")] diff --git a/mcs/class/System.XML/System.Xml.dll.sources b/mcs/class/System.XML/System.Xml.dll.sources index 450fce4aa72..1be872af378 100644 --- a/mcs/class/System.XML/System.Xml.dll.sources +++ b/mcs/class/System.XML/System.Xml.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Mono.Xml.Schema/XmlSchemaValidatingReader.cs Mono.Xml.Schema/XsdIdentityPath.cs diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs index 1ff424b23e4..b58973a3894 100644 --- a/mcs/class/System/Assembly/AssemblyInfo.cs +++ b/mcs/class/System/Assembly/AssemblyInfo.cs @@ -37,17 +37,12 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif NET_2_0 || BOOTSTRAP_NET_2_0 - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif [assembly: AssemblyTitle("System.dll")] diff --git a/mcs/class/System/Assembly/Consts.cs b/mcs/class/System/Assembly/Consts.cs deleted file mode 100644 index e61a2a10e7d..00000000000 --- a/mcs/class/System/Assembly/Consts.cs +++ /dev/null @@ -1,87 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMono_Security = "Mono.Security, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Posix = "Mono.Posix, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Http = "Mono.Http, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#elif (NET_2_0) - - public const string AssemblySystem_Design = "System.Design, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMono_Security = "Mono.Security, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Posix = "Mono.Posix, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Http = "Mono.Http, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblyMono_Security = "Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Posix = "Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_Http = "Mono.Http, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#endif - -} diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources index 6ff0d7e2527..e9a99bb2076 100644 --- a/mcs/class/System/System.dll.sources +++ b/mcs/class/System/System.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Microsoft.CSharp/CSharpCodeCompiler.cs Microsoft.CSharp/CSharpCodeGenerator.cs diff --git a/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs b/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs index 9feda362032..3c5e64d9133 100644 --- a/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs +++ b/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs @@ -14,13 +14,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -#if (NET_1_0) - [assembly: AssemblyVersion ("1.0.3300.0")] -#elif (NET_2_0) - [assembly: AssemblyVersion ("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion ("1.0.5000.0")] -#endif +[assembly: AssemblyVersion (Consts.FxVersion)] /* TODO COMPLETE INFORMATION diff --git a/mcs/class/WindowsBase/WindowsBase.dll.sources b/mcs/class/WindowsBase/WindowsBase.dll.sources index 5e3ee2dc1fa..a18874ab0dd 100644 --- a/mcs/class/WindowsBase/WindowsBase.dll.sources +++ b/mcs/class/WindowsBase/WindowsBase.dll.sources @@ -8,3 +8,4 @@ System.Windows/LocalValueEnumerator.cs System.Windows/PropertyMetadata.cs ../../build/common/MonoTODOAttribute.cs Assembly/AssemblyInfo.cs +../../build/common/Consts.cs diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs index 2dbfcb22842..f9b7e875cfa 100644 --- a/mcs/class/corlib/Assembly/AssemblyInfo.cs +++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs @@ -40,17 +40,12 @@ using System.Runtime.InteropServices; // General Information about the system assembly -#if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] -#elif NET_2_0 || BOOTSTRAP_NET_2_0 - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] -#elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] - [assembly: ComCompatibleVersion(1, 0, 3300, 0)] - [assembly: TypeLibVersion(1, 10)] +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + +#if (ONLY_1_1) +[assembly: ComCompatibleVersion (1, 0, 3300, 0)] +[assembly: TypeLibVersion (1, 10)] #endif //[assembly: AssemblyTitle("mscorlib.dll")] diff --git a/mcs/class/corlib/Assembly/Consts.cs b/mcs/class/corlib/Assembly/Consts.cs deleted file mode 100644 index aad837127d5..00000000000 --- a/mcs/class/corlib/Assembly/Consts.cs +++ /dev/null @@ -1,84 +0,0 @@ -// -// Consts.cs -// -// Author: -// Lluis Sanchez Gual (lluis@ximian.com) -// -// (C) 2004 Novell, Inc. -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -using System.Runtime.InteropServices; - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblyI18N = "I18N, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_CSharp_Debugger = "Mono.CSharp.Debugger, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#elif (NET_2_0) - - public const string AssemblyI18N = "I18N, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_CSharp_Debugger = "Mono.CSharp.Debugger, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblyI18N = "I18N, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - public const string AssemblyMono_CSharp_Debugger = "Mono.CSharp.Debugger, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - -#endif - -#if BOOTSTRAP_WITH_OLDLIB - public const UnmanagedType UnmanagedType_80 = UnmanagedType.mono_bootstrap_NativeTypeMax; -#else - public const UnmanagedType UnmanagedType_80 = (UnmanagedType) 80; -#endif -} diff --git a/mcs/class/corlib/System.Globalization/GregorianCalendar.cs b/mcs/class/corlib/System.Globalization/GregorianCalendar.cs index f51ad72f492..ef605f5101e 100644 --- a/mcs/class/corlib/System.Globalization/GregorianCalendar.cs +++ b/mcs/class/corlib/System.Globalization/GregorianCalendar.cs @@ -86,7 +86,7 @@ public class GregorianCalendar : Calendar { public virtual GregorianCalendarTypes CalendarType { get { return M_CalendarType; } set { - // mscorlib 1:0:33000:0 doesn't check anything here + // mscorlib 1:0:3300:0 doesn't check anything here M_CalendarType = value; } } diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs index e51ce0f45f0..682a8a610b6 100644 --- a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs +++ b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs @@ -80,33 +80,24 @@ public class CryptoConfig { #endif // LAMESPEC: undocumented names in CryptoConfig -#if (NET_2_0) - private const string xmlAssembly = ", System.Security, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; -#elif (NET_1_1) - private const string xmlAssembly = ", System.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; -#elif (NET_1_0) - private const string xmlAssembly = ", System.Security, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; -#else - private const string xmlAssembly = ", System.Security, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"; -#endif - private const string defaultC14N = defaultNamespace + "Xml.XmlDsigC14NTransform" + xmlAssembly; - private const string defaultC14NWithComments = defaultNamespace + "Xml.XmlDsigC14NWithCommentsTransform" + xmlAssembly; - private const string defaultBase64 = defaultNamespace + "Xml.XmlDsigBase64Transform" + xmlAssembly; - private const string defaultXPath = defaultNamespace + "Xml.XmlDsigXPathTransform" + xmlAssembly; - private const string defaultXslt = defaultNamespace + "Xml.XmlDsigXsltTransform" + xmlAssembly; - private const string defaultEnveloped = defaultNamespace + "Xml.XmlDsigEnvelopedSignatureTransform" + xmlAssembly; + private const string defaultC14N = defaultNamespace + "Xml.XmlDsigC14NTransform, " + Consts.AssemblySystem_Security; + private const string defaultC14NWithComments = defaultNamespace + "Xml.XmlDsigC14NWithCommentsTransform, " + Consts.AssemblySystem_Security; + private const string defaultBase64 = defaultNamespace + "Xml.XmlDsigBase64Transform, " + Consts.AssemblySystem_Security; + private const string defaultXPath = defaultNamespace + "Xml.XmlDsigXPathTransform, " + Consts.AssemblySystem_Security; + private const string defaultXslt = defaultNamespace + "Xml.XmlDsigXsltTransform, " + Consts.AssemblySystem_Security; + private const string defaultEnveloped = defaultNamespace + "Xml.XmlDsigEnvelopedSignatureTransform, " + Consts.AssemblySystem_Security; #if NET_2_0 - private const string defaultXmlDecryption = defaultNamespace + "Xml.XmlDecryptionTransform" + xmlAssembly; - private const string defaultExcC14N = defaultNamespace + "Xml.XmlDsigExcC14NTransform" + xmlAssembly; - private const string defaultExcC14NWithComments = defaultNamespace + "Xml.XmlDsigExcC14NWithCommentsTransform" + xmlAssembly; + private const string defaultXmlDecryption = defaultNamespace + "Xml.XmlDecryptionTransform, " + Consts.AssemblySystem_Security; + private const string defaultExcC14N = defaultNamespace + "Xml.XmlDsigExcC14NTransform, " + Consts.AssemblySystem_Security; + private const string defaultExcC14NWithComments = defaultNamespace + "Xml.XmlDsigExcC14NWithCommentsTransform, " + Consts.AssemblySystem_Security; #endif // LAMESPEC: only documentated in ".NET Framework Security" book - private const string defaultX509Data = defaultNamespace + "Xml.KeyInfoX509Data" + xmlAssembly; - private const string defaultKeyName = defaultNamespace + "Xml.KeyInfoName" + xmlAssembly; - private const string defaultKeyValueDSA = defaultNamespace + "Xml.DSAKeyValue" + xmlAssembly; - private const string defaultKeyValueRSA = defaultNamespace + "Xml.RSAKeyValue" + xmlAssembly; - private const string defaultRetrievalMethod = defaultNamespace + "Xml.KeyInfoRetrievalMethod" + xmlAssembly; + private const string defaultX509Data = defaultNamespace + "Xml.KeyInfoX509Data, " + Consts.AssemblySystem_Security; + private const string defaultKeyName = defaultNamespace + "Xml.KeyInfoName, " + Consts.AssemblySystem_Security; + private const string defaultKeyValueDSA = defaultNamespace + "Xml.DSAKeyValue, " + Consts.AssemblySystem_Security; + private const string defaultKeyValueRSA = defaultNamespace + "Xml.RSAKeyValue, " + Consts.AssemblySystem_Security; + private const string defaultRetrievalMethod = defaultNamespace + "Xml.KeyInfoRetrievalMethod, " + Consts.AssemblySystem_Security; private const string managedSHA1 = defaultNamespace + "SHA1Managed"; diff --git a/mcs/class/corlib/System.Security.Policy/DefaultPolicies.cs b/mcs/class/corlib/System.Security.Policy/DefaultPolicies.cs index b45a6dd7f94..9f2d18d36de 100644 --- a/mcs/class/corlib/System.Security.Policy/DefaultPolicies.cs +++ b/mcs/class/corlib/System.Security.Policy/DefaultPolicies.cs @@ -81,38 +81,23 @@ namespace System.Security.Policy { MsFinal, } + private const string DnsPermissionClass = "System.Net.DnsPermission, " + Consts.AssemblySystem; + private const string EventLogPermissionClass = "System.Diagnostics.EventLogPermission, " + Consts.AssemblySystem; + private const string PrintingPermissionClass = "System.Drawing.Printing.PrintingPermission, " + Consts.AssemblySystem_Drawing; + private const string SocketPermissionClass = "System.Net.SocketPermission, " + Consts.AssemblySystem; + private const string WebPermissionClass = "System.Net.WebPermission, " + Consts.AssemblySystem; + private const string PerformanceCounterPermissionClass = "System.Diagnostics.PerformanceCounterPermission, " + Consts.AssemblySystem; + private const string DirectoryServicesPermissionClass = "System.DirectoryServices.DirectoryServicesPermission, " + Consts.AssemblySystem_DirectoryServices; + private const string MessageQueuePermissionClass = "System.Messaging.MessageQueuePermission, " + Consts.AssemblySystem_Messaging; + private const string ServiceControllerPermissionClass = "System.ServiceProcess.ServiceControllerPermission, " + Consts.AssemblySystem_ServiceProcess; + private const string OleDbPermissionClass = "System.Data.OleDb.OleDbPermission, " + Consts.AssemblySystem_Data; + private const string SqlClientPermissionClass = "System.Data.SqlClient.SqlClientPermission, " + Consts.AssemblySystem_Data; #if NET_2_0 - private const string DnsPermissionClass = "System.Net.DnsPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string EventLogPermissionClass = "System.Diagnostics.EventLogPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string PrintingPermissionClass = "System.Drawing.Printing.PrintingPermission, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string SocketPermissionClass = "System.Net.SocketPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string WebPermissionClass = "System.Net.WebPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string PerformanceCounterPermissionClass = "System.Diagnostics.PerformanceCounterPermission, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string DirectoryServicesPermissionClass = "System.DirectoryServices.DirectoryServicesPermission, System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string MessageQueuePermissionClass = "System.Messaging.MessageQueuePermission, System.Messaging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string ServiceControllerPermissionClass = "System.ServiceProcess.ServiceControllerPermission, System.ServiceProcess, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string OleDbPermissionClass = "System.Data.OleDb.OleDbPermission, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string SqlClientPermissionClass = "System.Data.SqlClient.SqlClientPermission, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - - private const string DataProtectionPermissionClass = "System.Security.Permissions.DataProtectionPermission, System.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string StorePermissionClass = "System.Security.Permissions.StorePermission, System.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - - private static Version Runtime = new Version (2, 0, 0, 0); -#else - private const string DnsPermissionClass = "System.Net.DnsPermission, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string EventLogPermissionClass = "System.Diagnostics.EventLogPermission, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string PrintingPermissionClass = "System.Drawing.Printing.PrintingPermission, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string SocketPermissionClass = "System.Net.SocketPermission, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string WebPermissionClass = "System.Net.WebPermission, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string PerformanceCounterPermissionClass = "System.Diagnostics.PerformanceCounterPermission, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string DirectoryServicesPermissionClass = "System.DirectoryServices.DirectoryServicesPermission, System.DirectoryServices, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string MessageQueuePermissionClass = "System.Messaging.MessageQueuePermission, System.Messaging, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string ServiceControllerPermissionClass = "System.ServiceProcess.ServiceControllerPermission, System.ServiceProcess, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - private const string OleDbPermissionClass = "System.Data.OleDb.OleDbPermission, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - private const string SqlClientPermissionClass = "System.Data.SqlClient.SqlClientPermission, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - - private static Version Runtime = new Version (1, 0, 5000, 0); + private const string DataProtectionPermissionClass = "System.Security.Permissions.DataProtectionPermission, " + Consts.AssemblySystem_Security; + private const string StorePermissionClass = "System.Security.Permissions.StorePermission, " + Consts.AssemblySystem_Security; #endif + + private static Version _fxVersion; private static byte[] _ecmaKey = new byte [16] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; private static StrongNamePublicKeyBlob _ecma; private static byte[] _msFinalKey = new byte [160] { @@ -221,6 +206,7 @@ namespace System.Security.Policy { public static StrongNameMembershipCondition FullTrustMembership (string name, Key key) { StrongNamePublicKeyBlob snkb = null; + switch (key) { case Key.Ecma: if (_ecma == null) { @@ -236,7 +222,12 @@ namespace System.Security.Policy { break; } - return new StrongNameMembershipCondition (snkb, name, Runtime); + if (_fxVersion == null) + { + _fxVersion = new Version (Consts.FxVersion); + } + + return new StrongNameMembershipCondition (snkb, name, _fxVersion); } // internal stuff diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs index 9ec1a18f7d5..b10be9b95eb 100644 --- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs +++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs @@ -109,7 +109,7 @@ namespace MonoTests.System.Reflection // corlib doesn't reference anything Assert.AreEqual (0, corlib.GetReferencedAssemblies ().Length, "GetReferencedAssemblies"); #if NET_2_0 - Assert.AreEqual ("mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", corlib.FullName, "FullName"); + Assert.AreEqual ("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", corlib.FullName, "FullName"); // not really "true" but it's even more trusted so... Assert.IsTrue (corlib.GlobalAssemblyCache, "GlobalAssemblyCache"); Assert.AreEqual (0, corlib.HostContext, "HostContext"); diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index d8518d47f48..981a63ee59a 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -1,5 +1,5 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs Microsoft.Win32/IRegistryApi.cs Microsoft.Win32/RegistryKey.cs diff --git a/mcs/nunit20/nunit-console/nunit-console.exe.config b/mcs/nunit20/nunit-console/nunit-console.exe.config index 82e3b573541..ce678ba0f6e 100755 --- a/mcs/nunit20/nunit-console/nunit-console.exe.config +++ b/mcs/nunit20/nunit-console/nunit-console.exe.config @@ -24,7 +24,7 @@ <startup> <supportedRuntime version="v1.1.4322" /> - <supportedRuntime version="v2.0.40607" /> + <supportedRuntime version="v2.0.50215" /> <supportedRuntime version="v1.0.3705" /> <requiredRuntime version="v1.0.3705" /> diff --git a/mcs/tests/test-377-net_2_0-il.il b/mcs/tests/test-377-net_2_0-il.il index 8adee78aa64..2899c5fe88b 100644 --- a/mcs/tests/test-377-net_2_0-il.il +++ b/mcs/tests/test-377-net_2_0-il.il @@ -1,6 +1,6 @@ .assembly extern mscorlib { - .ver 2:0:3600:0 + .ver 2:0:0:0 .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4.. } .assembly 'test-377-net_2_0-il' diff --git a/mcs/tools/resgen/Assembly/AssemblyInfo.cs b/mcs/tools/resgen/Assembly/AssemblyInfo.cs index f01cab14f77..d32768a393a 100644 --- a/mcs/tools/resgen/Assembly/AssemblyInfo.cs +++ b/mcs/tools/resgen/Assembly/AssemblyInfo.cs @@ -16,18 +16,15 @@ using System.Runtime.InteropServices; // General Information about the system assembly +[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: SatelliteContractVersion (Consts.FxVersion)] + #if (NET_1_0) - [assembly: AssemblyVersion("1.0.3300.0")] - [assembly: SatelliteContractVersion("1.0.3300.0")] [assembly: AssemblyInformationalVersion("1.0.3705.0")] #elif (NET_2_0) - [assembly: AssemblyVersion("2.0.3600.0")] - [assembly: SatelliteContractVersion("2.0.3600.0")] [assembly: AssemblyInformationalVersion("2.0.40301.9")] [assembly: AssemblyFileVersion("2.0.40301.9")] #elif (NET_1_1) - [assembly: AssemblyVersion("1.0.5000.0")] - [assembly: SatelliteContractVersion("1.0.5000.0")] [assembly: AssemblyInformationalVersion("1.1.4322.573")] #endif diff --git a/mcs/tools/resgen/Assembly/Consts.cs b/mcs/tools/resgen/Assembly/Consts.cs deleted file mode 100644 index 79208d9b561..00000000000 --- a/mcs/tools/resgen/Assembly/Consts.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -// Consts.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// -// (C) 2003 Andreas Nahr -// -// NOTE: -// Ensure that every constant is defined for every version symbol! -// - -// This class contains constants that are dependent on the defined symbols -// Use it to shorten and make code more maintainable in situations like: -// -//#if (NET_1_0) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -//#if (NET_1_1) -// [Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))] -//#endif -// -// by changing them into: -// -// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))] -// - -internal sealed class Consts -{ - - private Consts () - { - } - -#if (NET_1_0) - - public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - -#elif (NET_2_0) - - public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - -#else - // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - - public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; - -#endif - -} diff --git a/mcs/tools/resgen/resgen.exe.sources b/mcs/tools/resgen/resgen.exe.sources index 512277beec6..9007ada0d77 100644 --- a/mcs/tools/resgen/resgen.exe.sources +++ b/mcs/tools/resgen/resgen.exe.sources @@ -1,4 +1,4 @@ Assembly/AssemblyInfo.cs -Assembly/Consts.cs +../../build/common/Consts.cs ../../build/common/Locale.cs monoresgen.cs |