Skip to content

Commit

Permalink
Merge pull request #129 from akkadotnet/dev
Browse files Browse the repository at this point in the history
v1.4.16 Release
  • Loading branch information
Aaronontheweb authored Feb 6, 2021
2 parents fe7ba8c + 65a81aa commit 1219f69
Show file tree
Hide file tree
Showing 69 changed files with 2,671 additions and 2,519 deletions.
15 changes: 15 additions & 0 deletions Akka.Persistence.Redis.sln
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Redis", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Redis.Tests", "src\Akka.Persistence.Redis.Tests\Akka.Persistence.Redis.Tests.csproj", "{59871C63-8D5D-4221-B504-203BB3500DBF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Redis.Cluster.Tests", "src\Akka.Persistence.Redis.Cluster.Tests\Akka.Persistence.Redis.Cluster.Tests.csproj", "{18AF172B-8381-4AA2-976A-16626A402E00}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{DA31E2A8-AE1A-474D-843C-1B6848B921E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Persistence.Redis.Benchmark.DockerTests", "src\benchmarks\Akka.Persistence.Redis.Benchmark.DockerTests\Akka.Persistence.Redis.Benchmark.DockerTests.csproj", "{BFBB3933-E8FC-4574-8D60-E6FA6BEABAE9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -47,13 +53,22 @@ Global
{59871C63-8D5D-4221-B504-203BB3500DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59871C63-8D5D-4221-B504-203BB3500DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59871C63-8D5D-4221-B504-203BB3500DBF}.Release|Any CPU.Build.0 = Release|Any CPU
{18AF172B-8381-4AA2-976A-16626A402E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18AF172B-8381-4AA2-976A-16626A402E00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18AF172B-8381-4AA2-976A-16626A402E00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18AF172B-8381-4AA2-976A-16626A402E00}.Release|Any CPU.Build.0 = Release|Any CPU
{BFBB3933-E8FC-4574-8D60-E6FA6BEABAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFBB3933-E8FC-4574-8D60-E6FA6BEABAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFBB3933-E8FC-4574-8D60-E6FA6BEABAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFBB3933-E8FC-4574-8D60-E6FA6BEABAE9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6EEB8234-FAB9-4645-86EF-297240B3798A} = {1F453772-CA5E-4F41-A50E-75F3F59F72D6}
{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F} = {1F453772-CA5E-4F41-A50E-75F3F59F72D6}
{BFBB3933-E8FC-4574-8D60-E6FA6BEABAE9} = {DA31E2A8-AE1A-474D-843C-1B6848B921E2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6ADAF1F3-8019-4D3E-A8B0-2BF7CF7B439B}
Expand Down
6 changes: 6 additions & 0 deletions Akka.Persistence.Redis.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">-----------------------------------------------------------------------&#xD;
&lt;copyright file="$FILENAME$" company="Akka.NET Project"&gt;&#xD;
Copyright (C) 2013-2021 .NET Foundation &lt;https://github.com/akkadotnet/akka.net&gt;&#xD;
&lt;/copyright&gt;&#xD;
-----------------------------------------------------------------------</s:String></wpf:ResourceDictionary>
46 changes: 0 additions & 46 deletions CODE_OF_CONDUCT.md

This file was deleted.

9 changes: 0 additions & 9 deletions NuGet.Config

This file was deleted.

Loading

0 comments on commit 1219f69

Please sign in to comment.