diff --git a/src/Dime.AutoMapper.sln.DotSettings.user b/src/Dime.AutoMapper.sln.DotSettings.user
new file mode 100644
index 0000000..b45211f
--- /dev/null
+++ b/src/Dime.AutoMapper.sln.DotSettings.user
@@ -0,0 +1,4 @@
+
+ <SessionState ContinuousTestingMode="0" Name="All tests from <Tests>\<Dime.AutoMapper.Tests>" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session">
+ <Project Location="D:\Source\Dime.Utilities\Dime.Automapper\src\test" Presentation="<Tests>\<Dime.AutoMapper.Tests>" />
+</SessionState>
\ No newline at end of file
diff --git a/src/test/AutoMapperFactoryTests.cs b/src/test/AutoMapperFactoryTests.cs
index 04a4a7f..36ef020 100644
--- a/src/test/AutoMapperFactoryTests.cs
+++ b/src/test/AutoMapperFactoryTests.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoMapper;
+using AutoMapper;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Dime.AutoMapper.Tests
@@ -20,7 +19,7 @@ public AutoMapperFactoryTests()
[TestMethod]
[TestCategory("AutoMapper")]
public void TestAutoMapperFactoryScanning()
- {
+ {
IMapper mapper = AutoMapperFactory.Create();
mapper.ConfigurationProvider.AssertConfigurationIsValid();
}
diff --git a/src/test/Dime.AutoMapper.Tests.csproj b/src/test/Dime.AutoMapper.Tests.csproj
index c626294..c636d75 100644
--- a/src/test/Dime.AutoMapper.Tests.csproj
+++ b/src/test/Dime.AutoMapper.Tests.csproj
@@ -8,11 +8,7 @@
-<<<<<<< HEAD
netcoreapp2.2
-=======
- netcoreapp3.1
->>>>>>> 40b8a8dcff34680c771f73ac6a3933a6678957ec
portable
Dime.AutoMapper.Tests
Library
diff --git a/src/test/Mappers/Mapping.cs b/src/test/Mappers/Mapping.cs
index 7e2f0f0..f1da1fe 100644
--- a/src/test/Mappers/Mapping.cs
+++ b/src/test/Mappers/Mapping.cs
@@ -1,5 +1,5 @@
-using AutoMapper;
-using System;
+using System;
+using AutoMapper;
namespace Dime.AutoMapper.Tests.Models
{
diff --git a/src/test/Mappers/TestClassMapper.cs b/src/test/Mappers/TestClassMapper.cs
index 8d4705a..9b1f386 100644
--- a/src/test/Mappers/TestClassMapper.cs
+++ b/src/test/Mappers/TestClassMapper.cs
@@ -1,6 +1,6 @@
-using AutoMapper;
+using System;
+using AutoMapper;
using Dime.AutoMapper.Tests.Models;
-using System;
namespace Dime.AutoMapper.Tests.Mappers
{