Skip to content

Commit bd7cda0

Browse files
author
Gencebay DEMIR
committed
Refs. and deps. updates
1 parent acdf092 commit bd7cda0

File tree

6 files changed

+28
-22
lines changed

6 files changed

+28
-22
lines changed

‎src/DataTransform.Api.Hosting/Core/SqlTransformTask.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System;
77
using System.Collections.Generic;
88
using System.Data;
9-
using System.Data.SqlClient;
9+
using Microsoft.Data.SqlClient;
1010
using System.Diagnostics;
1111
using System.Linq;
1212
using System.Threading;
@@ -57,7 +57,7 @@ private async Task<int> TokenizeLoopAsync(SqlTransformContext context)
5757
bool allFields = fields.Contains("*");
5858

5959
DataTable dataTable = new DataTable();
60-
using (var connection = _sourceSqlDatabase.CreateConnection())
60+
using (SqlConnection connection = _sourceSqlDatabase.CreateConnection())
6161
{
6262
string targetDatabaseName = _targetSqlConnectionBuilder.InitialCatalog;
6363
Server server = new Server(new ServerConnection(connection));

‎src/DataTransform.Api.Hosting/DataTransform.Api.Hosting.csproj‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Dapper" Version="1.50.5" />
9-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="140.17279.0" />
11-
<PackageReference Include="MongoDB.Driver" Version="2.7.0" />
12-
<PackageReference Include="NetCoreStack.Contracts" Version="2.0.7" />
13-
<PackageReference Include="NetCoreStack.WebSockets" Version="2.5.0" />
14-
</ItemGroup>
15-
16-
<ItemGroup>
17-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
8+
<PackageReference Include="Dapper" Version="2.0.35" />
9+
<PackageReference Include="Microsoft.AspNetCore.App" />
10+
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="160.2004021.0" />
11+
<PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
12+
<PackageReference Include="MongoDB.Driver" Version="2.10.3" />
13+
<PackageReference Include="NetCoreStack.Contracts" Version="3.0.0" />
14+
<PackageReference Include="NetCoreStack.WebSockets" Version="2.5.2" />
15+
<PackageReference Include="Npgsql" Version="4.1.3.1" />
1816
</ItemGroup>
1917

2018
<ItemGroup>

‎src/DataTransform.Api.Hosting/Database/SqlDatabase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Data.Common;
4-
using System.Data.SqlClient;
4+
using Microsoft.Data.SqlClient;
55

66
namespace DataTransform.Api.Hosting
77
{

‎src/DataTransform.Api.Hosting/Helpers/SqlQueryHelper.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using Dapper;
22
using Microsoft.SqlServer.Management.Common;
33
using Microsoft.SqlServer.Management.Smo;
4+
using Microsoft.SqlServer.Types;
45
using System;
56
using System.Collections.Specialized;
67
using System.Data.SqlClient;
8+
using System.Drawing;
79

810
namespace DataTransform.Api.Hosting
911
{
@@ -147,6 +149,9 @@ public static Type GetClrType(this SqlDataType sqlType)
147149
case SqlDataType.DateTimeOffset:
148150
return typeof(DateTimeOffset);
149151

152+
case SqlDataType.Geometry:
153+
return typeof(SqlGeometry);
154+
150155
default:
151156
throw new ArgumentOutOfRangeException("sqlType");
152157
}

‎src/DataTransform.SharedLibrary/DataTransform.SharedLibrary.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
</PropertyGroup>
66

77
</Project>

‎test/DataTransform.Api.Tests/DataTransform.Api.Tests.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
11-
<PackageReference Include="Moq" Version="4.9.0" />
12-
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11+
<PackageReference Include="Moq" Version="4.13.1" />
12+
<PackageReference Include="xunit" Version="2.4.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
1518
</ItemGroup>
1619

0 commit comments

Comments
 (0)