Skip to content

Commit 08de323

Browse files
committed
Updating:
- McMaster.NETCore.Plugins to 0.2.1 - Microsoft.AspNetCore.Identity.EntityFrameworkCore to 2.2.0 - Microsoft.EntityFrameworkCore.SqlServer to 2.2.0 - Microting.eForm to 3.0.111 - Microting.eFormApi.BasePn to 1.1.68 - Microsoft.EntityFrameworkCore.Design to 2.2.0 - Pomelo.EntityFrameworkCore.MySql to 2.1.4 Removed: - Automapper 6.1.0
1 parent 6cd9c08 commit 08de323

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed

eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.104" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.111" />
1111
<PackageReference Include="NUnit" Version="3.10.1" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
1313
</ItemGroup>

eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.104" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.111" />
1111
<PackageReference Include="NUnit" Version="3.10.1" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
1313
</ItemGroup>

eFormAPI/eFormAPI.Web/Services/SitesService.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using AutoMapper;
43
using eFormAPI.Web.Abstractions;
54
using eFormAPI.Web.Abstractions.Advanced;
65
using eFormCore;
@@ -69,24 +68,17 @@ public OperationResult Delete(int id)
6968
{
7069
Core core = _coreHelper.GetCore();
7170
SiteName_Dto siteDto = core.Advanced_SiteItemRead(id);
72-
SiteNameModel siteNameModel;
7371

74-
if (!siteDto.Equals(null))
75-
{
76-
Mapper.Initialize(cfg => cfg.CreateMap<SiteName_Dto, SiteNameModel>());
77-
siteNameModel =
78-
Mapper.Map<SiteName_Dto, SiteNameModel>(siteDto);
79-
}
80-
else
72+
if (siteDto.Equals(null))
8173
{
8274
return new OperationResult(false, _localizationService.GetString("SiteParamNotFound", id));
8375
}
8476

8577
return core.Advanced_SiteItemDelete(id)
8678
? new OperationResult(true,
87-
_localizationService.GetString("SiteParamDeletedSuccessfully", siteNameModel.SiteName))
79+
_localizationService.GetString("SiteParamDeletedSuccessfully", siteDto.SiteName))
8880
: new OperationResult(false,
89-
_localizationService.GetString("SiteParamCouldNotBeDeleted", siteNameModel.SiteName));
81+
_localizationService.GetString("SiteParamCouldNotBeDeleted", siteDto.SiteName));
9082
}
9183

9284
catch (Exception)

eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,18 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Automapper" Version="6.1.0" />
30-
<PackageReference Include="Microting.eForm" Version="3.0.104" />
31-
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.65" />
32-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
29+
<PackageReference Include="Microting.eForm" Version="3.0.111" />
30+
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.68" />
31+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
3332
<PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
3433
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
3534
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
36-
<PackageReference Include="McMaster.NETCore.Plugins" Version="0.1.1" />
35+
<PackageReference Include="McMaster.NETCore.Plugins" Version="0.2.1" />
3736
<PackageReference Include="OtpSharp.Core" Version="1.0.0" />
38-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />
39-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.6" />
37+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
38+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
4039
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.6" />
41-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.6" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
4241
</ItemGroup>
4342

4443
<ItemGroup>

0 commit comments

Comments
 (0)