From 30c7be4e8fd3d4f5ae34d56891ff655fa87498f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BD=D1=8E=D1=82=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=20=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Mon, 11 Sep 2023 22:49:21 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VkNet/Model/RequestParams/Market/MarketProductParams.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VkNet/Model/RequestParams/Market/MarketProductParams.cs b/VkNet/Model/RequestParams/Market/MarketProductParams.cs index 613bf1eb7..44265d41f 100644 --- 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 /// а набор свойств должен быть уникален для каждого товара. /// [JsonProperty("variant_ids")] - public IEnumerable VariantIds { get; set} + public IEnumerable VariantIds { get; set; } /// /// Признак, является ли товар главным в своей группе. From 62e71c0b4f7cef8e2943f98156acd7d18ad0ee48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BD=D1=8E=D1=82=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=20=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Mon, 11 Sep 2023 22:49:31 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.targets | 18 ++++++++---------- VkNet/VkNet.csproj | 4 ++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 7b34002df..d169ca410 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,26 +1,24 @@  latest - 6.0.10 - 18.1.6 - 6.0.31101 - 17.4.0 + 6.0.31201 + 17.7.2 CS1591;REO00038;REO00039;REO00040;REO00042;REO00043;REO00044;REO00051;REO00059;REO00060;REO00065 - + - + - - + + - - + + diff --git a/VkNet/VkNet.csproj b/VkNet/VkNet.csproj index 80e7c54c1..c508ff2d2 100644 --- a/VkNet/VkNet.csproj +++ b/VkNet/VkNet.csproj @@ -56,6 +56,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From 9cda8b2c0da3bd897fb73c0fa00f498cb1b9cb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BD=D1=8E=D1=82=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=20=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Mon, 11 Sep 2023 22:49:53 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VkNet/Categories/MessagesCategory.cs | 2 +- VkNet/Utils/CountByIntervalAwaitableConstraint.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/VkNet/Categories/MessagesCategory.cs b/VkNet/Categories/MessagesCategory.cs index 9a493cb5c..f35f614de 100644 --- a/VkNet/Categories/MessagesCategory.cs +++ b/VkNet/Categories/MessagesCategory.cs @@ -740,7 +740,7 @@ public GetIntentUsersResult GetIntentUsers(MessagesGetIntentUsersParams getInten }); /// - [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/Utils/CountByIntervalAwaitableConstraint.cs b/VkNet/Utils/CountByIntervalAwaitableConstraint.cs index cfd6712a5..99166069b 100644 --- a/VkNet/Utils/CountByIntervalAwaitableConstraint.cs +++ b/VkNet/Utils/CountByIntervalAwaitableConstraint.cs @@ -68,10 +68,10 @@ public async Task 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) @@ -79,7 +79,7 @@ await _semaphore.WaitAsync(cancellationToken) _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;