Merge branch 'edi-api-client-use-vostok-cluster-client'

skbkontur · May 24, 2021 · a7ddef6 · a7ddef6
2 parents 9689937 + 5043a9c
commit a7ddef6
Show file tree

Hide file tree

Showing 22 changed files with 649 additions and 817 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # История изменений
 
+## v1.8.1 - 2021.05.11
+- EdiApiClient переведен на ClusterClient
+- Добавлены конструкторы для работы через Singular в классы `TransformerConnectorEdiApiClient`, `InternalEdiApiHttpClient` и `MessagesEdiApiHttpClient`.
+
 ## v1.7.10 - 2020.04.02
 - Добавлен параметр `enableKeepAlive` в конструктор классов `TransformerConnectorEdiApiClient`, `InternalEdiApiHttpClient` и `MessagesEdiApiHttpClient`.
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.194" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/EdiApi.Client/Annotations.cs b/EdiApi.Client/Annotations.cs
diff --git a/EdiApi.Client/EdiApi.Client.csproj b/EdiApi.Client/EdiApi.Client.csproj
@@ -2,12 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <AssemblyName>SkbKontur.EdiApi.Client</AssemblyName>
     <RootNamespace>$(AssemblyName)</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Vostok.ClusterClient.Core" Version="0.1.26" />
+    <PackageReference Include="Vostok.ClusterClient.Singular" Version="0.1.11" />
+    <PackageReference Include="Vostok.ClusterClient.Tracing" Version="0.1.4" />
+    <PackageReference Include="Vostok.ClusterClient.Transport" Version="0.1.17" />
   </ItemGroup>
 
 </Project>
diff --git a/EdiApi.Client/Http/AuthCredentials.cs b/EdiApi.Client/Http/AuthCredentials.cs
@@ -0,0 +1,9 @@
+namespace SkbKontur.EdiApi.Client.Http
+{
+    public class AuthCredentials
+    {
+        public string PortalSid { get; set; }
+        public string Login { get; set; }
+        public string Password { get; set; }
+    }
+}