Skip to content

Commit 79e037e

Browse files
v-aljemairaw
authored andcommitted
Bulk fix for quoted @ that break LOC builds (#5962)
1 parent 0873300 commit 79e037e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

docs/framework/data/adonet/common-schema-collections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ The common schema collections are the schema collections that are implemented by
2424

2525
|ColumnName|DataType|Description|
2626
|----------------|--------------|-----------------|
27-
|CompositeIdentifierSeparatorPattern|string|The regular expression to match the composite separators in a composite identifier. For example, "\\." (for SQL Server) or "@&#124;\\." (for Oracle).<br /><br /> A composite identifier is typically what is used for a database object name, for example: pubs.dbo.authors or pubs@dbo.authors.<br /><br /> For SQL Server, use the regular expression "\\.". For OracleClient, use "@&#124;\\.".<br /><br /> For ODBC use the Catalog_name_seperator.<br /><br /> For OLE DB use DBLITERAL_CATALOG_SEPARATOR or DBLITERAL_SCHEMA_SEPARATOR.|
27+
|CompositeIdentifierSeparatorPattern|string|The regular expression to match the composite separators in a composite identifier. For example, "\\." (for SQL Server) or "\@&#124;\\." (for Oracle).<br /><br /> A composite identifier is typically what is used for a database object name, for example: pubs.dbo.authors or pubs@dbo.authors.<br /><br /> For SQL Server, use the regular expression "\\.". For OracleClient, use "\@&#124;\\.".<br /><br /> For ODBC use the Catalog_name_seperator.<br /><br /> For OLE DB use DBLITERAL_CATALOG_SEPARATOR or DBLITERAL_SCHEMA_SEPARATOR.|
2828
|DataSourceProductName|string|The name of the product accessed by the provider, such as "Oracle" or "SQLServer".|
2929
|DataSourceProductVersion|string|Indicates the version of the product accessed by the provider, in the data sources native format and not in Microsoft format.<br /><br /> In some cases DataSourceProductVersion and DataSourceProductVersionNormalized will be the same value. In the case of OLE DB and ODBC, these will always be the same as they are mapped to the same function call in the underlying native API.|
3030
|DataSourceProductVersionNormalized|string|A normalized version for the data source, such that it can be compared with `String.Compare()`. The format of this is consistent for all versions of the provider to prevent version 10 from sorting between version 1 and version 2.<br /><br /> For example, the Oracle provider uses a format of "nn.nn.nn.nn.nn" for its normalized version, which causes an Oracle 8i data source to return "08.01.07.04.01". SQL Server uses the typical Microsoft "nn.nn.nnnn" format.<br /><br /> In some cases, DataSourceProductVersion and DataSourceProductVersionNormalized will be the same value. In the case of OLE DB and ODBC these will always be the same as they are mapped to the same function call in the underlying native API.|
3131
|GroupByBehavior|<xref:System.Data.Common.GroupByBehavior>|Specifies the relationship between the columns in a GROUP BY clause and the non-aggregated columns in the select list.|
3232
|IdentifierPattern|string|A regular expression that matches an identifier and has a match value of the identifier. For example "[A-Za-z0-9_#$]".|
3333
|IdentifierCase|<xref:System.Data.Common.IdentifierCase>|Indicates whether non-quoted identifiers are treated as case sensitive or not.|
3434
|OrderByColumnsInSelect|bool|Specifies whether columns in an ORDER BY clause must be in the select list. A value of true indicates that they are required to be in the select list, a value of false indicates that they are not required to be in the select list.|
35-
|ParameterMarkerFormat|string|A format string that represents how to format a parameter.<br /><br /> If named parameters are supported by the data source, the first placeholder in this string should be where the parameter name should be formatted.<br /><br /> For example, if the data source expects parameters to be named and prefixed with an ‘:’ this would be ":{0}". When formatting this with a parameter name of "p1" the resulting string is ":p1".<br /><br /> If the data source expects parameters to be prefixed with the ‘@’, but the names already include them, this would be ‘{0}’, and the result of formatting a parameter named "@p1" would simply be "@p1".<br /><br /> For data sources that do not expect named parameters and expect the use of the ‘?’ character, the format string can be specified as simply ‘?’, which would ignore the parameter name. For OLE DB we return ‘?’.|
35+
|ParameterMarkerFormat|string|A format string that represents how to format a parameter.<br /><br /> If named parameters are supported by the data source, the first placeholder in this string should be where the parameter name should be formatted.<br /><br /> For example, if the data source expects parameters to be named and prefixed with an ‘:’ this would be ":{0}". When formatting this with a parameter name of "p1" the resulting string is ":p1".<br /><br /> If the data source expects parameters to be prefixed with the ‘@’, but the names already include them, this would be ‘{0}’, and the result of formatting a parameter named "\@p1" would simply be "\@p1".<br /><br /> For data sources that do not expect named parameters and expect the use of the ‘?’ character, the format string can be specified as simply ‘?’, which would ignore the parameter name. For OLE DB we return ‘?’.|
3636
|ParameterMarkerPattern|string|A regular expression that matches a parameter marker. It will have a match value of the parameter name, if any.<br /><br /> For example, if named parameters are supported with an ‘@’ lead-in character that will be included in the parameter name, this would be: "(@[A-Za-z0-9_$#]*)".<br /><br /> However, if named parameters are supported with a ‘:’ as the lead-in character and it is not part of the parameter name, this would be: ":([A-Za-z0-9_$#]\*)".<br /><br /> Of course, if the data source doesn’t support named parameters, this would simply be "?".|
3737
|ParameterNameMaxLength|int|The maximum length of a parameter name in characters. Visual Studio expects that if parameter names are supported, the minimum value for the maximum length is 30 characters.<br /><br /> If the data source does not support named parameters, this property returns zero.|
3838
|ParameterNamePattern|string|A regular expression that matches the valid parameter names. Different data sources have different rules regarding the characters that may be used for parameter names.<br /><br /> Visual Studio expects that if parameter names are supported, the characters "\p{Lu}\p{Ll}\p{Lt}\p{Lm}\p{Lo}\p{Nl}\p{Nd}" are the minimum supported set of characters that are valid for parameter names.|

docs/framework/data/adonet/ef/modification-sql-generation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The elements of the list are specified as type DbModificationClause, which speci
9898
## Generating an Insert SQL Command
9999
For a given DbInsertCommandTree in the sample provider, the generated insert command follows one of the two insert templates below.
100100

101-
The first template has a command to perform the insert given the values in the list of SetClauses, and a SELECT statement to return the properties specified in the Returning property for the inserted row if the Returning property was not null. The predicate element "@@ROWCOUNT > 0" is true if a row was inserted. The predicate element "keyMemberI = keyValueI &#124; scope_identity()" takes the shape "keyMemberI = scope_identity()" only if keyMemeberI is a store-generated key, because scope_identity() returns the last identity value inserted into an identity (store-generated) column.
101+
The first template has a command to perform the insert given the values in the list of SetClauses, and a SELECT statement to return the properties specified in the Returning property for the inserted row if the Returning property was not null. The predicate element "\@@ROWCOUNT > 0" is true if a row was inserted. The predicate element "keyMemberI = keyValueI &#124; scope_identity()" takes the shape "keyMemberI = scope_identity()" only if keyMemeberI is a store-generated key, because scope_identity() returns the last identity value inserted into an identity (store-generated) column.
102102

103103
```
104104
-- first insert Template

docs/framework/wcf/feature-details/messaging-protocols.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ Content-Length: 0
446446
447447
- R4132: An HTTP Content-Type header must have a type parameter with the value `application/xop+xml` enclosed in double quotation marks.
448448
449-
While the requirement to use double quotation marks is not explicit in RFC 2387, the text observes that all of the multipart/related media type parameters most likely contain reserved characters like "@" or "/" and therefore need double quotation marks.
449+
While the requirement to use double quotation marks is not explicit in RFC 2387, the text observes that all of the multipart/related media type parameters most likely contain reserved characters like "\@" or "/" and therefore need double quotation marks.
450450
451451
- R4133: An HTTP Content-Type header should have a start parameter with the value of the Content-ID header of the MIME part that contains the SOAP 1.x Envelope, enclosed in double quotation marks. If the start parameter is omitted, the first MIME part must contain the SOAP 1.x Envelope.
452452

docs/standard/base-types/backtracking-in-regular-expressions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ ms.author: "ronpet"
163163
|`[-.\w]*`|Match zero, one, or more occurrences of a hyphen, period, or word character.|
164164
|`[0-9A-Z]`|Match an alphanumeric character.|
165165
|`([-.\w]*[0-9A-Z])*`|Match zero or more occurrences of the combination of zero or more hyphens, periods, or word characters, followed by an alphanumeric character. This is the first capturing group.|
166-
|`@`|Match an at sign ("@").|
166+
|`@`|Match an at sign ("\@").|
167167

168168
The second regular expression pattern, `^[0-9A-Z][-.\w]*(?<=[0-9A-Z])@`, uses a positive lookbehind assertion. It is defined as shown in the following table.
169169

@@ -173,7 +173,7 @@ ms.author: "ronpet"
173173
|`[0-9A-Z]`|Match an alphanumeric character. This comparison is case-insensitive, because the <xref:System.Text.RegularExpressions.Regex.IsMatch%2A?displayProperty=nameWithType> method is called with the <xref:System.Text.RegularExpressions.RegexOptions.IgnoreCase?displayProperty=nameWithType> option.|
174174
|`[-.\w]*`|Match zero or more occurrences of a hyphen, period, or word character.|
175175
|`(?<=[0-9A-Z])`|Look back at the last matched character and continue the match if it is alphanumeric. Note that alphanumeric characters are a subset of the set that consists of periods, hyphens, and all word characters.|
176-
|`@`|Match an at sign ("@").|
176+
|`@`|Match an at sign ("\@").|
177177

178178
<a name="Lookahead"></a>
179179
### Lookahead Assertions

0 commit comments

Comments
 (0)