Skip to content

Commit d5a2e08

Browse files
AndriySvyrydAndriySvyryd
authored
Fix T4 files for VS 17.8 (#32651)
1 parent 9fdf1c4 commit d5a2e08

File tree

24 files changed

+157
-151
lines changed

24 files changed

+157
-151
lines changed

‎src/EFCore.Abstractions/Properties/AbstractionsStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "AbstractionsStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.Properties";
45
Session["NoDiagnostics"] = true;

‎src/EFCore.Cosmos/Properties/CosmosStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "CosmosStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.Cosmos.Properties";
45
Session["LoggingDefinitionsClass"] = "Diagnostics.Internal.CosmosLoggingDefinitions";

‎src/EFCore.Design/Properties/DesignStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "DesignStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.Properties";
45
Session["LoggingDefinitionsClass"] = "DesignLoggingDefinitions";

‎src/EFCore.Design/Properties/DesignStrings.resx

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->

‎src/EFCore.InMemory/Properties/InMemoryStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "InMemoryStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.InMemory.Properties";
45
Session["LoggingDefinitionsClass"] = "Diagnostics.Internal.InMemoryLoggingDefinitions";

‎src/EFCore.Proxies/Properties/ProxiesStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "ProxiesStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.Properties";
45
Session["LoggingDefinitionsClass"] = "ProxiesLoggingDefinitions";

‎src/EFCore.Relational/Properties/RelationalStrings.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/EFCore.Relational/Properties/RelationalStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "RelationalStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.Properties";
45
Session["LoggingDefinitionsClass"] = "RelationalLoggingDefinitions";

‎src/EFCore.Relational/Properties/RelationalStrings.resx

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->

‎src/EFCore.SqlServer.HierarchyId/Properties/SqlServerHierarchyIdStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "SqlServerHierarchyIdStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.SqlServer.Properties";
45
Session["LoggingDefinitionsClass"] = "SqlServerHierarchyIdLoggingDefinitions";

‎src/EFCore.SqlServer.NTS/Properties/SqlServerNTSStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "SqlServerNTSStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.SqlServer.Properties";
45
Session["LoggingDefinitionsClass"] = "SqlServerNtsLoggingDefinitions";

‎src/EFCore.SqlServer/Properties/SqlServerStrings.Designer.cs

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/EFCore.SqlServer/Properties/SqlServerStrings.Designer.tt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<#
2+
Session = new System.Collections.Generic.Dictionary<string, object>();
23
Session["ResourceFile"] = "SqlServerStrings.resx";
34
Session["ResourceNamespace"] = "Microsoft.EntityFrameworkCore.SqlServer.Properties";
45
Session["LoggingDefinitionsClass"] = "Diagnostics.Internal.SqlServerLoggingDefinitions";

‎src/EFCore.SqlServer/Properties/SqlServerStrings.resx

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
@@ -147,6 +147,9 @@
147147
<data name="DuplicateIndexClusteredMismatch" xml:space="preserve">
148148
<value>The indexes {index1} on '{entityType1}' and {index2} on '{entityType2}' are both mapped to '{table}.{indexName}', but have different clustered configurations.</value>
149149
</data>
150+
<data name="DuplicateIndexDataCompressionMismatch" xml:space="preserve">
151+
<value>The indexes {index1} on '{entityType1}' and {index2} on '{entityType2}' are both mapped to '{table}.{indexName}', but have different data compression configurations.</value>
152+
</data>
150153
<data name="DuplicateIndexFillFactorMismatch" xml:space="preserve">
151154
<value>The indexes {index1} on '{entityType1}' and {index2} on '{entityType2}' are both mapped to '{table}.{indexName}', but have different fill factor configurations.</value>
152155
</data>
@@ -159,15 +162,9 @@
159162
<data name="DuplicateIndexSortInTempDbMismatch" xml:space="preserve">
160163
<value>The indexes {index1} on '{entityType1}' and {index2} on '{entityType2}' are both mapped to '{table}.{indexName}', but have different sort in tempdb configurations.</value>
161164
</data>
162-
<data name="DuplicateIndexDataCompressionMismatch" xml:space="preserve">
163-
<value>The indexes {index1} on '{entityType1}' and {index2} on '{entityType2}' are both mapped to '{table}.{indexName}', but have different data compression configurations.</value>
164-
</data>
165165
<data name="DuplicateKeyMismatchedClustering" xml:space="preserve">
166166
<value>The keys {key1} on '{entityType1}' and {key2} on '{entityType2}' are both mapped to '{table}.{keyName}', but have different clustering configurations.</value>
167167
</data>
168-
<data name="LeastGreatestCompatibilityLevelTooLow" xml:space="preserve">
169-
<value>This usage of Math.Min or Math.Max requires SQL Server functions LEAST and GREATEST, which require compatibility level 160.</value>
170-
</data>
171168
<data name="IdentityBadType" xml:space="preserve">
172169
<value>Identity value generation cannot be used for the property '{property}' on entity type '{entityType}' because the property type is '{propertyType}'. Identity value generation can only be used with signed integer properties.</value>
173170
</data>
@@ -198,6 +195,9 @@
198195
<data name="JsonValuePathExpressionsNotSupported" xml:space="preserve">
199196
<value>A non-constant array index or property name was used when navigating inside a JSON document, but EF Core's SQL Server compatibility level is set to {compatibilityLevel}; this is only supported with compatibility level 140 (SQL Server 2017) or higher.</value>
200197
</data>
198+
<data name="LeastGreatestCompatibilityLevelTooLow" xml:space="preserve">
199+
<value>This usage of Math.Min or Math.Max requires SQL Server functions LEAST and GREATEST, which require compatibility level 160.</value>
200+
</data>
201201
<data name="LogByteIdentityColumn" xml:space="preserve">
202202
<value>The property '{property}' on entity type '{entityType}' is of type 'byte', but is set up to use a SQL Server identity column; this requires that values starting at 255 and counting down will be used for temporary key values. A temporary key value is needed for every entity inserted in a single call to 'SaveChanges'. Care must be taken that these values do not collide with real key values.</value>
203203
<comment>Warning SqlServerEventId.ByteIdentityColumnWarning string string</comment>

0 commit comments

Comments
 (0)