[Microsoft.Build] Fix expected output newline from ProcessWrapper.OutputStreamChanged...

[mono.git] / mcs / class / Mainsoft.Web / Mainsoft.Web.Security / DerbyRolesHelper.cs

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs
index fdfce9bbc6ba53d5b147f6a144a8581d9525b061..04c6ccb0dfeb728d02dd6586b87230dfdfd49370 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs
@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
 //\r
 \r
-#if NET_2_0\r
 \r
 using System;\r
 using System.Web.Security;\r
@@ -57,7 +56,7 @@ namespace Mainsoft.Web.Security
                        string querySelect = "SELECT RoleName FROM aspnet_Roles WHERE ApplicationId = ? AND LoweredRoleName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
-                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelect.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -69,7 +68,7 @@ namespace Mainsoft.Web.Security
                        AddParameter (cmdInsert, "ApplicationId", appId);\r
                        AddParameter (cmdInsert, "RoleId", Guid.NewGuid ().ToString ());\r
                        AddParameter (cmdInsert, "RoleName", rolename);\r
-                       AddParameter (cmdInsert, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (cmdInsert, "LoweredRoleName", rolename.ToLowerInvariant ());\r
                        cmdInsert.ExecuteNonQuery ();\r
 \r
                        return 0;\r
@@ -134,7 +133,7 @@ namespace Mainsoft.Web.Security
                        string querySelect = "SELECT RoleName FROM aspnet_Roles WHERE ApplicationId = ? AND LoweredRoleName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
-                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelect.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -157,7 +156,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelUsers = new OleDbCommand (querySelUsers, (OleDbConnection) connection);\r
                        AddParameter (cmdSelUsers, "ApplicationId", appId);\r
                        for (int i = 0; i < userNames.Length; i++)\r
-                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLower ());\r
+                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLowerInvariant ());\r
 \r
                        int userIndex = 0;\r
                        using (OleDbDataReader reader = cmdSelUsers.ExecuteReader ()) {\r
@@ -171,7 +170,7 @@ namespace Mainsoft.Web.Security
                        if (userNames.Length != userIndex) {\r
                                // find not existing users and create them\r
                                for (int j = 0; j < userNames.Length; j++)\r
-                                       if (Array.IndexOf (loweredUsernames, userNames [j].ToLower ()) < 0) {\r
+                                       if (Array.IndexOf (loweredUsernames, userNames [j].ToLowerInvariant ()) < 0) {\r
                                                string newUserId = Guid.NewGuid ().ToString ();\r
                                                string queryAddUser = "INSERT INTO aspnet_Users (ApplicationId, UserId, UserName, " +\r
                                                        "LoweredUserName, IsAnonymous, LastActivityDate) VALUES (?, ?, ?, ?, ?, ?)";\r
@@ -179,7 +178,7 @@ namespace Mainsoft.Web.Security
                                                AddParameter (cmdAddUser, "ApplicationId", appId);\r
                                                AddParameter (cmdAddUser, "UserId", newUserId);\r
                                                AddParameter (cmdAddUser, "UserName", userNames [j]);\r
-                                               AddParameter (cmdAddUser, "LoweredUserName", userNames [j].ToLower ());\r
+                                               AddParameter (cmdAddUser, "LoweredUserName", userNames [j].ToLowerInvariant ());\r
                                                AddParameter (cmdAddUser, "IsAnonymous", 0);\r
                                                AddParameter (cmdAddUser, "LastActivityDate", DateTime.UtcNow);\r
                                                cmdAddUser.ExecuteNonQuery ();\r
@@ -193,7 +192,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelRoles = new OleDbCommand (querySelRoles, (OleDbConnection) connection);\r
                        AddParameter (cmdSelRoles, "ApplicationId", appId);\r
                        for (int i = 0; i < roleNames.Length; i++)\r
-                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLower ());\r
+                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelRoles.ExecuteReader ()) {\r
                                int i = 0;\r
@@ -244,13 +243,13 @@ namespace Mainsoft.Web.Security
                        if (roleId == null)\r
                                return 2;\r
 \r
-                       string querySelect = "SELECT usr.UserName FROM aspnet_Users usr, aspnet_UsersInRoles uir " +
-                               "WHERE usr.UserId = uir.UserId AND usr.ApplicationId = ? AND uir.RoleId = ? AND LoweredUserName LIKE ? " +
+                       string querySelect = "SELECT usr.UserName FROM aspnet_Users usr, aspnet_UsersInRoles uir " +\r
+                               "WHERE usr.UserId = uir.UserId AND usr.ApplicationId = ? AND uir.RoleId = ? AND LoweredUserName LIKE ? " +\r
                                "ORDER BY usr.UserName";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
                        AddParameter (cmdSelect, "RoleId", roleId);\r
-                       AddParameter (cmdSelect, "LoweredUserName", "%" + userNameToMatch.ToLower() + "%");\r
+                       AddParameter (cmdSelect, "LoweredUserName", "%" + userNameToMatch.ToLowerInvariant() + "%");\r
                        reader = cmdSelect.ExecuteReader ();\r
 \r
                        return 0;\r
@@ -336,7 +335,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelUsers = new OleDbCommand (querySelUsers, (OleDbConnection) connection);\r
                        AddParameter (cmdSelUsers, "ApplicationId", appId);\r
                        for (int i = 0; i < userNames.Length; i++)\r
-                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLower ());\r
+                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelUsers.ExecuteReader ()) {\r
                                int i = 0;\r
@@ -351,7 +350,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelRoles = new OleDbCommand (querySelRoles, (OleDbConnection) connection);\r
                        AddParameter (cmdSelRoles, "ApplicationId", appId);\r
                        for (int i = 0; i < roleNames.Length; i++)\r
-                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLower ());\r
+                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelRoles.ExecuteReader ()) {\r
                                int i = 0;\r
@@ -390,7 +389,7 @@ namespace Mainsoft.Web.Security
                        string selectQuery = "SELECT RoleId FROM aspnet_Roles WHERE LoweredRoleName = ? AND ApplicationId = ?";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredRoleName", rolename.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -405,7 +404,7 @@ namespace Mainsoft.Web.Security
                        string selectQuery = "SELECT UserId FROM aspnet_Users WHERE LoweredUserName = ? AND ApplicationId = ?";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -427,4 +426,3 @@ namespace Mainsoft.Web.Security
        }\r
 }\r
 \r
-#endif
\ No newline at end of file