Clean up merge errors in csproj (a few unclosed tags), cleanup build configurations, update mac to use BaseSqlite