Merge branch 'develop' into develop

vknet · Sep 11, 2023 · 74c5f35 · 74c5f35
2 parents 70fa469 + 9cda8b2
commit 74c5f35
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,26 +1,24 @@
 <Project>
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<EfCore>6.0.10</EfCore>
-		<AuditNet>18.1.6</AuditNet>
-		<CoreVersion>6.0.31101</CoreVersion>
-		<MsTestTool>17.4.0</MsTestTool>
+		<CoreVersion>6.0.31201</CoreVersion>
+		<MsTestTool>17.7.2</MsTestTool>
 		<WarningsAsErrors>CS1591;REO00038;REO00039;REO00040;REO00042;REO00043;REO00044;REO00051;REO00059;REO00060;REO00065</WarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Update="AsyncFixer" Version="1.6.0" PrivateAssets="all"/>
-		<PackageReference Update="HtmlAgilityPack" Version="1.11.50"/>
+		<PackageReference Update="HtmlAgilityPack" Version="1.11.53"/>
 		<PackageReference Update="Newtonsoft.Json" Version="13.0.3"/>
-		<PackageReference Update="SonarAnalyzer.CSharp" Version="9.6.0.74858" PrivateAssets="all"/>
+		<PackageReference Update="SonarAnalyzer.CSharp" Version="9.9.0.77355" PrivateAssets="all"/>
 		<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
 		<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
 		<PackageReference Update="System.Text.Encoding.CodePages" Version="7.0.0"/>
 
-		<PackageReference Update="FluentAssertions" Version="6.11.0"/>
-		<PackageReference Update="FluentAssertions.Analyzers" Version="0.21.0"/>
+		<PackageReference Update="FluentAssertions" Version="6.12.0"/>
+		<PackageReference Update="FluentAssertions.Analyzers" Version="0.24.0"/>
 		<PackageReference Update="Meziantou.FluentAssertionsAnalyzers" Version="1.0.10"/>
-		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.6.3"/>
-		<PackageReference Update="Moq" Version="4.18.4"/>
+		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MsTestTool)"/>
+		<PackageReference Update="Moq" Version="4.20.69"/>
 		<PackageReference Update="Moq.AutoMock" Version="3.5.0"/>
 		<PackageReference Update="xunit" Version="2.5.0"/>
 		<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0"/>

diff --git a/VkNet/Categories/MessagesCategory.cs b/VkNet/Categories/MessagesCategory.cs
@@ -740,7 +740,7 @@ public GetIntentUsersResult GetIntentUsers(MessagesGetIntentUsersParams getInten
 		});
 
 	/// <inheritdoc />
-	[Obsolete(ObsoleteText.MessageDeleteDialog)]
+	[Obsolete(ObsoleteText.MessageDeleteDialog, true)]
 	public ulong DeleteDialog(long? userId, long? peerId = null, uint? offset = null, uint? count = null) =>
 		DeleteConversation(userId, peerId);
 

diff --git a/VkNet/Model/RequestParams/Market/MarketProductParams.cs b/VkNet/Model/RequestParams/Market/MarketProductParams.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using VkNet.Abstractions;
@@ -120,7 +120,7 @@ public class MarketProductParams
 	/// а набор свойств должен быть уникален для каждого товара.
 	/// </summary>
 	[JsonProperty("variant_ids")]
-	public IEnumerable<long> VariantIds { get; set}
+	public IEnumerable<long> VariantIds { get; set; }
 
 	/// <summary>
 	/// Признак, является ли товар главным в своей группе.

diff --git a/VkNet/Utils/CountByIntervalAwaitableConstraint.cs b/VkNet/Utils/CountByIntervalAwaitableConstraint.cs
@@ -68,18 +68,18 @@ public async Task<IDisposable> WaitForReadinessAsync(CancellationToken cancellat
 		await _semaphore.WaitAsync(cancellationToken)
 			.ConfigureAwait(false);
 
-		if (DateTime.Now - _dateTime >= _timeSpan)
+		if (DateTime.UtcNow - _dateTime >= _timeSpan)
 		{
 			_left = _count;
-			_dateTime = DateTime.Now;
+			_dateTime = DateTime.UtcNow;
 		}
 
 		if (_left > 0)
 		{
 			_left--;
 		} else
 		{
-			var timeToWait = (int) Math.Ceiling((_timeSpan - (DateTime.Now - _dateTime)).TotalMilliseconds + 15);
+			var timeToWait = (int) Math.Ceiling((_timeSpan - (DateTime.UtcNow - _dateTime)).TotalMilliseconds + 15);
 
 			try
 			{
@@ -88,6 +88,7 @@ await Task.Delay(timeToWait, cancellationToken)
 			}
 			catch
 			{
+				// ignored
 			}
 
 			_left = _count - 1;

diff --git a/VkNet/VkNet.csproj b/VkNet/VkNet.csproj
@@ -56,6 +56,10 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Update="Reo.Core.Analyzers" Version="6.0.31201">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>