Added MONO conditionals

ThatRendle · ThatRendle · commit 65991dfa0b6d · 2011-11-27T13:48:12.000Z
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -19,6 +19,6 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("0.11.3.2")]
-[assembly: AssemblyFileVersion("0.11.3.2")]
+[assembly: AssemblyVersion("0.11.4.1")]
+[assembly: AssemblyFileVersion("0.11.4.1")]
 
diff --git a/Simple.Data.SqlServer/DbTypeLookup.cs b/Simple.Data.SqlServer/DbTypeLookup.cs
@@ -11,11 +11,13 @@ internal static class DbTypeLookup
                                                                                         {"uniqueidentifier", SqlDbType.UniqueIdentifier},
                                                                                         {"date", SqlDbType.Date},
                                                                                         {"time", SqlDbType.Time},
-//                                                                                        {"datetime2", SqlDbType.DateTime2},
-//                                                                                        {
-//                                                                                            "datetimeoffset",
-//                                                                                            SqlDbType.DateTimeOffset
-//                                                                                            },
+#if(!MONO)
+                                                                                        {"datetime2", SqlDbType.DateTime2},
+                                                                                        {
+                                                                                            "datetimeoffset",
+                                                                                            SqlDbType.DateTimeOffset
+                                                                                        },
+#endif
                                                                                         {"tinyint", SqlDbType.TinyInt},
                                                                                         {"smallint", SqlDbType.SmallInt},
                                                                                         {"int", SqlDbType.Int},
diff --git a/Simple.Data.SqlTest/DatabaseHelper.cs b/Simple.Data.SqlTest/DatabaseHelper.cs
@@ -10,8 +10,12 @@ namespace Simple.Data.SqlTest
 {
     internal static class DatabaseHelper
     {
-		public static readonly string ConnectionString =
+        public static readonly string ConnectionString =
+#if(MONO)
 			"Data Source=10.37.129.4;Initial Catalog=SimpleTest;User ID=SimpleUser;Password=SimplePassword";
+#else
+            Properties.Settings.Default.ConnectionString;
+#endif
 		
         public static dynamic Open()
         {
diff --git a/Simple.Data/MefHelper.cs b/Simple.Data/MefHelper.cs
@@ -53,15 +53,25 @@ public static T GetAdjacentComponent<T>(Type knownSiblingType)
             }
         }
 
-        private static CompositionContainer CreateContainer()
+        static string GetThisAssemblyPath()
         {
-            var path = Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", "").Replace("file://","//");
+            var path = Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", "").Replace("file://", "//");
             path = Path.GetDirectoryName(path);
             if (path == null) throw new ArgumentException("Unrecognised file.");
+            if (!Path.IsPathRooted(path))
+            {
+                path = Path.DirectorySeparatorChar + path;
+            }
+            return path;
+        }
+
+        private static CompositionContainer CreateContainer()
+        {
+			var path = GetThisAssemblyPath ();
 
             var assemblyCatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());
 			var aggregateCatalog = new AggregateCatalog(assemblyCatalog);
-			foreach (string file in System.IO.Directory.GetFiles("/" + path, "Simple.Data.*.dll"))
+			foreach (string file in System.IO.Directory.GetFiles(path, "Simple.Data.*.dll"))
 			{
 				var catalog = new AssemblyCatalog(file);
 				aggregateCatalog.Catalogs.Add(catalog);

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,12 @@ namespace Simple.Data.SqlTest`
`10`	`10`	`{`
`11`	`11`	`internal static class DatabaseHelper`
`12`	`12`	`{`
`13`		`- public static readonly string ConnectionString =`
	`13`	`+ public static readonly string ConnectionString =`
	`14`	`+#if(MONO)`
`14`	`15`	`"Data Source=10.37.129.4;Initial Catalog=SimpleTest;User ID=SimpleUser;Password=SimplePassword";`
	`16`	`+#else`
	`17`	`+ Properties.Settings.Default.ConnectionString;`
	`18`	`+#endif`
`15`	`19`
`16`	`20`	`public static dynamic Open()`
`17`	`21`	`{`