mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mcs/class/Mono.Data.Sqlite/Makefile
View File

@@ -10,7 +10,8 @@ RESOURCES = $(RESX_RESOURCES) $(OTHER_RESOURCES)
PREBUILT = $(RESX_RESOURCES:=.prebuilt)
LIBRARY = Mono.Data.Sqlite.dll
LIB_MCS_FLAGS = /unsafe /r:System.dll /r:System.Data.dll /r:System.Transactions.dll /r:System.Xml.dll \
LIB_REFS = System System.Data System.Transactions System.Xml
LIB_MCS_FLAGS = /unsafe \
$(RESOURCES:%=-resource:%) -d:SQLITE_STANDARD
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
@@ -23,7 +24,7 @@ EXTRA_DISTFILES = Test/SqliteTest.cs \
resources/MetaDataCollections.xml \
$(PREBUILT) \
$(wildcard resources/*.bmp)
CLEAN_FILES += $(RESX_RESOURCES)
CLEAN_FILES = $(RESX_RESOURCES)

2
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs
View File

@@ -30,6 +30,8 @@ namespace Mono.Data.Sqlite
private const string SQLITE_DLL = "SQLite.Interop.DLL";
#endif // USE_INTEROP_DLL
#elif MONOTOUCH
private const string SQLITE_DLL = "/usr/lib/libsqlite3.dylib";
#else
private const string SQLITE_DLL = "sqlite3";
#endif

8
mcs/class/Mono.Data.Sqlite/Test/Bug27864.cs
View File

@@ -92,14 +92,12 @@ namespace MonoTests.Mono.Data.Sqlite {
Assert.AreEqual(dr["Company.Name"], "Test CO");
i += 2;
}
Assert.IsTrue(dr.FieldCount>0);
Assert.IsTrue(dr.FieldCount>0, i.ToString ());
}
if (BCL.Tests.TestRuntime.CheckSystemVersion (8, 2))
Assert.IsTrue (false, "Apple fixed bug 27864, this check can now be removed");
}
} catch (SqliteException ex) {
if (BCL.Tests.TestRuntime.CheckSystemVersion (8, 2)) // Expected Exception on iOS 8.2+, if this does not happen anymore it means apple fixed it
// Expected Exception from iOS 8.2 (broken) to 9.0 (fixed)
if (BCL.Tests.TestRuntime.CheckSystemVersion (8,2) && !BCL.Tests.TestRuntime.CheckSystemVersion (9,0))
Assert.That (ex.Message.Contains ("no such column: com.Name"));
else
throw new AssertionException ("Unexpected Sqlite Error", ex); // This should not happen