Fix regex to work in .NET 10

hazzik · hazzik · commit a1cefc635621 · 2025-11-12T22:25:36.000+10:00
diff --git a/src/NHibernate/Dialect/MsSql2000Dialect.cs b/src/NHibernate/Dialect/MsSql2000Dialect.cs
@@ -809,7 +809,7 @@ public LockHintAppender(MsSql2000Dialect dialect, IDictionary<string, LockMode>
 				// Match < alias >, < alias,>, or < alias$>, the intent is to capture alias names
 				// in various kinds of "FROM table1 alias1, table2 alias2".
 				_matchRegex = new Regex(" (" + aliasesPattern + ")([, ]|$)");
-				_unionSubclassRegex = new Regex(@"from\s+\(((?:.|\r|\n)*)\)(?:\s+as)?\s+(?<alias>" + aliasesPattern + ")", RegexOptions.IgnoreCase | RegexOptions.Multiline);
+				_unionSubclassRegex = new Regex(@"from\s+\(([\s\S]+)\)(?:\s+as)?\s+(?<alias>" + aliasesPattern + ")", RegexOptions.IgnoreCase | RegexOptions.Multiline);
 			}
 
 			public SqlString AppendLockHint(SqlString sql)

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ public LockHintAppender(MsSql2000Dialect dialect, IDictionary<string, LockMode>`
`809`	`809`	`// Match < alias >, < alias,>, or < alias$>, the intent is to capture alias names`
`810`	`810`	`// in various kinds of "FROM table1 alias1, table2 alias2".`
`811`	`811`	`_matchRegex = new Regex(" (" + aliasesPattern + ")([, ]\|$)");`
`812`		`- _unionSubclassRegex = new Regex(@"from\s+\(((?:.\|\r\|\n)*)\)(?:\s+as)?\s+(?<alias>" + aliasesPattern + ")", RegexOptions.IgnoreCase \| RegexOptions.Multiline);`
	`812`	`+ _unionSubclassRegex = new Regex(@"from\s+\(([\s\S]+)\)(?:\s+as)?\s+(?<alias>" + aliasesPattern + ")", RegexOptions.IgnoreCase \| RegexOptions.Multiline);`
`813`	`813`	`}`
`814`	`814`
`815`	`815`	`public SqlString AppendLockHint(SqlString sql)`