* 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 bdb6bb6f06f8b02ad952f1c1491f4b0953f05f39..96436475562c6f04a03cb8c6869b20ee49610004 100755 (executable)
--- a/mcs/class/System.Data.Linq/ChangeLog
+++ b/mcs/class/System.Data.Linq/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-02  Jonathan Pryor  <jpryor@novell.com>
+
+       * src/**/*: Sync with DbLinq r1215.  This fixes the
+         ../../tools/sqlmetal build.
+
 2009-09-02  Jonathan Pryor  <jpryor@novell.com>
 
        * 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 b09e57aee90d4fffaa46235e5bb5aba31675386e..f4a5f63533a0f6699fbebe15c0a39ca7176efd8d 100644 (file)
--- 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\r
 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}"\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlMetal", "DbMetal\SqlMetal.csproj", "{CC64BF54-481C-4740-8135-E5972531CA7D}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug - Mono Strict|Any CPU = Debug - Mono Strict|Any CPU\r
@@ -302,6 +304,12 @@ Global
                {06413209-2415-4541-8033-D5AAFF778A23}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {06413209-2415-4541-8033-D5AAFF778A23}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {06413209-2415-4541-8033-D5AAFF778A23}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug - Mono Strict|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug - Mono Strict|Any CPU.Build.0 = Debug|Any CPU\r
+               {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {CC64BF54-481C-4740-8135-E5972531CA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {CC64BF54-481C-4740-8135-E5972531CA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {CC64BF54-481C-4740-8135-E5972531CA7D}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

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 fde716e01eed6642c739df5978aba02eb3e3c2fd..fe34254a95acab3fc004c3ca2b9ee2d7e83eb731 100644 (file)
--- 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"\r
 + "2309259f")]\r
 \r
+[assembly: InternalsVisibleTo("sqlmetal, PublicKey="\r
++ "0024000004800000940000000602000000240000525341310004000001000100c5753d8c47f400"\r
++ "83f549016a5711238ac8ec297605abccd3dc4b6d0f280b4764eb2cc58ec4e37831edad7e7a07b8"\r
++ "fe4a9cbb059374c0cc047aa28839fed7176761813caf6a2ffa0bff9afb50ead56dd3f56186a663"\r
++ "962a12b830c2a70eb70ec77823eb5750e5bdef9e01d097c30b5c5463c3d07d3472b58e4c02f279"\r
++ "2309259f")]\r

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 aef6d0751c6fcd7597971db669c8e145d6df4890..a994edd897afeb619e8cfb28d4784d3ebfb9b64f 100644 (file)
--- 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")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
     [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007", IsNullable = false)]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Database : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Database : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private Connection connectionField;\r
@@ -368,12 +366,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Connection : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Connection : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string providerField;\r
@@ -494,12 +490,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum ConnectionMode\r
+    enum ConnectionMode\r
     {\r
 \r
         /// <remarks/>\r
@@ -518,12 +512,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Return : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Return : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string typeField;\r
@@ -578,12 +570,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Parameter : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Parameter : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string nameField;\r
@@ -704,12 +694,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum ParameterDirection\r
+    enum ParameterDirection\r
     {\r
 \r
         /// <remarks/>\r
@@ -728,12 +716,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Function : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Function : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private Parameter[] parameterField;\r
@@ -976,12 +962,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Type : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Type : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private object[] itemsField;\r
@@ -1207,12 +1191,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Association : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Association : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string nameField;\r
@@ -1520,12 +1502,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum AccessModifier\r
+    enum AccessModifier\r
     {\r
 \r
         /// <remarks/>\r
@@ -1548,12 +1528,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum MemberModifier\r
+    enum MemberModifier\r
     {\r
 \r
         /// <remarks/>\r
@@ -1573,12 +1551,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum Cardinality\r
+    enum Cardinality\r
     {\r
 \r
         /// <remarks/>\r
@@ -1594,12 +1570,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Column : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Column : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string nameField;\r
@@ -2094,12 +2068,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum UpdateCheck\r
+    enum UpdateCheck\r
     {\r
 \r
         /// <remarks/>\r
@@ -2112,18 +2084,14 @@ namespace DbLinq.Schema.Dbml
         WhenChanged,\r
     }\r
 \r
-    /// <remarks/>\r
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum AutoSync\r
+    enum AutoSync\r
     {\r
-\r
         /// <remarks/>\r
         Never,\r
 \r
@@ -2144,12 +2112,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum ClassModifier\r
+    enum ClassModifier\r
     {\r
 \r
         /// <remarks/>\r
@@ -2165,12 +2131,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class TableFunctionReturn : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class TableFunctionReturn : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string memberField;\r
@@ -2208,12 +2172,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class TableFunctionParameter : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class TableFunctionParameter : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private string parameterField;\r
@@ -2300,9 +2262,7 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
     enum Version\r
@@ -2321,12 +2281,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class TableFunction : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class TableFunction : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private TableFunctionParameter[] argumentField;\r
@@ -2431,12 +2389,10 @@ namespace DbLinq.Schema.Dbml
     [System.Diagnostics.DebuggerStepThroughAttribute()]\r
     [System.ComponentModel.DesignerCategoryAttribute("code")]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- partial class Table : object, System.ComponentModel.INotifyPropertyChanged\r
+    partial class Table : object, System.ComponentModel.INotifyPropertyChanged\r
     {\r
 \r
         private Type typeField;\r
@@ -2621,12 +2577,10 @@ namespace DbLinq.Schema.Dbml
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]\r
     [System.SerializableAttribute()]\r
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007")]\r
-#if MONO_STRICT\r
-    internal\r
-#else\r
+#if !MONO_STRICT\r
     public\r
 #endif\r
- enum SerializationMode\r
+    enum SerializationMode\r
     {\r
 \r
         /// <remarks/>\r

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 412ebef67151ed572969c38f3b18f253b47a0a7f..b28a97bdc884e908a676d9f6738c953bc85b632d 100644 (file)
--- 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 @@
     <Compile Include="System.Data.Linq\System.Data.Linq.SqlClient\SqlHelpers.cs" />\r
     <Compile Include="System.Data.Linq\System.Data.Linq.SqlClient\SqlMethods.cs" />\r
     <Compile Include="System.Data.Linq\System.Data.Linq.SqlClient\SqlProvider.cs" />\r
+    <Compile Include="Util\DbmlExtensions.cs" />\r
     <Compile Include="Util\ExpressionChainEqualityComparer.cs" />\r
     <Compile Include="Util\ExpressionEqualityComparer.cs" />\r
     <Compile Include="Util\IDataRecordExtensions.cs" />\r
@@ -327,6 +328,8 @@
     <Compile Include="Language\Implementation\NoLanguageWords.cs" />\r
     <Compile Include="Schema\Implementation\NameFormatter.cs" />\r
     <Compile Include="Util\MemberInfoExtensions.cs" />\r
+    <Compile Include="Util\Output.cs" />\r
+    <Compile Include="Util\OutputLevel.cs" />\r
     <Compile Include="Util\Profiler.cs" />\r
     <Compile Include="Util\ReflectionExtensions.cs" />\r
     <Compile Include="Util\ReflectionUtility.cs" />\r

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 dcf10d966a4f632b9e45d24f128106be8ba8b126..0d3b8cb8c91ed06232df00faf7c6e26cb8049c61 100644 (file)
--- 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
     /// </summary>\r
     //[XmlRoot("Database")]\r
     [XmlRoot("Database", Namespace = "http://schemas.microsoft.com/linqtosql/dbml/2007", IsNullable = false)]\r
-    public class DbmlRename : INameAliases\r
+    class DbmlRename : INameAliases\r
     {\r
         [XmlNamespaceDeclarations]\r
         public XmlSerializerNamespaces XmlNamespaceDeclarations { get; set; }\r

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 a5e44b8dd1f641a996b4d34198b26575019e9b04..4bc720e8ebf29d5069aa92e261c60e76aa03e829 100644 (file)
--- 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
     /// <summary>\r
     /// Loads a DbmlRename class from a DBML file\r
     /// </summary>\r
-    public static class DbmlRenameLoader\r
+    static class DbmlRenameLoader\r
     {\r
         public static DbmlRename Load(Stream stream)\r
         {\r

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 e253677837f250c2337c31fe89d49ea45c9a0e4d..b3e7d3312dc654f506334824633cb0451fbd34ef 100644 (file)
--- 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;
 \r
 namespace DbMetal.Schema\r
 {\r
-    public class TableAlias\r
+#if !MONO_STRICT\r
+    public\r
+#endif\r
+    class TableAlias\r
     {\r
         public class Renamings : INameAliases\r
         {\r

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 (executable)
index 0000000..5d8f07c
--- /dev/null
+++ b/mcs/class/System.Data.Linq/src/DbMetal/SqlMetal.csproj
@@ -0,0 +1,183 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{CC64BF54-481C-4740-8135-E5972531CA7D}</ProjectGuid>\r
+    <OutputType>Exe</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>DbMetal</RootNamespace>\r
+    <AssemblyName>sqlmetal</AssemblyName>\r
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
+    <SignAssembly>true</SignAssembly>\r
+    <AssemblyOriginatorKeyFile>..\DbLinq.snk</AssemblyOriginatorKeyFile>\r
+    <IsWebBootstrapper>false</IsWebBootstrapper>\r
+    <PublishUrl>publish\</PublishUrl>\r
+    <Install>true</Install>\r
+    <InstallFrom>Disk</InstallFrom>\r
+    <UpdateEnabled>false</UpdateEnabled>\r
+    <UpdateMode>Foreground</UpdateMode>\r
+    <UpdateInterval>7</UpdateInterval>\r
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
+    <UpdatePeriodically>false</UpdatePeriodically>\r
+    <UpdateRequired>false</UpdateRequired>\r
+    <MapFileExtensions>true</MapFileExtensions>\r
+    <ApplicationRevision>0</ApplicationRevision>\r
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <UseApplicationTrust>false</UseApplicationTrust>\r
+    <BootstrapperEnabled>true</BootstrapperEnabled>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>..\..\build.dbg\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;MONO_STRICT</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>..\..\build\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;MONO_STRICT</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.configuration" />\r
+    <Reference Include="System.Core">\r
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+    </Reference>\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Web.Extensions">\r
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+    </Reference>\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="..\DbLinq.ProductInfo.cs">\r
+      <Link>Properties\DbLinq.ProductInfo.cs</Link>\r
+    </Compile>\r
+    <Compile Include="Generator\AttributeDefinition.cs" />\r
+    <Compile Include="Generator\Implementation\CodeDomGenerator\AbstractCodeDomGenerator.cs" />\r
+    <Compile Include="Generator\EntityInterface\Implementation\INotifyPropertyChangedImplementation.cs" />\r
+    <Compile Include="Generator\GenerationContext.cs" />\r
+    <Compile Include="Generator\ICodeGenerator.cs" />\r
+    <Compile Include="Generator\EntityInterface\Implementation\InterfaceImplementation.cs" />\r
+    <Compile Include="Generator\Implementation\CodeDomGenerator\VisualBasicCodeDomGenerator.cs" />\r
+    <Compile Include="Generator\Implementation\CodeDomGenerator\CSharpCodeDomGenerator.cs" />\r
+    <Compile Include="Generator\Implementation\CodeTextGenerator\CodeGenerator.Class.cs" />\r
+    <Compile Include="Generator\Implementation\CodeTextGenerator\CodeGenerator.Context.Ctor.cs" />\r
+    <Compile Include="Generator\Implementation\CodeTextGenerator\CodeGenerator.cs" />\r
+    <Compile Include="Generator\Implementation\CodeTextGenerator\CodeGenerator.Procedure.cs" />\r
+    <Compile Include="Generator\Implementation\CodeTextGenerator\CSCodeGenerator.cs" />\r
+    <Compile Include="Generator\Implementation\CodeTextGenerator\CSCodeWriter.cs" />\r
+    <Compile Include="Generator\CodeWriter.cs" />\r
+    <Compile Include="Generator\EntityInterface\IImplementation.cs" />\r
+    <Compile Include="Generator\EntityInterface\Implementation\IModifiedImplementation.cs" />\r
+    <Compile Include="Generator\EntityInterface\Implementation\INotifyPropertyChangingImplementation.cs" />\r
+    <Compile Include="Generator\Implementation\Processor.cs" />\r
+    <Compile Include="Generator\IProcessor.cs" />\r
+    <Compile Include="Generator\ISchemaLoaderFactory.cs" />\r
+    <Compile Include="Generator\SpecificationDefinition.cs" />\r
+    <Compile Include="Generator\ParameterDefinition.cs" />\r
+    <Compile Include="Language\EnglishWords.cs" />\r
+    <Compile Include="Language\FrenchWords.cs" />\r
+    <Compile Include="Language\GermanWords.cs" />\r
+    <Compile Include="Properties\Settings.Designer.cs">\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>\r
+      <DependentUpon>Settings.settings</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Reference.cs" />\r
+    <Compile Include="Schema\DbmlRename.cs" />\r
+    <Compile Include="Schema\DbmlRenameLoader.cs" />\r
+    <Compile Include="Schema\NameAliasesLoader.cs" />\r
+    <Compile Include="Utility\VariablesExtension.cs" />\r
+    <Compile Include="Program.cs" />\r
+    <Compile Include="AbstractParameters.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="Configuration\ProvidersSection.cs" />\r
+    <Compile Include="Parameters.cs" />\r
+    <Compile Include="Schema\TableAlias.cs" />\r
+    <Compile Include="Generator\Implementation\SchemaLoaderFactory.cs" />\r
+    <Compile Include="Utility\EnvironmentExtension.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\DbLinq.snk">\r
+      <Link>Properties\DbLinq.snk</Link>\r
+    </None>\r
+    <None Include="App.config" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework Client Profile</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
+      <Visible>False</Visible>\r
+      <ProductName>Windows Installer 3.1</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Properties\Settings.settings">\r
+      <Generator>SettingsSingleFileGenerator</Generator>\r
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>\r
+    </None>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <EmbeddedResource Include="Language\EnglishWords.txt" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <EmbeddedResource Include="Language\FrenchWords.txt" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <EmbeddedResource Include="Language\GermanWords.txt" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\DbLinq\System.Data.Linq.csproj">\r
+      <Project>{97305421-3071-4175-AA3C-9A432CC28121}</Project>\r
+      <Name>System.Data.Linq</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
+  <PropertyGroup>\r
+    <PostBuildEvent>rem this is what I call loose coupling\r
+copy "$(SolutionDir)..\lib\Npgsql.dll" "$(TargetDir)"\r
+copy "$(SolutionDir)..\lib\Mono.Security.dll" "$(TargetDir)"\r
+copy "$(SolutionDir)..\lib\Ingres.Client.dll" "$(TargetDir)"\r
+copy "$(SolutionDir)..\lib\Oracle.DataAccess.dll" "$(TargetDir)"\r
+copy "$(SolutionDir)..\lib\MySql.Data.dll" "$(TargetDir)"\r
+copy "$(SolutionDir)..\lib\System.Data.SQLite.dll" "$(TargetDir)"\r
+copy "$(SolutionDir)..\lib\FirebirdSql.Data.FirebirdClient.dll" "$(TargetDir)"\r
+</PostBuildEvent>\r
+  </PropertyGroup>\r
+</Project>
\ No newline at end of file