From 85eff977c0efeb44e33eec6843d3c9ca9640a5ca Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 14:09:50 +0000 Subject: [PATCH 1/5] Bump FsCheck.Xunit from 2.14.0 to 2.14.1 (#75) --- .../Akka.Persistence.Extras.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj b/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj index 0e6a1c2..154d935 100644 --- a/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj +++ b/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj @@ -8,7 +8,7 @@ - + From 1869fc4eb235603f0f60bfe8c305f89f38b402e4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 14:23:07 +0000 Subject: [PATCH 2/5] Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0 (#71) --- src/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.props b/src/common.props index 722658f..185d0ea 100644 --- a/src/common.props +++ b/src/common.props @@ -19,6 +19,6 @@ 1.3.17 1.2.2 2.4.1 - 16.4.0 + 16.5.0 \ No newline at end of file From 198829c1aecd4677a689b979e20fb346941e6265 Mon Sep 17 00:00:00 2001 From: Gregorius Soedharmo Date: Wed, 4 Mar 2020 00:59:13 +0700 Subject: [PATCH 3/5] Update Akka to version 1.4.1-rc1 (#77) --- .../Program.cs | 1 + .../DeDuplication/DeDuplicatingActorThroughputTest.cs | 1 + .../Supervision/AkkaPersistenceSupervisionEnd2EndSpecs.cs | 1 + src/Akka.Persistence.Extras/ExtraPersistence.cs | 1 + src/common.props | 6 +++--- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Program.cs b/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Program.cs index 2700579..72334a3 100644 --- a/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Program.cs +++ b/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Program.cs @@ -7,6 +7,7 @@ using System.Linq; using Akka.Actor; using Akka.Configuration; +using Hocon; namespace Akka.Persistence.Extras.Demo.PersistenceSupervisor { diff --git a/src/Akka.Persistence.Extras.Tests.Performance/DeDuplication/DeDuplicatingActorThroughputTest.cs b/src/Akka.Persistence.Extras.Tests.Performance/DeDuplication/DeDuplicatingActorThroughputTest.cs index d11e932..3c655f9 100644 --- a/src/Akka.Persistence.Extras.Tests.Performance/DeDuplication/DeDuplicatingActorThroughputTest.cs +++ b/src/Akka.Persistence.Extras.Tests.Performance/DeDuplication/DeDuplicatingActorThroughputTest.cs @@ -12,6 +12,7 @@ using Akka.Persistence.Extras; using Akka.Util.Internal; using NBench; +using Hocon; namespace Akka.AtLeastOnceDeliveryJournaling.Tests.Performance { diff --git a/src/Akka.Persistence.Extras.Tests/Supervision/AkkaPersistenceSupervisionEnd2EndSpecs.cs b/src/Akka.Persistence.Extras.Tests/Supervision/AkkaPersistenceSupervisionEnd2EndSpecs.cs index e8ca1c3..6c9c107 100644 --- a/src/Akka.Persistence.Extras.Tests/Supervision/AkkaPersistenceSupervisionEnd2EndSpecs.cs +++ b/src/Akka.Persistence.Extras.Tests/Supervision/AkkaPersistenceSupervisionEnd2EndSpecs.cs @@ -11,6 +11,7 @@ using Akka.Event; using Xunit; using Xunit.Abstractions; +using Hocon; namespace Akka.Persistence.Extras.Tests.Supervision { diff --git a/src/Akka.Persistence.Extras/ExtraPersistence.cs b/src/Akka.Persistence.Extras/ExtraPersistence.cs index 437e0a1..78cf6a9 100644 --- a/src/Akka.Persistence.Extras/ExtraPersistence.cs +++ b/src/Akka.Persistence.Extras/ExtraPersistence.cs @@ -3,6 +3,7 @@ using System.Text; using Akka.Actor; using Akka.Configuration; +using Hocon; namespace Akka.Persistence.Extras { diff --git a/src/common.props b/src/common.props index 185d0ea..cb189f9 100644 --- a/src/common.props +++ b/src/common.props @@ -14,9 +14,9 @@ $(NoWarn);CS1591 - net45 - netstandard1.6 - 1.3.17 + net461 + netstandard2.0 + 1.4.1-rc1 1.2.2 2.4.1 16.5.0 From 42b2c83319dc50ff6f28c1592ee642afaab70316 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Tue, 3 Mar 2020 12:56:11 -0600 Subject: [PATCH 4/5] upgraded build system and added v0.5.0-rc1 release notes (#78) --- RELEASE_NOTES.md | 4 +- build.fsx | 60 +++--- build.ps1 | 199 ++++++++++++++++-- build.sh | 6 +- ...e.Extras.Demo.DeDuplicatingReceiver.csproj | 2 +- ...e.Extras.Demo.PersistenceSupervisor.csproj | 2 +- ...ersistence.Extras.Tests.Performance.csproj | 9 +- .../Program.cs | 12 ++ .../Akka.Persistence.Extras.Tests.csproj | 2 +- .../Akka.Persistence.Extras.csproj | 2 +- src/common.props | 13 +- 11 files changed, 247 insertions(+), 64 deletions(-) create mode 100644 src/Akka.Persistence.Extras.Tests.Performance/Program.cs diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0b5bae1..f5685a2 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,2 +1,2 @@ -#### 0.4.4 January 04 2020 #### -* Updated Akka.Persistence.Extras to Akka.NET v1.3.17. \ No newline at end of file +#### 0.5.0-rc1 March 03 2020 #### +* Updated Akka.NET to v1.4.1-rc1 \ No newline at end of file diff --git a/build.fsx b/build.fsx index 500b4ab..291572b 100644 --- a/build.fsx +++ b/build.fsx @@ -23,15 +23,22 @@ let solutionFile = FindFirstMatchingFile "*.sln" __SOURCE_DIRECTORY__ // dynami let buildNumber = environVarOrDefault "BUILD_NUMBER" "0" let hasTeamCity = (not (buildNumber = "0")) // check if we have the TeamCity environment variable for build # set let preReleaseVersionSuffix = "beta" + (if (not (buildNumber = "0")) then (buildNumber) else DateTime.UtcNow.Ticks.ToString()) -let versionSuffix = - match (getBuildParam "nugetprerelease") with - | "dev" -> preReleaseVersionSuffix - | _ -> "" let releaseNotes = - File.ReadLines "./RELEASE_NOTES.md" + File.ReadLines (__SOURCE_DIRECTORY__ @@ "RELEASE_NOTES.md") |> ReleaseNotesHelper.parseReleaseNotes +let versionFromReleaseNotes = + match releaseNotes.SemVer.PreRelease with + | Some r -> r.Origin + | None -> "" + +let versionSuffix = + match (getBuildParam "nugetprerelease") with + | "dev" -> preReleaseVersionSuffix + | "" -> versionFromReleaseNotes + | str -> str + // Directories let toolsDir = __SOURCE_DIRECTORY__ @@ "tools" let output = __SOURCE_DIRECTORY__ @@ "bin" @@ -107,28 +114,33 @@ Target "RunTests" (fun _ -> projects |> Seq.iter (runSingleProject) ) -Target "NBench" <| fun _ -> - let projects = - match (isWindows) with - | true -> !! "./src/**/*.Tests.Performance.csproj" - | _ -> !! "./src/**/Tests.Performance.csproj" // if you need to filter specs for Linux vs. Windows, do it here - - - let runSingleProject project = - let arguments = - match (hasTeamCity) with - | true -> (sprintf "nbench --nobuild --teamcity --concurrent true --trace true --output %s" (outputPerfTests)) - | false -> (sprintf "nbench --nobuild --concurrent true --trace true --output %s" (outputPerfTests)) +Target "NBench" (fun _ -> + ensureDirectory outputPerfTests + let nbenchTestAssemblies = !! "./src/**/*Tests.Performance.csproj" + + nbenchTestAssemblies |> Seq.iter(fun project -> + let args = new StringBuilder() + |> append "run" + |> append "--no-build" + |> append "-c" + |> append configuration + |> append " -- " + |> append "--output" + |> append outputPerfTests + |> append "--concurrent" + |> append "true" + |> append "--trace" + |> append "true" + |> append "--diagnostic" + |> toText - let result = ExecProcess(fun info -> + let result = ExecProcess(fun info -> info.FileName <- "dotnet" info.WorkingDirectory <- (Directory.GetParent project).FullName - info.Arguments <- arguments) (TimeSpan.FromMinutes 30.0) - - ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.Error result - - projects |> Seq.iter runSingleProject - + info.Arguments <- args) (System.TimeSpan.FromMinutes 15.0) (* Reasonably long-running task. *) + if result <> 0 then failwithf "NBench.Runner failed. %s %s" "dotnet" args + ) +) //-------------------------------------------------------------------------------- // Code signing targets diff --git a/build.ps1 b/build.ps1 index 43d88f8..01a2834 100644 --- a/build.ps1 +++ b/build.ps1 @@ -31,12 +31,12 @@ Param( $FakeVersion = "4.61.2" $DotNetChannel = "LTS"; -$DotNetVersion = "2.1.500"; -$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v$DotNetVersion/scripts/obtain/dotnet-install.ps1"; +$DotNetVersion = "3.1.100"; +$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1"; $NugetVersion = "4.1.0"; $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe" $ProtobufVersion = "3.4.0" -$DocfxVersion = "2.40.5" +$DocfxVersion = "2.49.0" # Make sure tools folder exists $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent @@ -87,6 +87,7 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) { $env:PATH = "$InstallPath;$env:PATH" $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 + $env:DOTNET_ROOT=$InstallPath } ########################################################################### @@ -114,21 +115,6 @@ if (!(Test-Path $FakeExePath)) { } } -########################################################################### -# Google.Protobuf.Tools -########################################################################### - -# Make sure Google.Protobuf.Tools has been installed. -$ProtobufExePath = Join-Path $ToolPath "Google.Protobuf.Tools/tools/windows_x64/protoc.exe" -if (!(Test-Path $ProtobufExePath)) { - Write-Host "Installing Google.Protobuf.Tools..." - Invoke-Expression "&`"$NugetPath`" install Google.Protobuf.Tools -ExcludeVersion -Version $ProtobufVersion -OutputDirectory `"$ToolPath`"" | Out-Null; - if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring Google.Protobuf.Tools from NuGet." - } -} - - ########################################################################### # Docfx ########################################################################### @@ -173,4 +159,179 @@ $Arguments = @{ Write-Host "Running build script..." Invoke-Expression "$FakeExePath `"build.fsx`" $ScriptArgs $Arguments" -exit $LASTEXITCODE \ No newline at end of file +exit $LASTEXITCODE +# SIG # Begin signature block +# MIIgTwYJKoZIhvcNAQcCoIIgQDCCIDwCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDy+m5x/ontiIGy +# a2+Kn4J7jbsGsFWkLaQLK39iFQNsb6CCDiIwggO3MIICn6ADAgECAhAM5+DlF9hG +# /o/lYPwb8DA5MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQK +# EwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNV +# BAMTG0RpZ2lDZXJ0IEFzc3VyZWQgSUQgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBa +# Fw0zMTExMTAwMDAwMDBaMGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2Vy +# dCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lD +# ZXJ0IEFzc3VyZWQgSUQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +# AQoCggEBAK0OFc7kQ4BcsYfzt2D5cRKlrtwmlIiq9M71IDkoWGAM+IDaqRWVMmE8 +# tbEohIqK3J8KDIMXeo+QrIrneVNcMYQq9g+YMjZ2zN7dPKii72r7IfJSYd+fINcf +# 4rHZ/hhk0hJbX/lYGDW8R82hNvlrf9SwOD7BG8OMM9nYLxj+KA+zp4PWw25EwGE1 +# lhb+WZyLdm3X8aJLDSv/C3LanmDQjpA1xnhVhyChz+VtCshJfDGYM2wi6YfQMlqi +# uhOCEe05F52ZOnKh5vqk2dUXMXWuhX0irj8BRob2KHnIsdrkVxfEfhwOsLSSplaz +# vbKX7aqn8LfFqD+VFtD/oZbrCF8Yd08CAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGG +# MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEXroq/0ksuCMS1Ri6enIZ3zbcgP +# MB8GA1UdIwQYMBaAFEXroq/0ksuCMS1Ri6enIZ3zbcgPMA0GCSqGSIb3DQEBBQUA +# A4IBAQCiDrzf4u3w43JzemSUv/dyZtgy5EJ1Yq6H6/LV2d5Ws5/MzhQouQ2XYFwS +# TFjk0z2DSUVYlzVpGqhH6lbGeasS2GeBhN9/CTyU5rgmLCC9PbMoifdf/yLil4Qf +# 6WXvh+DfwWdJs13rsgkq6ybteL59PyvztyY1bV+JAbZJW58BBZurPSXBzLZ/wvFv +# hsb6ZGjrgS2U60K3+owe3WLxvlBnt2y98/Efaww2BxZ/N3ypW2168RJGYIPXJwS+ +# S86XvsNnKmgR34DnDDNmvxMNFG7zfx9jEB76jRslbWyPpbdhAbHSoyahEHGdreLD +# +cOZUbcrBwjOLuZQsqf6CkUvovDyMIIFLzCCBBegAwIBAgIQDGOJqewvySRbpPsq +# IflH5DANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGln +# aUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhE +# aWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgQ29kZSBTaWduaW5nIENBMB4XDTE3MDEw +# NjAwMDAwMFoXDTIwMDExNTEyMDAwMFowbDELMAkGA1UEBhMCVVMxEzARBgNVBAgT +# CkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRgwFgYDVQQKEw9QZXRh +# YnJpZGdlLCBMTEMxGDAWBgNVBAMTD1BldGFicmlkZ2UsIExMQzCCASIwDQYJKoZI +# hvcNAQEBBQADggEPADCCAQoCggEBAJriBjrKlrcxMnq3l2fLb5lQjuc6+J5r8cm6 +# J1IlK+BLcf0WnLxOJRBRhHXzdNkiCUJsLw2qE8Adfq0XpfxgQjTSk9Mbn4w7U7wk +# 9/GMsripQZ8qIiQw479XuhQkKqa7A4W4gPSNpanDP93VXQ1rq2QJbYVSG3QG2xhT +# YJQrtYICZUTAX5545iktupiwJcKalr3QK7qrqNlX+D9Io83gapXTTxJcnLQQ49+P +# zg4k84dBsx3ZKRwlQfyay42+vPZzoBqAl3GB5PFhjN1nGYJDOny3OeEbl2Jtlhf/ +# 7AG5/iEpD/H1pmMTMbfNXWYcydqsUJpx+ZP41dEoZtHFdpjAMTsCAwEAAaOCAcUw +# ggHBMB8GA1UdIwQYMBaAFFrEuXsqCqOl6nEDwGD5LfZldQ5YMB0GA1UdDgQWBBS+ +# T6RUtpfdoqSY120tEgyk++hNkjAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYI +# KwYBBQUHAwMwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NybDMuZGlnaWNlcnQu +# Y29tL3NoYTItYXNzdXJlZC1jcy1nMS5jcmwwNaAzoDGGL2h0dHA6Ly9jcmw0LmRp +# Z2ljZXJ0LmNvbS9zaGEyLWFzc3VyZWQtY3MtZzEuY3JsMEwGA1UdIARFMEMwNwYJ +# YIZIAYb9bAMBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNv +# bS9DUFMwCAYGZ4EMAQQBMIGEBggrBgEFBQcBAQR4MHYwJAYIKwYBBQUHMAGGGGh0 +# dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBOBggrBgEFBQcwAoZCaHR0cDovL2NhY2Vy +# dHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENvZGVTaWduaW5n +# Q0EuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHq4G8r7TMcb +# o2NNnWedUctYyfwoqTCxbssff5aU9b0FwkmuP56VlqAlNVojMze7LhvIvIf0WabY +# 3NxBnUlCble3MXYMa9btcn1HbLpdKBHoDJ9DbhNeWeBh9DuYtxTnXJoi6mOPgull +# syuMzN7A5V8RFtmJQpMwjJ8+8Pw1KBmE2b/Nr1DvbOAGYQ8pnL+wgaCAOU+7ZlyL +# 7ffmloyIE0mh63ReveR8t8IwOy3tF4Zyp9u+rcEMct0Wo42b1hiXlLKMs0YupoaC +# /H7tTfvnGBs9jZRaAJ1BcLrF4xRMSfTxtPlFRxunZ1ZzVKoiyctXLmET3MOuTyXn +# aI2JwwH+zUYwggUwMIIEGKADAgECAhAECRgbX9W7ZnVTQ7VvlVAIMA0GCSqGSIb3 +# DQEBCwUAMGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAX +# BgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEFzc3Vy +# ZWQgSUQgUm9vdCBDQTAeFw0xMzEwMjIxMjAwMDBaFw0yODEwMjIxMjAwMDBaMHIx +# CzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3 +# dy5kaWdpY2VydC5jb20xMTAvBgNVBAMTKERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJ +# RCBDb2RlIFNpZ25pbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQD407Mcfw4Rr2d3B9MLMUkZz9D7RZmxOttE9X/lqJ3bMtdx6nadBS63j/qSQ8Cl +# +YnUNxnXtqrwnIal2CWsDnkoOn7p0WfTxvspJ8fTeyOU5JEjlpB3gvmhhCNmElQz +# UHSxKCa7JGnCwlLyFGeKiUXULaGj6YgsIJWuHEqHCN8M9eJNYBi+qsSyrnAxZjNx +# PqxwoqvOf+l8y5Kh5TsxHM/q8grkV7tKtel05iv+bMt+dDk2DZDv5LVOpKnqagqr +# hPOsZ061xPeM0SAlI+sIZD5SlsHyDxL0xY4PwaLoLFH3c7y9hbFig3NBggfkOItq +# cyDQD2RzPJ6fpjOp/RnfJZPRAgMBAAGjggHNMIIByTASBgNVHRMBAf8ECDAGAQH/ +# AgEAMA4GA1UdDwEB/wQEAwIBhjATBgNVHSUEDDAKBggrBgEFBQcDAzB5BggrBgEF +# BQcBAQRtMGswJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBD +# BggrBgEFBQcwAoY3aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0 +# QXNzdXJlZElEUm9vdENBLmNydDCBgQYDVR0fBHoweDA6oDigNoY0aHR0cDovL2Ny +# bDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNybDA6oDig +# NoY0aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9v +# dENBLmNybDBPBgNVHSAESDBGMDgGCmCGSAGG/WwAAgQwKjAoBggrBgEFBQcCARYc +# aHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAKBghghkgBhv1sAzAdBgNVHQ4E +# FgQUWsS5eyoKo6XqcQPAYPkt9mV1DlgwHwYDVR0jBBgwFoAUReuir/SSy4IxLVGL +# p6chnfNtyA8wDQYJKoZIhvcNAQELBQADggEBAD7sDVoks/Mi0RXILHwlKXaoHV0c +# LToaxO8wYdd+C2D9wz0PxK+L/e8q3yBVN7Dh9tGSdQ9RtG6ljlriXiSBThCk7j9x +# jmMOE0ut119EefM2FAaK95xGTlz/kLEbBw6RFfu6r7VRwo0kriTGxycqoSkoGjpx +# KAI8LpGjwCUR4pwUR6F6aGivm6dcIFzZcbEMj7uo+MUSaJ/PQMtARKUT8OZkDCUI +# QjKyNookAv4vcn4c10lFluhZHen6dGRrsutmQ9qzsIzV6Q3d9gEgzpkxYz0IGhiz +# gZtPxpMQBvwHgfqL2vmCSfdibqFT+hKUGIUukpHqaGxEMrJmoecYpJpkUe8xghGD +# MIIRfwIBATCBhjByMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5j +# MRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhEaWdpQ2VydCBT +# SEEyIEFzc3VyZWQgSUQgQ29kZSBTaWduaW5nIENBAhAMY4mp7C/JJFuk+yoh+Ufk +# MA0GCWCGSAFlAwQCAQUAoIIBATAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAc +# BgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgJuHi +# vbFHMNp3nUjNSOgj/F89M0Ct8VgVgwOelqhnzlAwgZQGCisGAQQBgjcCAQwxgYUw +# gYKgSIBGAFAAZQB0AGEAYgByAGkAZABnAGUAIABTAHQAYQBuAGQAYQByAGQAIABC +# AHUAaQBsAGQAIABUAGUAbQBwAGwAYQB0AGUAc6E2gDRodHRwczovL2dpdGh1Yi5j +# b20vcGV0YWJyaWRnZS9wZXRhYnJpZGdlLWRvdG5ldC1uZXcgMA0GCSqGSIb3DQEB +# AQUABIIBAIJgaaYF7d0eCozYo6KiZYYKU3Qptr33/FYVlEKc6kgh+9D/ZAQ1lqsF +# k9mZVCB4IbJs92KSNuHhkZpeZjV30YiWJ6Ixd+tF5sAcKfNTSjH3QfqJAdXUG8gL +# mUbk0H64wz/lTsWLz5l6SrSSnHvABVjn/PqLMRqbrwRvhFFt9yoRlmDzG7/UAPWB +# +ftkGkPOUUUEIbF/RCdPiXIb82W4cXuBk8Kqkou6X4Dbv07GzKkeCun5DbgD4mL3 +# 2h91fyUsUkh5USpZVcScsLSsIqFavZ3GPExWhkGvo8EQ756+ZT+EdyleQd70eI6V +# +jrFfrNWxRlmVcfE+ZBH8bLJinzYGNChgg7IMIIOxAYKKwYBBAGCNwMDATGCDrQw +# gg6wBgkqhkiG9w0BBwKggg6hMIIOnQIBAzEPMA0GCWCGSAFlAwQCAQUAMHcGCyqG +# SIb3DQEJEAEEoGgEZjBkAgEBBglghkgBhv1sBwEwMTANBglghkgBZQMEAgEFAAQg +# yVw1M/glzmvyYENKoVDAlG2PPFDPhYSmm6N4s9jIPD0CEGcCUCnVFW/SW5WYFvGQ +# UdEYDzIwMTkwMzE1MTYwMDU3WqCCC7swggaCMIIFaqADAgECAhAJwPxGyARCE7VZ +# i68oT05BMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxE +# aWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAvBgNVBAMT +# KERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBUaW1lc3RhbXBpbmcgQ0EwHhcNMTcw +# MTA0MDAwMDAwWhcNMjgwMTE4MDAwMDAwWjBMMQswCQYDVQQGEwJVUzERMA8GA1UE +# ChMIRGlnaUNlcnQxKjAoBgNVBAMTIURpZ2lDZXJ0IFNIQTIgVGltZXN0YW1wIFJl +# c3BvbmRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6VmGo0O3Mb +# qH78x74paYnHaCZGXz2NYnOHgaOhnPC3WyQ3WpLU9FnXdonk3NUn8NVmvArutCsx +# Z6xYxUqRWStFHgkB1mSzWe6NZk37I17MEA0LimfvUq6gCJDCUvf1qLVumyx7nee1 +# Pvt4zTJQGL9AtUyMu1f0oE8RRWxCQrnlr9bf9Kd8CmiWD9JfKVfO+x0y//QRoRMi +# +xLL79dT0uuXy6KsGx2dWCFRgsLC3uorPywihNBD7Ds7P0fE9lbcRTeYtGt0tVmv +# eFdpyA8JAnjd2FPBmdtgxJ3qrq/gfoZKXKlYYahedIoBKGhyTqeGnbUCUodwZkjT +# ju+BJMzc2GUCAwEAAaOCAzgwggM0MA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8E +# AjAAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMIMIIBvwYDVR0gBIIBtjCCAbIwggGh +# BglghkgBhv1sBwEwggGSMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2Vy +# dC5jb20vQ1BTMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBlACAA +# bwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBuAHMA +# dABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0AGgA +# ZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0AGgA +# ZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBlAG4A +# dAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5ACAA +# YQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABlAHIA +# ZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMAsGCWCGSAGG/WwDFTAf +# BgNVHSMEGDAWgBT0tuEgHf4prtLkYaWyoiWyyBc1bjAdBgNVHQ4EFgQU4acySu4B +# ISh9VNXyB5JutAcPPYcwcQYDVR0fBGowaDAyoDCgLoYsaHR0cDovL2NybDMuZGln +# aWNlcnQuY29tL3NoYTItYXNzdXJlZC10cy5jcmwwMqAwoC6GLGh0dHA6Ly9jcmw0 +# LmRpZ2ljZXJ0LmNvbS9zaGEyLWFzc3VyZWQtdHMuY3JsMIGFBggrBgEFBQcBAQR5 +# MHcwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBPBggrBgEF +# BQcwAoZDaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkFz +# c3VyZWRJRFRpbWVzdGFtcGluZ0NBLmNydDANBgkqhkiG9w0BAQsFAAOCAQEAHvBB +# gjKu7fG0NRPcUMLVl64iIp0ODq8z00z9fL9vARGnlGUiXMYiociJUmuajHNc2V4/ +# Mt4WYEyLNv0xmQq9wYS3jR3viSYTBVbzR81HW62EsjivaiO1ReMeiDJGgNK3ppki +# /cF4z/WL2AyMBQnuROaA1W1wzJ9THifdKkje2pNlrW5lo5mnwkAOc8xYT49FKOW8 +# nIjmKM5gXS0lXYtzLqUNW1Hamk7/UAWJKNryeLvSWHiNRKesOgCReGmJZATTXZbf +# Kr/5pUwsk//mit2CrPHSs6KGmsFViVZqRz/61jOVQzWJBXhaOmnaIrgEQ9NvaDU2 +# ehQ+RemYZIYPEwwmSjCCBTEwggQZoAMCAQICEAqhJdbWMht+QeQF2jaXwhUwDQYJ +# KoZIhvcNAQELBQAwZTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IElu +# YzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEkMCIGA1UEAxMbRGlnaUNlcnQg +# QXNzdXJlZCBJRCBSb290IENBMB4XDTE2MDEwNzEyMDAwMFoXDTMxMDEwNzEyMDAw +# MFowcjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UE +# CxMQd3d3LmRpZ2ljZXJ0LmNvbTExMC8GA1UEAxMoRGlnaUNlcnQgU0hBMiBBc3N1 +# cmVkIElEIFRpbWVzdGFtcGluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +# AQoCggEBAL3QMu5LzY9/3am6gpnFOVQoV7YjSsQOB0UzURB90Pl9TWh+57ag9I2z +# iOSXv2MhkJi/E7xX08PhfgjWahQAOPcuHjvuzKb2Mln+X2U/4Jvr40ZHBhpVfgsn +# fsCi9aDg3iI/Dv9+lfvzo7oiPhisEeTwmQNtO4V8CdPuXciaC1TjqAlxa+DPIhAP +# dc9xck4Krd9AOly3UeGheRTGTSQjMF287DxgaqwvB8z98OpH2YhQXv1mblZhJymJ +# hFHmgudGUP2UKiyn5HU+upgPhH+fMRTWrdXyZMt7HgXQhBlyF/EXBu89zdZN7wZC +# /aJTKk+FHcQdPK/P2qwQ9d2srOlW/5MCAwEAAaOCAc4wggHKMB0GA1UdDgQWBBT0 +# tuEgHf4prtLkYaWyoiWyyBc1bjAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd +# 823IDzASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjATBgNVHSUE +# DDAKBggrBgEFBQcDCDB5BggrBgEFBQcBAQRtMGswJAYIKwYBBQUHMAGGGGh0dHA6 +# Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBDBggrBgEFBQcwAoY3aHR0cDovL2NhY2VydHMu +# ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNydDCBgQYDVR0f +# BHoweDA6oDigNoY0aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0QXNz +# dXJlZElEUm9vdENBLmNybDA6oDigNoY0aHR0cDovL2NybDMuZGlnaWNlcnQuY29t +# L0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNybDBQBgNVHSAESTBHMDgGCmCGSAGG +# /WwAAgQwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQ +# UzALBglghkgBhv1sBwEwDQYJKoZIhvcNAQELBQADggEBAHGVEulRh1Zpze/d2nyq +# Y3qzeM8GN0CE70uEv8rPAwL9xafDDiBCLK938ysfDCFaKrcFNB1qrpn4J6Jmvwmq +# YN92pDqTD/iy0dh8GWLoXoIlHsS6HHssIeLWWywUNUMEaLLbdQLgcseY1jxk5R9I +# EBhfiThhTWJGJIdjjJFSLK8pieV4H9YLFKWA1xJHcLN11ZOFk362kmf7U2GJqPVr +# lsD0WGkNfMgBsbkodbeZY4UijGHKeZR+WfyMD+NvtQEmtmyl7odRIeRYYJu6DC0r +# baLEfrvEJStHAgh8Sa4TtuF8QkIoxhhWz0E0tmZdtnR79VYzIi8iNrJLokqV2PWm +# jlIxggJNMIICSQIBATCBhjByMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNl +# cnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhEaWdp +# Q2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENBAhAJwPxGyARCE7VZ +# i68oT05BMA0GCWCGSAFlAwQCAQUAoIGYMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0B +# CRABBDAcBgkqhkiG9w0BCQUxDxcNMTkwMzE1MTYwMDU3WjArBgsqhkiG9w0BCRAC +# DDEcMBowGDAWBBRAAZFHXJiJHeuhBK9HCRtettTLyzAvBgkqhkiG9w0BCQQxIgQg +# jLu5eXUI0j43Sq/ZJ76+UJmWF/2Amb+YAcVtGZhRJKowDQYJKoZIhvcNAQEBBQAE +# ggEAQBQNwdmatbURcWuntIUvk18FZGGLRA3bT0kNXN0pwwwopQlr4G6WbL8C8oSw +# 0KUbWa3VonUYHemc6ZYgSOaa07X9dMoEWdgf9Jy7LDFZQCYBkI7034x0ujyTAZ6U +# KtqQupuRPdLAsCb67KB6DR6lIuP1hj1yolPb9uyqEsH1JJqusTiirZvO1UvNVtHU +# ljscye8j2SiO8UNLhYHL1me43S4NmqgLkaDvIE8lVx8GtyFyGRdFZYTzAufXTR9H +# HK8lsD0ekQiOpaAIw/MfhEgTej1Z3L686Z0xwBVyH988UA9lVbXdDZWS3odGd2CT +# /JdEUFIMzW5J8N+QntZ/Fjua/A== +# SIG # End signature block diff --git a/build.sh b/build.sh index 73752bc..657ff87 100644 --- a/build.sh +++ b/build.sh @@ -11,10 +11,10 @@ NUGET_EXE=$TOOLS_DIR/nuget.exe NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.0.0/nuget.exe FAKE_VERSION=4.61.2 FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe -DOTNET_VERSION=2.1.500 -DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_VERSION/scripts/obtain/dotnet-install.sh +DOTNET_VERSION=3.1.100 +DOTNET_INSTALLER_URL=https://dot.net/v1/dotnet-install.sh DOTNET_CHANNEL=LTS; -DOCFX_VERSION=2.40.5 +DOCFX_VERSION=2.49.0 DOCFX_EXE=$TOOLS_DIR/docfx.console/tools/docfx.exe # Define default arguments. diff --git a/src/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver.csproj b/src/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver.csproj index a735dab..fb70b41 100644 --- a/src/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver.csproj +++ b/src/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver/Akka.Persistence.Extras.Demo.DeDuplicatingReceiver.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp2.1 + $(NetCoreTestVersion) false diff --git a/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Akka.Persistence.Extras.Demo.PersistenceSupervisor.csproj b/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Akka.Persistence.Extras.Demo.PersistenceSupervisor.csproj index bdaf5c9..d5481ad 100644 --- a/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Akka.Persistence.Extras.Demo.PersistenceSupervisor.csproj +++ b/src/Akka.Persistence.Extras.Demo.PersistenceSupervisor/Akka.Persistence.Extras.Demo.PersistenceSupervisor.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + $(NetCoreTestVersion) false diff --git a/src/Akka.Persistence.Extras.Tests.Performance/Akka.Persistence.Extras.Tests.Performance.csproj b/src/Akka.Persistence.Extras.Tests.Performance/Akka.Persistence.Extras.Tests.Performance.csproj index ee8bced..5708ac2 100644 --- a/src/Akka.Persistence.Extras.Tests.Performance/Akka.Persistence.Extras.Tests.Performance.csproj +++ b/src/Akka.Persistence.Extras.Tests.Performance/Akka.Persistence.Extras.Tests.Performance.csproj @@ -2,17 +2,14 @@ - - netcoreapp2.1 - true + + Exe + $(NetCoreTestVersion) false - 2.1.6 - - diff --git a/src/Akka.Persistence.Extras.Tests.Performance/Program.cs b/src/Akka.Persistence.Extras.Tests.Performance/Program.cs new file mode 100644 index 0000000..d227b6c --- /dev/null +++ b/src/Akka.Persistence.Extras.Tests.Performance/Program.cs @@ -0,0 +1,12 @@ +using NBench; + +namespace Akka.Persistence.Extras.Tests.Performance +{ + class Program + { + static int Main(string[] args) + { + return NBenchRunner.Run(); + } + } +} diff --git a/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj b/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj index 154d935..f57b250 100644 --- a/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj +++ b/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp2.1 + $(NetCoreTestVersion) false diff --git a/src/Akka.Persistence.Extras/Akka.Persistence.Extras.csproj b/src/Akka.Persistence.Extras/Akka.Persistence.Extras.csproj index 9d47824..5eed627 100644 --- a/src/Akka.Persistence.Extras/Akka.Persistence.Extras.csproj +++ b/src/Akka.Persistence.Extras/Akka.Persistence.Extras.csproj @@ -3,7 +3,7 @@ - $(NetStandardLibVersion);$(NetFrameworkLibVersion) + $(NetStandardLibVersion) Additional features and tools for the Akka.Persistence library. diff --git a/src/common.props b/src/common.props index cb189f9..73e0c58 100644 --- a/src/common.props +++ b/src/common.props @@ -2,8 +2,8 @@ Copyright © 2015-2020 Petabridge Petabridge - 0.4.4 - Updated Akka.Persistence.Extras to Akka.NET v1.3.17. + 0.5.0 + Updated Akka.NET to v1.4.1-rc1 https://petabridge.com/images/logo.png https://devops.petabridge.com/articles/msgdelivery/ @@ -14,11 +14,12 @@ $(NoWarn);CS1591 - net461 - netstandard2.0 + 16.5.0 1.4.1-rc1 - 1.2.2 + 2.0.1 2.4.1 - 16.5.0 + netcoreapp3.1 + net461 + netstandard2.0 \ No newline at end of file From 410b3796f2d92380fdba986619dc1b33e477510f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 19:01:47 +0000 Subject: [PATCH 5/5] Bump FluentAssertions from 5.10.0 to 5.10.2 (#72) --- .../Akka.Persistence.Extras.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj b/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj index f57b250..3b71296 100644 --- a/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj +++ b/src/Akka.Persistence.Extras.Tests/Akka.Persistence.Extras.Tests.csproj @@ -7,7 +7,7 @@ - +