Merge branch 'develop2'

yar229 · Nov 3, 2017 · b88b571 · b88b571
2 parents 9094fe4 + 20bd40b
commit b88b571
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/NWebDav/NWebDav.Server/Handlers/PropFindHandler.cs b/NWebDav/NWebDav.Server/Handlers/PropFindHandler.cs
@@ -157,10 +157,6 @@ public async Task<bool> HandleRequestAsync(IHttpContext httpContext, IStore stor
                         {
                             foreach (var propertyName in propertyList)
                                 await AddPropertyAsync(httpContext, xResponse, xProp, propertyManager, entry.Entry, propertyName, addedProperties).ConfigureAwait(false);
-
-                            //TODO: dirty fix!
-                            // some clients reqire collection property
-                            await AddPropertyAsync(httpContext, xResponse, xProp, propertyManager, entry.Entry, "collection", addedProperties).ConfigureAwait(false);
                         }
 
                         // Add the values (if any)

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -11,8 +11,8 @@
     <Copyright>[email protected]</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.8.0.0</AssemblyVersion>
-    <FileVersion>1.8.0.0</FileVersion>
+    <AssemblyVersion>1.8.0.1</AssemblyVersion>
+    <FileVersion>1.8.0.1</FileVersion>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.CloudMailRu.Console</RootNamespace>
     <StartupObject></StartupObject>

diff --git a/WDMRC.Console/WDMRC.Console.netcoreapp.publish.csproj b/WDMRC.Console/WDMRC.Console.netcoreapp.publish.csproj
@@ -11,8 +11,8 @@
     <Copyright>[email protected]</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.7.0.5</AssemblyVersion>
-    <FileVersion>1.7.0.5</FileVersion>
+    <AssemblyVersion>1.8.0.1</AssemblyVersion>
+    <FileVersion>1.8.0.1</FileVersion>
     <AssemblyName>wdmrc</AssemblyName>
   </PropertyGroup>