Merge remote-tracking branch 'refs/remotes/akkadotnet/dev' into dev
This commit is contained in:
Thomas Tomanek
Коммит
6146f090b4
|
|
@ -1,4 +1,11 @@
|
|||
#### 1.0.5 August 08 2015 ####
|
||||
#### 1.0.7 Feb 08 2016 ####
|
||||
Place holder for next version.
|
||||
|
||||
#### 1.0.6 Feb 08 2016 ####
|
||||
Upgrades to Akka.NET v1.0.6 internally.
|
||||
|
||||
#### 1.0.5 Dec 14 2015 ####
|
||||
Upgrades to Akka.NET v1.0.5 internally.
|
||||
|
||||
#### 1.0.4 August 07 2015 ####
|
||||
|
||||
|
|
|
|||
|
|
@ -35,23 +35,29 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Akka">
|
||||
<HintPath>..\Packages\Akka.1.0.4\lib\net45\Akka.dll</HintPath>
|
||||
<Reference Include="Akka, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.1.0.6\lib\net45\Akka.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.Persistence">
|
||||
<HintPath>..\Packages\Akka.Persistence.1.0.4.12-beta\lib\net45\Akka.Persistence.dll</HintPath>
|
||||
<Reference Include="Akka.Persistence, Version=1.0.6.17, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.Persistence.1.0.6.17-beta\lib\net45\Akka.Persistence.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.Persistence.TestKit">
|
||||
<HintPath>..\Packages\Akka.Persistence.TestKit.1.0.4.12-beta\lib\net45\Akka.Persistence.TestKit.dll</HintPath>
|
||||
<Reference Include="Akka.Persistence.TestKit, Version=1.0.6.17, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.Persistence.TestKit.1.0.6.17-beta\lib\net45\Akka.Persistence.TestKit.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.TestKit">
|
||||
<HintPath>..\Packages\Akka.TestKit.1.0.4\lib\net45\Akka.TestKit.dll</HintPath>
|
||||
<Reference Include="Akka.TestKit, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.TestKit.1.0.6\lib\net45\Akka.TestKit.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.TestKit.Xunit2">
|
||||
<HintPath>..\Packages\Akka.TestKit.Xunit2.1.0.4\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
|
||||
<Reference Include="Akka.TestKit.Xunit2, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.TestKit.Xunit2.1.0.6\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Cassandra">
|
||||
<HintPath>..\packages\CassandraCSharpDriver.2.5.2\lib\net40\Cassandra.dll</HintPath>
|
||||
<Reference Include="Cassandra, Version=2.7.0.0, Culture=neutral, PublicKeyToken=10b231fbfc8c4b4d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CassandraCSharpDriver.2.7.3\lib\net40\Cassandra.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Google.ProtocolBuffers">
|
||||
<HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Akka" version="1.0.4" targetFramework="net45" />
|
||||
<package id="Akka.Persistence" version="1.0.4.12-beta" targetFramework="net45" />
|
||||
<package id="Akka.Persistence.TestKit" version="1.0.4.12-beta" targetFramework="net45" />
|
||||
<package id="Akka.TestKit" version="1.0.4" targetFramework="net45" />
|
||||
<package id="Akka.TestKit.Xunit2" version="1.0.4" targetFramework="net45" />
|
||||
<package id="CassandraCSharpDriver" version="2.5.2" targetFramework="net45" />
|
||||
<package id="Akka" version="1.0.6" targetFramework="net45" />
|
||||
<package id="Akka.Persistence" version="1.0.6.17-beta" targetFramework="net45" />
|
||||
<package id="Akka.Persistence.TestKit" version="1.0.6.17-beta" targetFramework="net45" />
|
||||
<package id="Akka.TestKit" version="1.0.6" targetFramework="net45" />
|
||||
<package id="Akka.TestKit.Xunit2" version="1.0.6" targetFramework="net45" />
|
||||
<package id="CassandraCSharpDriver" version="2.7.3" targetFramework="net45" />
|
||||
<package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
|
||||
<package id="lz4net" version="1.0.5.93" targetFramework="net45" />
|
||||
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
|
||||
|
|
|
|||
|
|
@ -32,14 +32,17 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Akka">
|
||||
<HintPath>..\Packages\Akka.1.0.4\lib\net45\Akka.dll</HintPath>
|
||||
<Reference Include="Akka, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.1.0.6\lib\net45\Akka.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.Persistence">
|
||||
<HintPath>..\Packages\Akka.Persistence.1.0.4.12-beta\lib\net45\Akka.Persistence.dll</HintPath>
|
||||
<Reference Include="Akka.Persistence, Version=1.0.6.17, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.Persistence.1.0.6.17-beta\lib\net45\Akka.Persistence.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Cassandra">
|
||||
<HintPath>..\packages\CassandraCSharpDriver.2.5.2\lib\net40\Cassandra.dll</HintPath>
|
||||
<Reference Include="Cassandra, Version=2.7.0.0, Culture=neutral, PublicKeyToken=10b231fbfc8c4b4d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CassandraCSharpDriver.2.7.3\lib\net40\Cassandra.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Google.ProtocolBuffers">
|
||||
<HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -142,14 +142,14 @@ namespace Akka.Persistence.Cassandra.Snapshot
|
|||
return _session.ExecuteAsync(bound);
|
||||
}
|
||||
|
||||
protected Task DeleteAsync(SnapshotMetadata metadata)
|
||||
protected override Task DeleteAsync(SnapshotMetadata metadata)
|
||||
{
|
||||
IStatement bound = _deleteSnapshot.Bind(metadata.PersistenceId, metadata.SequenceNr)
|
||||
.SetConsistencyLevel(_cassandraExtension.SnapshotStoreSettings.WriteConsistency);
|
||||
return _session.ExecuteAsync(bound);
|
||||
}
|
||||
|
||||
protected async Task DeleteAsync(string persistenceId, SnapshotSelectionCriteria criteria)
|
||||
protected override async Task DeleteAsync(string persistenceId, SnapshotSelectionCriteria criteria)
|
||||
{
|
||||
// Use a batch to delete all matching snapshots
|
||||
var batch = new BatchStatement();
|
||||
|
|
@ -191,18 +191,6 @@ namespace Akka.Persistence.Cassandra.Snapshot
|
|||
// No op
|
||||
}
|
||||
|
||||
protected override void Delete(SnapshotMetadata metadata)
|
||||
{
|
||||
// Should never get called
|
||||
throw new NotSupportedException("Deletes are handled async by this snapshot store.");
|
||||
}
|
||||
|
||||
protected override void Delete(string persistenceId, SnapshotSelectionCriteria criteria)
|
||||
{
|
||||
// Should never get called
|
||||
throw new NotSupportedException("Deletes are handled async by this snapshot store.");
|
||||
}
|
||||
|
||||
protected override void PostStop()
|
||||
{
|
||||
base.PostStop();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Akka" version="1.0.4" targetFramework="net45" />
|
||||
<package id="Akka.Persistence" version="1.0.4.12-beta" targetFramework="net45" />
|
||||
<package id="CassandraCSharpDriver" version="2.5.2" targetFramework="net45" />
|
||||
<package id="Akka" version="1.0.6" targetFramework="net45" />
|
||||
<package id="Akka.Persistence" version="1.0.6.17-beta" targetFramework="net45" />
|
||||
<package id="CassandraCSharpDriver" version="2.7.3" targetFramework="net45" />
|
||||
<package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
|
||||
<package id="lz4net" version="1.0.5.93" targetFramework="net45" />
|
||||
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ using System.Reflection;
|
|||
[assembly: AssemblyCompanyAttribute("Akka.NET Team")]
|
||||
[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2015 Akka.NET Team")]
|
||||
[assembly: AssemblyTrademarkAttribute("")]
|
||||
[assembly: AssemblyVersionAttribute("1.0.4.0")]
|
||||
[assembly: AssemblyFileVersionAttribute("1.0.4.0")]
|
||||
[assembly: AssemblyVersionAttribute("1.0.6.0")]
|
||||
[assembly: AssemblyFileVersionAttribute("1.0.6.0")]
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче