Permalink
Browse files

RavenDB-4075 after merge fixes

  • Loading branch information...
1 parent 6a91680 commit 69115dee5ed116c7b90e5ae84436854d24af00be @ppekrol ppekrol committed Dec 9, 2015
Showing with 645 additions and 862 deletions.
  1. +0 −10 Bundles/Raven.Bundles.Authorization/Raven.Bundles.Authorization.csproj
  2. +0 −10 Bundles/Raven.Bundles.CascadeDelete/Raven.Bundles.CascadeDelete.csproj
  3. +0 −10 Bundles/Raven.Bundles.Tryouts/Raven.Bundles.Tryouts.csproj
  4. +0 −8 Bundles/Raven.Bundles.UniqueConstraints/Raven.Bundles.UniqueConstraints.csproj
  5. +0 −5 Bundles/Raven.Client.Authorization/Raven.Client.Authorization.csproj
  6. +3 −3 Bundles/Raven.Client.Authorization/project.json
  7. +0 −1 Bundles/Raven.Client.UniqueConstraints/Raven.Client.UniqueConstraints.csproj
  8. +3 −3 Bundles/Raven.Client.UniqueConstraints/project.json
  9. +3 −16 Rachis/Rachis.Tests/Rachis.Tests.csproj
  10. +0 −14 Rachis/Rachis/Rachis.csproj
  11. +0 −7 Raven.Abstractions/Data/UserPermission.cs
  12. +2 −0 Raven.Abstractions/Logging/LogContext.cs
  13. +5 −1 Raven.Abstractions/Logging/LoggerExecutionWrapper.cs
  14. +2 −0 Raven.Abstractions/MEF/OrderedPartCollection.cs
  15. +2 −41 Raven.Abstractions/Raven.Abstractions.csproj
  16. +1 −0 Raven.Abstractions/Raven.Abstractions.project.json
  17. +4 −4 Raven.Abstractions/Smuggler/SmugglerDatabaseApiBase.cs
  18. +1 −5 Raven.Abstractions/Smuggler/SmugglerJsonTextWriter.cs
  19. +146 −142 Raven.Abstractions/Streaming/ExcelOutputWriter.cs
  20. +2 −0 Raven.Abstractions/Threading/ThreadLocal.cs
  21. +19 −15 Raven.Abstractions/Util/EnvironmentUtils.cs
  22. +3 −6 Raven.Abstractions/Util/MalformedLineException.cs
  23. +2 −0 Raven.Abstractions/Util/NetworkUtil.cs
  24. +12 −5 Raven.Abstractions/Util/RavenTextFieldParser.cs
  25. +2 −2 Raven.Abstractions/project.json
  26. +0 −1 Raven.Backup/Raven.Backup.csproj
  27. +1 −1 Raven.Client.Lightweight/Changes/RemoteChangesClientBase.cs
  28. +1 −1 Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
  29. +6 −0 Raven.Client.Lightweight/Connection/HttpConnectionHelper.cs
  30. +27 −36 Raven.Client.Lightweight/Connection/Implementation/HttpJsonRequest.cs
  31. +0 −1 Raven.Client.Lightweight/Connection/Implementation/HttpJsonRequestFactory.cs
  32. +2 −2 Raven.Client.Lightweight/Connection/ReplicationInformerBase.cs
  33. +13 −9 Raven.Client.Lightweight/Connection/ReplicationInformerLocalCache.cs
  34. +2 −1 Raven.Client.Lightweight/Connection/Request/ReplicationAwareRequestExecuter.cs
  35. +5 −5 Raven.Client.Lightweight/Counters/Changes/CountersChangesClient.cs
  36. +269 −261 Raven.Client.Lightweight/Counters/CounterStore.Stream.cs
  37. +1 −1 Raven.Client.Lightweight/Counters/Operations/CountersBatchOperation.cs
  38. +6 −1 Raven.Client.Lightweight/Counters/Replication/CounterReplicationInformer.cs
  39. +1 −1 Raven.Client.Lightweight/Document/ReflectionUtil.cs
  40. +1 −1 Raven.Client.Lightweight/FileSystem/Changes/FilesChangesClient.cs
  41. +1 −1 Raven.Client.Lightweight/Indexes/AbstractMultiMapIndexCreationTask.cs
  42. +5 −5 Raven.Client.Lightweight/Indexes/ExpressionStringBuilder.cs
  43. +8 −0 Raven.Client.Lightweight/Metrics/VolatileDouble.cs
  44. +1 −40 Raven.Client.Lightweight/Raven.Client.Lightweight.csproj
  45. +2 −2 Raven.Client.Lightweight/TimeSeries/Changes/TimeSeriesChangesClient.cs
  46. +1 −1 Raven.Client.Lightweight/TimeSeries/Operations/TimeSeriesBatchOperation.cs
  47. +6 −1 Raven.Client.Lightweight/TimeSeries/Replication/TimeSeriesReplicationInformer.cs
  48. +0 −1 Raven.Client.Lightweight/Util/SimpleCache.cs
  49. +3 −3 Raven.Client.Lightweight/project.json
  50. +0 −10 Raven.Client.MvcIntegration/Raven.Client.MvcIntegration.csproj
  51. +0 −2 Raven.Database/Raven.Database.csproj
  52. +2 −2 Raven.Database/Smuggler/SmugglerDatabaseApi.cs
  53. +0 −7 Raven.Monitor/Raven.Monitor.csproj
  54. +0 −10 Raven.Performance/Raven.Performance.csproj
  55. +0 −2 Raven.Server/Raven.Server.csproj
  56. +18 −7 Raven.Smuggler/Raven.Smuggler.csproj
  57. +0 −9 Raven.Sparrow/Sparrow/Sparrow.csproj
  58. +1 −1 Raven.Sparrow/Sparrow/project.json
  59. +0 −10 Raven.Studio.Html5/Raven.Studio.Html5.csproj
  60. +28 −16 Raven.Tests.Core/BulkInsert/SimpleBulkInsert.cs
  61. +0 −9 Raven.Tests.Core/Raven.Tests.Core.csproj
  62. +2 −2 Raven.Tests.Core/project.json
  63. +0 −14 Raven.Tests.Counters/Raven.Tests.Counters.csproj
  64. +5 −3 Raven.Tests.FileSystem/Storage/FileTests.cs
  65. +0 −14 Raven.Tests.Raft/Raven.Tests.Raft.csproj
  66. +0 −14 Raven.Tests.TimeSeries/Raven.Tests.TimeSeries.csproj
  67. +0 −10 Raven.Tests/Raven.Tests.csproj
  68. +1 −11 Raven.Tests/Smuggler/SmugglerExecutionTests.cs
  69. +2 −0 Raven.Tryouts/BulkInsertsPerformance.cs
  70. +2 −0 Raven.Tryouts/CompressionPerformance.cs
  71. +0 −11 Raven.Tryouts/Raven.Tryouts.csproj
  72. +4 −4 Raven.Tryouts/project.json
  73. +0 −1 Raven.Web/Raven.Web.csproj
  74. +2 −5 RavenDB.sln
  75. +4 −4 default.ps1
@@ -117,15 +117,5 @@
<Analyzer Include="..\..\SharedLibs\Raven.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!-- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="'$(TasksTargetsImported)' == ''" /> -->
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
<Import Project="..\..\Imports\Tasks.targets" Condition="'$(TasksTargetsImported)' == ''" />
</Project>
@@ -92,15 +92,5 @@
<Analyzer Include="..\..\SharedLibs\Raven.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!-- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="'$(TasksTargetsImported)' == ''" /> -->
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
<Import Project="..\..\Imports\Tasks.targets" Condition="'$(TasksTargetsImported)' == ''" />
</Project>
@@ -59,14 +59,4 @@
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-<!-- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" />-->
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
</Project>
@@ -89,13 +89,5 @@
<Analyzer Include="..\..\SharedLibs\Raven.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
<Import Project="..\..\Imports\Tasks.targets" Condition="'$(TasksTargetsImported)' == ''" />
</Project>
@@ -113,11 +113,6 @@
<Analyzer Include="..\..\SharedLibs\Raven.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!---<Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="'$(TasksTargetsImported)' == ''" />-->
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Target Name="AfterBuild">
- </Target>
<Import Project="..\..\Imports\Fody\Fody.targets" Condition="$(Configuration) == 'Release'" />
<Import Project="..\..\Imports\Tasks.targets" Condition="'$(TasksTargetsImported)' == ''" />
</Project>
@@ -1,5 +1,5 @@
{
- "version": "3.0.0",
+ "version": "3.5.0",
"compile": [
"**/*.cs",
"../Raven.Bundles.Authorization/Model/*.cs",
@@ -13,7 +13,7 @@
}
},
"dependencies": {
- "Raven.Abstractions": "3.0.0",
- "Raven.Client.Lightweight": "3.0.0"
+ "Raven.Abstractions": "3.5.0",
+ "Raven.Client.Lightweight": "3.5.0"
}
}
@@ -101,7 +101,6 @@
<Analyzer Include="..\..\SharedLibs\Raven.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(TasksTargetsImported)' == ''" />
<Target Name="AfterBuild">
</Target>
<Import Project="..\..\Imports\Fody\Fody.targets" Condition="$(Configuration) == 'Release'" />
@@ -1,5 +1,5 @@
{
- "version": "3.0.0",
+ "version": "3.5.0",
"compile": [
"**/*.cs",
"../Raven.Bundles.UniqueConstraints/Constants.cs",
@@ -13,7 +13,7 @@
}
},
"dependencies": {
- "Raven.Abstractions": "3.0.0",
- "Raven.Client.Lightweight": "3.0.0"
+ "Raven.Abstractions": "3.5.0",
+ "Raven.Client.Lightweight": "3.5.0"
}
}
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -71,6 +71,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
+ <Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
@@ -155,18 +156,4 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
+</Project>
@@ -130,18 +130,4 @@
<Analyzer Include="..\..\SharedLibs\Raven.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
</Project>
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.AccessControl;
-using System.Text;
-using System.Threading.Tasks;
-
namespace Raven.Abstractions.Data
{
public class UserPermission
@@ -1,3 +1,4 @@
+#if !DNXCORE50
//-----------------------------------------------------------------------
// <copyright file="CurrentOperationContext.cs" company="Hibernating Rhinos LTD">
// Copyright (c) Hibernating Rhinos LTD. All rights reserved.
@@ -56,3 +57,4 @@ public static string ResourceName
}
}
}
+#endif
@@ -79,9 +79,13 @@ public void Log(LogLevel logLevel, Func<string> messageFunc)
// nothing to be done here
return;
}
+#if !DNXCORE50
string databaseName = LogContext.ResourceName;
if (string.IsNullOrWhiteSpace(databaseName))
databaseName = Constants.SystemDatabase;
+#else
+ var databaseName = Constants.SystemDatabase;
+#endif
foreach (var target in targets)
{
@@ -131,6 +135,6 @@ public bool ShouldLog(LogLevel logLevel)
return logger.ShouldLog(logLevel);
}
- #endregion
+#endregion
}
}
@@ -1,3 +1,4 @@
+#if !DNXCORE50
using System;
using System.Collections;
using System.Collections.Generic;
@@ -120,3 +121,4 @@ public void Apply(Action<T> action)
}
}
+#endif
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CopyNuGetImplementations>true</CopyNuGetImplementations>
@@ -67,34 +66,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ICSharpCode.NRefactory, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
- <HintPath>..\packages\ICSharpCode.NRefactory.5.3.0\lib\Net40\ICSharpCode.NRefactory.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="ICSharpCode.NRefactory.CSharp, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
- <HintPath>..\packages\ICSharpCode.NRefactory.5.3.0\lib\Net40\ICSharpCode.NRefactory.CSharp.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="ICSharpCode.NRefactory.Xml, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
- <HintPath>..\packages\ICSharpCode.NRefactory.5.3.0\lib\Net40\ICSharpCode.NRefactory.Xml.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
- <Private>True</Private>
- </Reference>
+ <Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
@@ -259,7 +231,6 @@
<Compile Include="Data\PatchResult.cs" />
<Compile Include="Data\PutResult.cs" />
<Compile Include="Data\IndexingError.cs" />
- <Compile Include="Data\SimulateSqlReplicationResult.cs" />
<Compile Include="Data\SortedField.cs" />
<Compile Include="Data\SpatialIndexQuery.cs" />
<Compile Include="Data\StopWordsSetup.cs" />
@@ -489,6 +460,7 @@
<Compile Include="Util\AtomicDictionary.cs" />
<Compile Include="Util\Base62Util.cs" />
<Compile Include="Util\ConfigurationManager.cs" />
+ <Compile Include="Util\EnvironmentUtils.cs" />
<Compile Include="Util\Streams\BufferPoolMemoryStream.cs" />
<Compile Include="Util\ComparableByteArray.cs" />
<Compile Include="Util\CompletedTask.cs" />
@@ -521,7 +493,6 @@
<Compile Include="Util\Streams\Substream.cs" />
<Compile Include="Util\RavenTextFieldParser.cs" />
<Compile Include="Util\MalformedLineException.cs" />
- <Compile Include="Util\EnvironmentUtils.cs" />
<Compile Include="Threading\ThreadLocal.cs" />
<Compile Include="Util\UndisposableStream.cs" />
</ItemGroup>
@@ -533,7 +504,6 @@
<Link>RavenDB.snk</Link>
</None>
<None Include="app.config" />
- <None Include="packages.config" />
<None Include="Raven.Abstractions.project.json" />
</ItemGroup>
<ItemGroup>
@@ -546,15 +516,6 @@
<Content Include="FodyWeavers.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="'$(TasksTargetsImported)' == ''" />
- <!-- <Import Project="$(MSBuildProjectDirectory)\..\Tools\StyleCop\StyleCop.Targets" /> -->
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
<Import Project="..\Imports\Fody\Fody.targets" Condition="$(Configuration) == 'Release'" />
<Import Project="..\Imports\Tasks.targets" Condition="'$(TasksTargetsImported)' == ''" />
<ItemGroup>
@@ -3,6 +3,7 @@
"net45": {
"dependencies": {
"ICSharpCode.NRefactory": "5.3.0",
+ "Mono.Cecil": "0.9.6.1",
"Microsoft.Net.Http": "2.2.29"
},
"frameworkAssemblies": {
@@ -148,7 +148,7 @@ protected bool IgnoreErrorsAndContinue
{
result.LastDocsEtag = await ExportDocuments(exportOptions.From, jsonWriter,
result.LastDocsEtag,
- updateLastDocDeleteEtag: () => lastDocDeleteEtag = Operations.FetchLastDocDeleteEtag());
+ updateLastDocDeleteEtag: () => lastDocDeleteEtag = Operations.FetchLastDocDeleteEtag()).ConfigureAwait(false);
}
catch (SmugglerExportException e)
{
@@ -168,7 +168,7 @@ protected bool IgnoreErrorsAndContinue
{
result.LastAttachmentsEtag = await ExportAttachments(exportOptions.From, jsonWriter,
result.LastAttachmentsEtag,
- updateLastAttachmentsDeleteEtag: () => lastAttachmentsDeleteEtag = Operations.FetchLastAttachmentsDeleteEtag());
+ updateLastAttachmentsDeleteEtag: () => lastAttachmentsDeleteEtag = Operations.FetchLastAttachmentsDeleteEtag()).ConfigureAwait(false);
}
catch (SmugglerExportException e)
{
@@ -194,7 +194,7 @@ protected bool IgnoreErrorsAndContinue
LastDocDeleteEtag = lastDocDeleteEtag,
LastAttachmentsDeleteEtag = lastAttachmentsDeleteEtag
};
- await ExportDeletions(jsonWriter, result, maxEtagsToFetch);
+ await ExportDeletions(jsonWriter, result, maxEtagsToFetch).ConfigureAwait(false);
}
await ExportIdentities(jsonWriter, Options.OperateOnTypes).ConfigureAwait(false);
@@ -440,7 +440,7 @@ public static void WriteLastEtagsToFile(OperationState result, string backupPath
if (Options.ExportDeletions && updateLastAttachmentsDeleteEtag != null)
updateLastAttachmentsDeleteEtag();
- attachments = await Operations.GetAttachments(totalCount, lastEtag, maxRecords);
+ attachments = await Operations.GetAttachments(totalCount, lastEtag, maxRecords).ConfigureAwait(false);
}
catch (Exception e)
{
@@ -1,14 +1,10 @@
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.IO;
using System.IO.Compression;
-using System.Runtime.CompilerServices;
-using System.Text;
+
using Raven.Abstractions.Connection;
-using Raven.Abstractions.Exceptions;
using Raven.Imports.Newtonsoft.Json;
-using Raven.Imports.Newtonsoft.Json.Utilities;
using Raven.Json.Linq;
namespace Raven.Abstractions.Smuggler
Oops, something went wrong.

0 comments on commit 69115de

Please sign in to comment.