net 6: update packages

ONLYOFFICE · Nov 25, 2021 · fde636c · fde636c
1 parent 58d8491
commit fde636c
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/.nuget/packages/AppLimit.CloudComputing.SharpBox.1.2.0.1.nupkg b/.nuget/packages/AppLimit.CloudComputing.SharpBox.1.2.0.1.nupkg
diff --git a/.nuget/packages/AppLimit.CloudComputing.SharpBox.1.2.0.nupkg b/.nuget/packages/AppLimit.CloudComputing.SharpBox.1.2.0.nupkg
diff --git a/common/ASC.Data.Storage/ASC.Data.Storage.csproj b/common/ASC.Data.Storage/ASC.Data.Storage.csproj
@@ -42,7 +42,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="openstack.net" Version="1.7.9" />
+    <PackageReference Include="openstack.net" Version="1.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/products/ASC.Files/Core/ASC.Files.Core.csproj b/products/ASC.Files/Core/ASC.Files.Core.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.2.0" />
+    <PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.2.0.1" />
     <PackageReference Include="Box.V2.Core" Version="3.24.0" />
     <PackageReference Include="DocuSign.eSign.dll" Version="4.4.1" />
     <PackageReference Include="Dropbox.Api" Version="4.10.0" />

diff --git a/products/ASC.Files/Tests/ASC.Files.Tests.csproj b/products/ASC.Files/Tests/ASC.Files.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.2.0" />
+    <PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.2.0.1" />
     <PackageReference Include="Autofac" Version="6.0.0" />
     <PackageReference Include="Autofac.Configuration" Version="6.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />

diff --git a/thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj b/thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj
@@ -11,10 +11,10 @@
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <WarningsAsErrors></WarningsAsErrors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.2.0.0</Version>
+    <Version>1.2.0.1</Version>
     <PackageLicenseExpression></PackageLicenseExpression>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
+    <AssemblyVersion>1.2.0.1</AssemblyVersion>
+    <FileVersion>1.2.0.1</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>

diff --git a/thirdparty/AppLimit.CloudComputing.SharpBox/Common/Cache/CachedDictionary.cs b/thirdparty/AppLimit.CloudComputing.SharpBox/Common/Cache/CachedDictionary.cs
@@ -1,4 +1,4 @@
-#if NET6_0
+#if NET6_0_OR_GREATER
 using System;
 using System.Diagnostics;
 

diff --git a/thirdparty/AppLimit.CloudComputing.SharpBox/Common/Net/Web/Dav/DavService.cs b/thirdparty/AppLimit.CloudComputing.SharpBox/Common/Net/Web/Dav/DavService.cs
@@ -50,7 +50,10 @@ public WebRequest CreateWebRequestPUT(string url, ICredentials credentials, bool
 
             // set the content type
             request.ContentType = "application/octet-stream";
-#if NET5_0
+
+            // bug 53196
+            request.ServicePoint.Expect100Continue = true;
+#if NET6_0_OR_GREATER
             request.Headers.Add("Expect", "100-continue");
 #endif
             // go ahead

diff --git a/thirdparty/AppLimit.CloudComputing.SharpBox/StorageProvider/GenericStorageProviderService.cs b/thirdparty/AppLimit.CloudComputing.SharpBox/StorageProvider/GenericStorageProviderService.cs
@@ -146,7 +146,7 @@ public virtual ICloudStorageAccessToken LoadToken(Dictionary<string, string> tok
         public virtual string GetResourceUrl(IStorageProviderSession session, ICloudFileSystemEntry fileSystemEntry, string additionalPath)
         {
             additionalPath = !string.IsNullOrEmpty(additionalPath) ? additionalPath.Trim('/') : string.Empty;
-            var url = session.ServiceConfiguration.ServiceLocator.ToString().Trim('/');
+            var url = session.ServiceConfiguration.ServiceLocator.AbsoluteUri.Trim('/');
             var entryPath = fileSystemEntry != null ? GenericHelper.GetResourcePath(fileSystemEntry).Trim('/') : string.Empty;
             if (!string.IsNullOrEmpty(entryPath))
             {

diff --git a/...arty/AppLimit.CloudComputing.SharpBox/StorageProvider/WebDav/Logic/WebDavRequestParser.cs b/...arty/AppLimit.CloudComputing.SharpBox/StorageProvider/WebDav/Logic/WebDavRequestParser.cs
@@ -34,7 +34,7 @@ public static WebDavRequestResult CreateObjectsFromNetworkStream(Stream data, st
             var config = session.ServiceConfiguration as WebDavConfiguration;
             var results = new WebDavRequestResult();
 
-            var queryLessUri = HttpUtilityEx.GetPathAndQueryLessUri(config.ServiceLocator).ToString().TrimEnd('/');
+            var queryLessUri = HttpUtilityEx.GetPathAndQueryLessUri(config.ServiceLocator).AbsoluteUri.TrimEnd('/');
             var decodedTargetUrl = HttpUtility.UrlDecode(targetUrl);
             string s;
             using (var streamReader = new StreamReader(data))
@@ -93,10 +93,10 @@ public static WebDavRequestResult CreateObjectsFromNetworkStream(Stream data, st
 
                 string nameBaseForSelfCheck;
 
-                if (nameBase.StartsWith(config.ServiceLocator.ToString()))
+                if (nameBase.StartsWith(config.ServiceLocator.AbsoluteUri))
                 {
                     nameBaseForSelfCheck = HttpUtility.UrlDecode(nameBase);
-                    nameBase = nameBase.Remove(0, config.ServiceLocator.ToString().Length);
+                    nameBase = nameBase.Remove(0, config.ServiceLocator.AbsoluteUri.Length);
                 }
                 else
                 {