Merge branch 'develop2' into master

yar229 · Jan 17, 2021 · 668649a · 668649a
2 parents 02d2da8 + c33d894
commit 668649a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/Hasher/Hasher.csproj b/Hasher/Hasher.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MailRuCloud/MailRuCloudApi/Base/Repos/MailRuCloud/WebBin/WebBinRequestRepo.cs b/MailRuCloud/MailRuCloudApi/Base/Repos/MailRuCloud/WebBin/WebBinRequestRepo.cs
@@ -51,6 +51,9 @@ public WebBinRequestRepo(IWebProxy proxy, IBasicCredentials creds, AuthCodeRequi
 
 			ServicePointManager.DefaultConnectionLimit = int.MaxValue;
 
+            // required for Windows 7 breaking connection
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12;
+
             HttpSettings.Proxy = proxy;
             Authent = new OAuth(HttpSettings, creds, onAuthCodeRequired);
         }

diff --git a/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj b/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj
@@ -7,8 +7,8 @@
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
     <RootNamespace>YaR.Clouds</RootNamespace>
     <AssemblyName>YaR.Clouds</AssemblyName>
-    <AssemblyVersion>1.13.1.1</AssemblyVersion>
-    <FileVersion>1.13.1.1</FileVersion>
+    <AssemblyVersion>1.13.1.2</AssemblyVersion>
+    <FileVersion>1.13.1.2</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="log4net" Version="2.0.12" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

diff --git a/WDMRC.Console/Payload.cs b/WDMRC.Console/Payload.cs
@@ -192,12 +192,18 @@ private static string GetAssemblyAttribute<T>(Func<T, string> value) where T : A
 
         private static string GetFrameworkDescription()
         {
-            // detect .NET Core
+            // detect .NET Core & .NET 5
             var assembly = typeof(System.Runtime.GCSettings).GetTypeInfo().Assembly;
             var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
             int netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
             if (netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2)
-                return ".NET Core " + assemblyPath[netCoreAppIndex + 1];
+            {
+                bool parsed = Version.TryParse(assemblyPath[netCoreAppIndex + 1], out var version);
+
+                return (parsed && version.Major >= 5
+                    ? ".NET "
+                    : ".NET Core ") + assemblyPath[netCoreAppIndex + 1];
+            }
 
             // detect .NET Mono
             Type type = Type.GetType("Mono.Runtime");

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -15,8 +15,8 @@
     <Copyright>yar229@yandex.ru</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.13.1.1</AssemblyVersion>
-    <FileVersion>1.13.1.1</FileVersion>
+    <AssemblyVersion>1.13.1.2</AssemblyVersion>
+    <FileVersion>1.13.1.2</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.Clouds.Console</RootNamespace>
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
     <PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" /> 
   </ItemGroup>
 

diff --git a/WebDAV.Uploader/WDMRC.Console.Client.csproj b/WebDAV.Uploader/WDMRC.Console.Client.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WebDavMailRuCloudStore/WebDavStore.csproj b/WebDavMailRuCloudStore/WebDavStore.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="log4net" Version="2.0.12" />
   </ItemGroup>
 
   <ItemGroup>