Skip to content

Commit 866c49f

Browse files
committed
Remove c#7 syntax for releasing
Version 2.2
1 parent e1b51a6 commit 866c49f

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("2.1.0")]
19-
[assembly: AssemblyFileVersion("2.1.0")]
18+
[assembly: AssemblyVersion("2.2.0")]
19+
[assembly: AssemblyFileVersion("2.2.0")]
2020
//[assembly: AssemblyInformationalVersion("2.0-alpha6")]

Griddly.Mvc/Results/DapperResult.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ protected virtual IList<T> ExecuteQuery(string sql)
141141
try
142142
{
143143
IEnumerable<T> result = _map(_getConnection(), _getTransaction != null ? _getTransaction() : null, sql, _param);
144-
145-
if (result is IHasOverallCount overallCount)
146-
_overallCount = overallCount.OverallCount;
144+
145+
if (result is IHasOverallCount)
146+
_overallCount = (result as IHasOverallCount).OverallCount;
147147

148148
IList<T> results = result.ToList();
149149

@@ -169,14 +169,13 @@ protected IEnumerable<T> DefaultMap(IDbConnection cn, IDbTransaction tx, string
169169
{
170170
overallCount = 0;
171171
}
172-
else if (_hasOverallCount && firstRow is IHasOverallCount iHasOverallCount)
172+
else if (_hasOverallCount && firstRow is IHasOverallCount)
173173
{
174-
overallCount = iHasOverallCount.OverallCount;
174+
overallCount = (firstRow as IHasOverallCount).OverallCount;
175175
}
176-
else if (_sql.IndexOf("OverallCount", StringComparison.InvariantCultureIgnoreCase) != -1
177-
&& firstRow is IDictionary<string, object> dapperRow)
176+
else if (_sql.IndexOf("OverallCount", StringComparison.InvariantCultureIgnoreCase) != -1 && firstRow is IDictionary<string, object>)
178177
{
179-
overallCount = Convert.ToInt64(dapperRow["OverallCount"]);
178+
overallCount = Convert.ToInt64((firstRow as IDictionary<string, object>)["OverallCount"]);
180179
}
181180

182181
if (overallCount != null)

0 commit comments

Comments
 (0)