Skip to content

Commit

Permalink
Merge pull request #65 from akkadotnet/dev
Browse files Browse the repository at this point in the history
v1.4.4 Stable Release
  • Loading branch information
Aaronontheweb authored Apr 15, 2020
2 parents ea053a4 + dd44a75 commit cff7c46
Show file tree
Hide file tree
Showing 45 changed files with 1,182 additions and 203 deletions.
File renamed without changes.
47 changes: 26 additions & 21 deletions src/Akka.Persistence.Redis.sln → Akka.Persistence.Redis.sln
Original file line number Diff line number Diff line change
@@ -1,42 +1,36 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
# Visual Studio Version 16
VisualStudioVersion = 16.0.29806.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Persistence.Redis", "Akka.Persistence.Redis\Akka.Persistence.Redis.csproj", "{516115B9-891F-4D5D-AE08-0F128C2FD1C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Persistence.Redis.Tests", "Akka.Persistence.Redis.Tests\Akka.Persistence.Redis.Tests.csproj", "{754408BF-773C-46C9-9BC6-8820D77E95CA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{EB67BFB9-7589-469F-B0E0-6DDFC0032E67}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
..\build.cmd = ..\build.cmd
..\build.fsx = ..\build.fsx
..\build.ps1 = ..\build.ps1
..\build.sh = ..\build.sh
..\README.md = ..\README.md
build.cmd = build.cmd
build.fsx = build.fsx
build.ps1 = build.ps1
build.sh = build.sh
src\common.props = src\common.props
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{1F453772-CA5E-4F41-A50E-75F3F59F72D6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomSerialization.MsgPack", "examples\CustomSerialization.MsgPack\CustomSerialization.MsgPack.csproj", "{6EEB8234-FAB9-4645-86EF-297240B3798A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomSerialization.MsgPack", "src\examples\CustomSerialization.MsgPack\CustomSerialization.MsgPack.csproj", "{6EEB8234-FAB9-4645-86EF-297240B3798A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomSerialization.Protobuf", "src\examples\CustomSerialization.Protobuf\CustomSerialization.Protobuf.csproj", "{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomSerialization.Protobuf", "examples\CustomSerialization.Protobuf\CustomSerialization.Protobuf.csproj", "{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Redis", "src\Akka.Persistence.Redis\Akka.Persistence.Redis.csproj", "{32493D11-8BE0-4F62-9707-1B48BC427667}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{516115B9-891F-4D5D-AE08-0F128C2FD1C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{516115B9-891F-4D5D-AE08-0F128C2FD1C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{516115B9-891F-4D5D-AE08-0F128C2FD1C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{516115B9-891F-4D5D-AE08-0F128C2FD1C0}.Release|Any CPU.Build.0 = Release|Any CPU
{754408BF-773C-46C9-9BC6-8820D77E95CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{754408BF-773C-46C9-9BC6-8820D77E95CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{754408BF-773C-46C9-9BC6-8820D77E95CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{754408BF-773C-46C9-9BC6-8820D77E95CA}.Release|Any CPU.Build.0 = Release|Any CPU
{6EEB8234-FAB9-4645-86EF-297240B3798A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EEB8234-FAB9-4645-86EF-297240B3798A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EEB8234-FAB9-4645-86EF-297240B3798A}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -45,6 +39,14 @@ Global
{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F}.Release|Any CPU.Build.0 = Release|Any CPU
{32493D11-8BE0-4F62-9707-1B48BC427667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32493D11-8BE0-4F62-9707-1B48BC427667}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32493D11-8BE0-4F62-9707-1B48BC427667}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32493D11-8BE0-4F62-9707-1B48BC427667}.Release|Any CPU.Build.0 = Release|Any CPU
{59871C63-8D5D-4221-B504-203BB3500DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -53,4 +55,7 @@ Global
{6EEB8234-FAB9-4645-86EF-297240B3798A} = {1F453772-CA5E-4F41-A50E-75F3F59F72D6}
{90084FC1-C04B-46BF-AA37-2ACD71E1AD4F} = {1F453772-CA5E-4F41-A50E-75F3F59F72D6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6ADAF1F3-8019-4D3E-A8B0-2BF7CF7B439B}
EndGlobalSection
EndGlobal
4 changes: 1 addition & 3 deletions src/NuGet.Config → NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<clear />
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="akka-nightly" value="https://www.myget.org/F/akkadotnet/api/v3/index.json" />
<add key="netcorenightly" value="https://www.myget.org/F/akkadotnet/api/v3/index.json" />
</packageSources>
</configuration>
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Akka.Persistence.Redis

[![Build status](https://ci.appveyor.com/api/projects/status/uxdr5352akbdi605/branch/dev?svg=true)](https://ci.appveyor.com/project/akkadotnet-contrib/akka-persistence-redis/branch/dev) [![NuGet Version](http://img.shields.io/nuget/v/Akka.Persistence.Redis.svg?style=flat)](https://www.nuget.org/packages/Akka.Persistence.Redis)
[![NuGet Version](http://img.shields.io/nuget/v/Akka.Persistence.Redis.svg?style=flat)](https://www.nuget.org/packages/Akka.Persistence.Redis)

Akka Persistence Redis Plugin is a plugin for `Akka persistence` that provides several components:
- a journal store ;
Expand All @@ -27,7 +27,7 @@ akka.persistence.journal.plugin = "akka.persistence.journal.redis"
This will run the journal with its default settings. The default settings can be changed with the configuration properties defined in your HOCON config:

### Configuration
- `configuration-string` - connection string, as described here: https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/Configuration.md#basic-configuration-strings
- `configuration-string` - connection string, as described here: https://github.com/StackExchange/StackExchange.Redis/blob/master/docs/Configuration.md#basic-configuration-strings
- `key-prefix` - Redis journals key prefixes. Leave it for default or change it to appropriate value. WARNING: don't change it on production instances.

## Snapshot config
Expand All @@ -38,7 +38,7 @@ akka.persistence.snapshot-store.plugin = "akka.persistence.snapshot-store.redis"
This will run the snapshot-store with its default settings. The default settings can be changed with the configuration properties defined in your HOCON config:

### Configuration
- `configuration-string` - connection string, as described here: https://github.com/StackExchange/StackExchange.Redis/blob/master/Docs/Configuration.md#basic-configuration-strings
- `configuration-string` - connection string, as described here: https://github.com/StackExchange/StackExchange.Redis/blob/master/docs/Configuration.md#basic-configuration-strings
- `key-prefix` - Redis journals key prefixes. Leave it for default or change it to appropriate value. WARNING: don't change it on production instances.

## Persistence Query
Expand Down
8 changes: 8 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
#### 1.4.4 April 11th 2020 ####
- Bump Akka to version 1.4.4
- Update build system to use Docker.DotNet

#### 1.0.0-beta2 March 2nd 2020 ####
- Update Akka to version 1.4.1-RC1
- Update build system

#### 1.0.0-beta1 Sep 10 2017 ####
- Support for .NET Standard 1.6
- Support for Persistence Query
Expand Down
8 changes: 8 additions & 0 deletions build-system/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Azure Pipelines Build Files
These `.yaml` files are used by Windows Azure DevOps Pipelines to help execute the following types of builds:

- Pull request validation on Linux (Mono / .NET Core)
- Pull request validation on Windows (.NET Framework / .NET Core)
- NuGet releases with automatic release notes posted to a Github Release repository.

**NOTE**: you will need to change some of the pipeline variables inside the `windows-release.yaml` for your specific project and you will also want to create variable groups with your signing and NuGet push information.
45 changes: 45 additions & 0 deletions build-system/azure-pipeline.template.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
parameters:
name: ''
vmImage: ''
displayName: ''
scriptFileName: ''
scriptArgs: 'all'
timeoutInMinutes: 120

jobs:
- job: ${{ parameters.name }}
displayName: ${{ parameters.displayName }}
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
pool:
vmImage: ${{ parameters.vmImage }}
steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
clean: false # whether to fetch clean each time
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
persistCredentials: true
# Linux or macOS
- task: Bash@3
displayName: Linux / OSX Build
inputs:
filePath: ${{ parameters.scriptFileName }}
arguments: ${{ parameters.scriptArgs }}
continueOnError: true
condition: in( variables['Agent.OS'], 'Linux', 'Darwin' )
# Windows test is disabled, could not use redis container in Azure Pipelines
# - task: BatchScript@1
# displayName: Windows Build
# inputs:
# filename: ${{ parameters.scriptFileName }}
# arguments: ${{ parameters.scriptArgs }}
# continueOnError: true
# condition: eq( variables['Agent.OS'], 'Windows_NT' )
- task: PublishTestResults@2
inputs:
testRunner: VSTest
testResultsFiles: '**/*.trx' #TestResults folder usually
testRunTitle: ${{ parameters.name }}
mergeTestResults: true
- script: 'echo 1>&2'
failOnStderr: true
displayName: 'If above is partially succeeded, then fail'
condition: eq(variables['Agent.JobStatus'], 'SucceededWithIssues')
32 changes: 32 additions & 0 deletions build-system/pr-validation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Pull request validation for Windows against the `dev` and `master` branches
# See https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for reference
trigger:
branches:
include:
- dev
- master

pr:
autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true
branches:
include: [ dev, master ] # branch names which will trigger a build

name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

jobs:
# Windows testing is disabled, Redis linux container can not run in windows docker.
# - template: azure-pipeline.template.yaml
# parameters:
# name: 'windows_pr'
# displayName: 'Windows PR Validation'
# vmImage: 'windows-2019'
# scriptFileName: build.cmd
# scriptArgs: all

- template: azure-pipeline.template.yaml
parameters:
name: 'linux_pr'
displayName: 'Linux PR Validation'
vmImage: 'ubuntu-16.04'
scriptFileName: ./build.sh
scriptArgs: RunTests
37 changes: 37 additions & 0 deletions build-system/windows-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Release task for PbLib projects
# See https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for reference

pool:
vmImage: vs2017-win2016
demands: Cmd

trigger:
branches:
include:
- refs/tags/*

variables:
- group: signingSecrets #create this group with SECRET variables `signingUsername` and `signingPassword`
- group: nugetKeys #create this group with SECRET variables `nugetKey`
- name: githubConnectionName
value: AkkaDotNet_Releases
- name: projectName
value: Akka.Persistence.Redis
- name: githubRepositoryName
value: akkadotnet/Akka.Persistence.Redis
steps:
- task: BatchScript@1
displayName: 'FAKE Build'
inputs:
filename: build.cmd
arguments: 'All SignClientUser=$(signingUsername) SignClientSecret=$(signingPassword) nugetpublishurl=https://www.nuget.org/api/v2/package nugetkey=$(nugetKey)'

- task: GitHubRelease@0
displayName: 'GitHub release (create)'
inputs:
gitHubConnection: $(githubConnectionName)
repositoryName: $(githubRepositoryName)
title: '$(projectName) v$(Build.SourceBranchName)'
releaseNotesFile: 'RELEASE_NOTES.md'
assets: |
bin\nuget\*.nupkg
Loading

0 comments on commit cff7c46

Please sign in to comment.