get rid of abstraction

ch1seL · ch1seL · commit f59fb410c86a · 2021-09-26T18:10:46.000+03:00
diff --git a/DistributedLock.sln b/DistributedLock.sln
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -2,15 +2,15 @@
 
     <PropertyGroup>
         <Authors>Alexander Salamatov</Authors>
-        <PackageProjectUrl>https://github.com/ch1seL/RedisLock</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/ch1seL/DistributedLock</PackageProjectUrl>
 
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
         <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/ch1seL/RedisLock</RepositoryUrl>
+        <RepositoryUrl>https://github.com/ch1seL/DistributedLock</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
 
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/src/ch1seL.DistributedLock.Abstraction/DistributedLockBadStatus.cs b/src/ch1seL.DistributedLock.Abstraction/DistributedLockBadStatus.cs
@@ -1,4 +1,4 @@
-﻿namespace Microsoft.Extensions.Caching.Distributed
+namespace Microsoft.Extensions.Caching.Distributed
 {
     /// <summary>
     ///     reused RedLockNet.RedLockStatus enum
diff --git a/src/ch1seL.DistributedLock.Abstraction/DistributedLockException.cs b/src/ch1seL.DistributedLock.Abstraction/DistributedLockException.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 
 namespace Microsoft.Extensions.Caching.Distributed
 {
diff --git a/src/ch1seL.DistributedLock.Abstraction/IDistributedLock.cs b/src/ch1seL.DistributedLock.Abstraction/IDistributedLock.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/src/ch1seL.DistributedLock.MemoryLock/ch1seL.DistributedLock.MemoryLock.csproj b/src/ch1seL.DistributedLock.MemoryLock/ch1seL.DistributedLock.MemoryLock.csproj
@@ -6,8 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ch1seL.DistributedLock.Abstraction" Version="0.1.2" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\ch1seL.DistributedLock.Abstraction\ch1seL.DistributedLock.Abstraction.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/ch1seL.DistributedLock.RedisLock/ch1seL.DistributedLock.RedisLock.csproj b/src/ch1seL.DistributedLock.RedisLock/ch1seL.DistributedLock.RedisLock.csproj
@@ -6,8 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ch1seL.DistributedLock.Abstraction" Version="0.1.2"/>
         <PackageReference Include="RedLock.net" Version="2.2.0"/>
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\ch1seL.DistributedLock.Abstraction\ch1seL.DistributedLock.Abstraction.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/tests/ch1seL.DistributedLock.Tests/SharedTests/ThrowDistributedLockIntervalExceptionIfWaitTimeHasExpiredTests.cs b/tests/ch1seL.DistributedLock.Tests/SharedTests/ThrowDistributedLockIntervalExceptionIfWaitTimeHasExpiredTests.cs
@@ -20,7 +20,7 @@ public async Task Test(Type lockServiceType)
             Func<Task> act = () => Task.WhenAll(TaskList);
 
             var exception = await act.Should().ThrowExactlyAsync<DistributedLockException>();
-            exception.Which.Status.Should().Be(DistributedLockBadStatus.Conflicted);
+            exception.Which.Data["Status"].Should().Be(DistributedLockBadStatus.Conflicted);
             Intervals.Should().HaveCount(1);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Microsoft.Extensions.Caching.Distributed`
	`1`	`+namespace Microsoft.Extensions.Caching.Distributed`
`2`	`2`	`{`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// reused RedLockNet.RedLockStatus enum`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`
`3`	`3`	`namespace Microsoft.Extensions.Caching.Distributed`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public async Task Test(Type lockServiceType)`
`20`	`20`	`Func<Task> act = () => Task.WhenAll(TaskList);`
`21`	`21`
`22`	`22`	`var exception = await act.Should().ThrowExactlyAsync<DistributedLockException>();`
`23`		`- exception.Which.Status.Should().Be(DistributedLockBadStatus.Conflicted);`
	`23`	`+ exception.Which.Data["Status"].Should().Be(DistributedLockBadStatus.Conflicted);`
`24`	`24`	`Intervals.Should().HaveCount(1);`
`25`	`25`	`}`
`26`	`26`	`}`