From: Jonathan Pryor Date: Wed, 2 Sep 2009 19:42:28 +0000 (-0000) Subject: * src/**/*: Sync with DbLinq r1215. This fixes the X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=a49f30b84435ac71851f989e7757b4167004518a;p=mono.git * src/**/*: Sync with DbLinq r1215. This fixes the ../../tools/sqlmetal build. svn path=/trunk/mcs/; revision=141172 --- diff --git a/mcs/class/System.Data.Linq/ChangeLog b/mcs/class/System.Data.Linq/ChangeLog index bdb6bb6f06f..96436475562 100755 --- a/mcs/class/System.Data.Linq/ChangeLog +++ b/mcs/class/System.Data.Linq/ChangeLog @@ -1,3 +1,8 @@ +2009-09-02 Jonathan Pryor + + * src/**/*: Sync with DbLinq r1215. This fixes the + ../../tools/sqlmetal build. + 2009-09-02 Jonathan Pryor * src/**/*: Sync with DbLinq r1214. This integrates several diff --git a/mcs/class/System.Data.Linq/src/DbLinq.sln b/mcs/class/System.Data.Linq/src/DbLinq.sln index b09e57aee90..f4a5f63533a 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq.sln +++ b/mcs/class/System.Data.Linq/src/DbLinq.sln @@ -97,6 +97,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbLinq.Sqlite_test_mono", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbLinq.Sqlite_test_mono_strict", "DbLinq.Sqlite\Test\DbLinq.Sqlite_test_mono_strict.csproj", "{06413209-2415-4541-8033-D5AAFF778A23}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlMetal", "DbMetal\SqlMetal.csproj", "{CC64BF54-481C-4740-8135-E5972531CA7D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - Mono Strict|Any CPU = Debug - Mono Strict|Any CPU @@ -302,6 +304,12 @@ Global {06413209-2415-4541-8033-D5AAFF778A23}.Debug|Any CPU.Build.0 = Debug|Any CPU {06413209-2415-4541-8033-D5AAFF778A23}.Release|Any CPU.ActiveCfg = Release|Any CPU {06413209-2415-4541-8033-D5AAFF778A23}.Release|Any CPU.Build.0 = Release|Any CPU + {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug - Mono Strict|Any CPU.ActiveCfg = Debug|Any CPU + {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug - Mono Strict|Any CPU.Build.0 = Debug|Any CPU + {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC64BF54-481C-4740-8135-E5972531CA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC64BF54-481C-4740-8135-E5972531CA7D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Properties/AssemblyInfo.cs b/mcs/class/System.Data.Linq/src/DbLinq/Properties/AssemblyInfo.cs index fde716e01ee..fe34254a95a 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/Properties/AssemblyInfo.cs +++ b/mcs/class/System.Data.Linq/src/DbLinq/Properties/AssemblyInfo.cs @@ -126,3 +126,9 @@ using DbLinq.Factory; + "962a12b830c2a70eb70ec77823eb5750e5bdef9e01d097c30b5c5463c3d07d3472b58e4c02f279" + "2309259f")] +[assembly: InternalsVisibleTo("sqlmetal, PublicKey=" ++ "0024000004800000940000000602000000240000525341310004000001000100c5753d8c47f400" ++ "83f549016a5711238ac8ec297605abccd3dc4b6d0f280b4764eb2cc58ec4e37831edad7e7a07b8" ++ "fe4a9cbb059374c0cc047aa28839fed7176761813caf6a2ffa0bff9afb50ead56dd3f56186a663" ++ "962a12b830c2a70eb70ec77823eb5750e5bdef9e01d097c30b5c5463c3d07d3472b58e4c02f279" ++ "2309259f")] diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/DbmlSchema.cs b/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/DbmlSchema.cs index aef6d0751c6..a994edd897a 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/DbmlSchema.cs +++ b/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/DbmlSchema.cs @@ -37,12 +37,10 @@ namespace DbLinq.Schema.Dbml [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007", IsNullable = false)] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Database : object, System.ComponentModel.INotifyPropertyChanged + partial class Database : object, System.ComponentModel.INotifyPropertyChanged { private Connection connectionField; @@ -368,12 +366,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Connection : object, System.ComponentModel.INotifyPropertyChanged + partial class Connection : object, System.ComponentModel.INotifyPropertyChanged { private string providerField; @@ -494,12 +490,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum ConnectionMode + enum ConnectionMode { /// @@ -518,12 +512,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Return : object, System.ComponentModel.INotifyPropertyChanged + partial class Return : object, System.ComponentModel.INotifyPropertyChanged { private string typeField; @@ -578,12 +570,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Parameter : object, System.ComponentModel.INotifyPropertyChanged + partial class Parameter : object, System.ComponentModel.INotifyPropertyChanged { private string nameField; @@ -704,12 +694,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum ParameterDirection + enum ParameterDirection { /// @@ -728,12 +716,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Function : object, System.ComponentModel.INotifyPropertyChanged + partial class Function : object, System.ComponentModel.INotifyPropertyChanged { private Parameter[] parameterField; @@ -976,12 +962,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Type : object, System.ComponentModel.INotifyPropertyChanged + partial class Type : object, System.ComponentModel.INotifyPropertyChanged { private object[] itemsField; @@ -1207,12 +1191,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Association : object, System.ComponentModel.INotifyPropertyChanged + partial class Association : object, System.ComponentModel.INotifyPropertyChanged { private string nameField; @@ -1520,12 +1502,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum AccessModifier + enum AccessModifier { /// @@ -1548,12 +1528,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum MemberModifier + enum MemberModifier { /// @@ -1573,12 +1551,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum Cardinality + enum Cardinality { /// @@ -1594,12 +1570,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Column : object, System.ComponentModel.INotifyPropertyChanged + partial class Column : object, System.ComponentModel.INotifyPropertyChanged { private string nameField; @@ -2094,12 +2068,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum UpdateCheck + enum UpdateCheck { /// @@ -2112,18 +2084,14 @@ namespace DbLinq.Schema.Dbml WhenChanged, } - /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum AutoSync + enum AutoSync { - /// Never, @@ -2144,12 +2112,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum ClassModifier + enum ClassModifier { /// @@ -2165,12 +2131,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class TableFunctionReturn : object, System.ComponentModel.INotifyPropertyChanged + partial class TableFunctionReturn : object, System.ComponentModel.INotifyPropertyChanged { private string memberField; @@ -2208,12 +2172,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class TableFunctionParameter : object, System.ComponentModel.INotifyPropertyChanged + partial class TableFunctionParameter : object, System.ComponentModel.INotifyPropertyChanged { private string parameterField; @@ -2300,9 +2262,7 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif enum Version @@ -2321,12 +2281,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class TableFunction : object, System.ComponentModel.INotifyPropertyChanged + partial class TableFunction : object, System.ComponentModel.INotifyPropertyChanged { private TableFunctionParameter[] argumentField; @@ -2431,12 +2389,10 @@ namespace DbLinq.Schema.Dbml [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - partial class Table : object, System.ComponentModel.INotifyPropertyChanged + partial class Table : object, System.ComponentModel.INotifyPropertyChanged { private Type typeField; @@ -2621,12 +2577,10 @@ namespace DbLinq.Schema.Dbml [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")] -#if MONO_STRICT - internal -#else +#if !MONO_STRICT public #endif - enum SerializationMode + enum SerializationMode { /// diff --git a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq.csproj b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq.csproj index 412ebef6715..b28a97bdc88 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq.csproj +++ b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq.csproj @@ -310,6 +310,7 @@ + @@ -327,6 +328,8 @@ + + diff --git a/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRename.cs b/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRename.cs index dcf10d966a4..0d3b8cb8c91 100644 --- a/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRename.cs +++ b/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRename.cs @@ -36,7 +36,7 @@ namespace DbMetal.Schema /// //[XmlRoot("Database")] [XmlRoot("Database", Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007", IsNullable = false)] - public class DbmlRename : INameAliases + class DbmlRename : INameAliases { [XmlNamespaceDeclarations] public XmlSerializerNamespaces XmlNamespaceDeclarations { get; set; } diff --git a/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRenameLoader.cs b/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRenameLoader.cs index a5e44b8dd1f..4bc720e8ebf 100644 --- a/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRenameLoader.cs +++ b/mcs/class/System.Data.Linq/src/DbMetal/Schema/DbmlRenameLoader.cs @@ -31,7 +31,7 @@ namespace DbMetal.Schema /// /// Loads a DbmlRename class from a DBML file /// - public static class DbmlRenameLoader + static class DbmlRenameLoader { public static DbmlRename Load(Stream stream) { diff --git a/mcs/class/System.Data.Linq/src/DbMetal/Schema/TableAlias.cs b/mcs/class/System.Data.Linq/src/DbMetal/Schema/TableAlias.cs index e253677837f..b3e7d3312dc 100644 --- a/mcs/class/System.Data.Linq/src/DbMetal/Schema/TableAlias.cs +++ b/mcs/class/System.Data.Linq/src/DbMetal/Schema/TableAlias.cs @@ -34,7 +34,10 @@ using DbMetal; namespace DbMetal.Schema { - public class TableAlias +#if !MONO_STRICT + public +#endif + class TableAlias { public class Renamings : INameAliases { diff --git a/mcs/class/System.Data.Linq/src/DbMetal/SqlMetal.csproj b/mcs/class/System.Data.Linq/src/DbMetal/SqlMetal.csproj new file mode 100755 index 00000000000..5d8f07cbfca --- /dev/null +++ b/mcs/class/System.Data.Linq/src/DbMetal/SqlMetal.csproj @@ -0,0 +1,183 @@ + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {CC64BF54-481C-4740-8135-E5972531CA7D} + Exe + Properties + DbMetal + sqlmetal + v3.5 + true + ..\DbLinq.snk + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + true + full + false + ..\..\build.dbg\ + TRACE;DEBUG;MONO_STRICT + prompt + 4 + + + pdbonly + true + ..\..\build\ + TRACE;DEBUG;MONO_STRICT + prompt + 4 + + + + + + 3.5 + + + + 3.5 + + + + + + Properties\DbLinq.ProductInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Settings.settings + + + + + + + + + + + + + + + + + + Properties\DbLinq.snk + + + + + + False + .NET Framework Client Profile + false + + + False + .NET Framework 2.0 %28x86%29 + false + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + true + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 3.1 + true + + + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + {97305421-3071-4175-AA3C-9A432CC28121} + System.Data.Linq + + + + + rem this is what I call loose coupling +copy "$(SolutionDir)..\lib\Npgsql.dll" "$(TargetDir)" +copy "$(SolutionDir)..\lib\Mono.Security.dll" "$(TargetDir)" +copy "$(SolutionDir)..\lib\Ingres.Client.dll" "$(TargetDir)" +copy "$(SolutionDir)..\lib\Oracle.DataAccess.dll" "$(TargetDir)" +copy "$(SolutionDir)..\lib\MySql.Data.dll" "$(TargetDir)" +copy "$(SolutionDir)..\lib\System.Data.SQLite.dll" "$(TargetDir)" +copy "$(SolutionDir)..\lib\FirebirdSql.Data.FirebirdClient.dll" "$(TargetDir)" + + + \ No newline at end of file