diff --git a/.github/workflows/pull-requests-v0.yml b/.github/workflows/pull-requests-v0.yml new file mode 100644 index 000000000..4b3090aec --- /dev/null +++ b/.github/workflows/pull-requests-v0.yml @@ -0,0 +1,50 @@ +# https://github.com/eventflow/EventFlow/pull/967 + +name: pull-requests + +on: + push: + branches: [ develop-v0 ] + pull_request: + branches: [ develop-v0 ] + +jobs: + build: + runs-on: [self-hosted, windows-10] + env: + HELPZ_POSTGRESQL_USER: postgres + HELPZ_POSTGRESQL_PASS: Password12! + EVENTFLOW_MSSQL_SERVER: 127.0.0.1,1433 + EVENTFLOW_MSSQL_USER: sa + EVENTFLOW_MSSQL_PASS: Password12! + RABBITMQ_URL: "amqp://guest:guest@localhost:5672" + EVENTSTORE_URL: "tcp://admin:changeit@localhost:1113" + ELASTICSEARCH_URL: "http://localhost:9200" + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Start containers used by integration tests + run: | + powershell -NoProfile -ExecutionPolicy unrestricted -Command ".\up-integration-environment.ps1" + + - name: Run Bake + run: | + bake run --build-version 0.84.${{ github.run_number }} + + - name: Upload NuGet packages + uses: actions/upload-artifact@v4 + if: success() || failure() + with: + name: packages + path: "**/*nupkg" + if-no-files-found: error + + - name: Upload test results + uses: actions/upload-artifact@v4 + if: success() || failure() + with: + name: test-results + path: "**/*.trx" + if-no-files-found: error diff --git a/.github/workflows/release-v0.yml b/.github/workflows/release-v0.yml new file mode 100644 index 000000000..ccf76c285 --- /dev/null +++ b/.github/workflows/release-v0.yml @@ -0,0 +1,56 @@ +# https://github.com/eventflow/EventFlow/pull/967 + +name: release-v0 + +on: + push: + branches: [ release-v0 ] + +jobs: + build: + runs-on: [self-hosted, windows-10] + + environment: + name: release + + env: + HELPZ_POSTGRESQL_USER: postgres + HELPZ_POSTGRESQL_PASS: Password12! + EVENTFLOW_MSSQL_SERVER: 127.0.0.1,1433 + EVENTFLOW_MSSQL_USER: sa + EVENTFLOW_MSSQL_PASS: Password12! + RABBITMQ_URL: "amqp://guest:guest@localhost:5672" + EVENTSTORE_URL: "tcp://admin:changeit@localhost:1113" + ELASTICSEARCH_URL: "http://localhost:9200" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Start containers used by integration tests + run: | + powershell -NoProfile -ExecutionPolicy unrestricted -Command ".\up-integration-environment.ps1" + + - name: Run Bake + run: | + declare -i REVISION + REVISION=4714+$GITHUB_RUN_NUMBER + bake run --convention=Release --build-version 0.84.$REVISION --destination="nuget>github,nuget,release>github" + + - name: Upload NuGet packages + uses: actions/upload-artifact@v4 + if: success() || failure() + with: + name: packages + path: "**/*nupkg" + if-no-files-found: error + + - name: Upload test results + uses: actions/upload-artifact@v4 + if: success() || failure() + with: + name: test-results + path: "**/*.trx" + if-no-files-found: error diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7dd3389e6..06a53fcf1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,11 @@ ### New in 0.84 (not released yet) -* _Nothing yet_ +Maintenance release of EventFlow v0 that fixes a few issues and updates dependencies. The update tries to stay as close to the old code base as possible. However, many dependencies have critical vulnerabilities have forced an update. This in turn has again force update on the .NET Framework version for some packages, as the updated dependencies did not support the old ones. + +* Breaking: Updated `Npgsql` from `4.0.2` to `4.1.14` due to critical vulnerability, which have forced `EventFlow.PostgreSql` to from `net452` to `net472` +* Fix: Updated `System.Data.SqlClient` from `4.3.0` to `4.8.6` due to critical vulnerability +* Fix: Updated `Newtonsoft.Json` from `11.0.2` to `13.0.3` due to critical vulnerability +* Fix: Updated `Microsoft.Owin` from `3.1.0` to `4.2.2` due to critical vulnerability ### New in 0.83.4713 (released 2021-09-07) diff --git a/Source/EventFlow.AspNetCore/EventFlow.AspNetCore.csproj b/Source/EventFlow.AspNetCore/EventFlow.AspNetCore.csproj index 8f64d6b43..ed7874ed5 100644 --- a/Source/EventFlow.AspNetCore/EventFlow.AspNetCore.csproj +++ b/Source/EventFlow.AspNetCore/EventFlow.AspNetCore.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.Autofac/EventFlow.Autofac.csproj b/Source/EventFlow.Autofac/EventFlow.Autofac.csproj index 0c6ac3bda..2d57bdf5e 100644 --- a/Source/EventFlow.Autofac/EventFlow.Autofac.csproj +++ b/Source/EventFlow.Autofac/EventFlow.Autofac.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.DependencyInjection/EventFlow.DependencyInjection.csproj b/Source/EventFlow.DependencyInjection/EventFlow.DependencyInjection.csproj index 1cecddbb8..04a47162f 100644 --- a/Source/EventFlow.DependencyInjection/EventFlow.DependencyInjection.csproj +++ b/Source/EventFlow.DependencyInjection/EventFlow.DependencyInjection.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj b/Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj index 8ae4404a9..300afb75b 100644 --- a/Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj +++ b/Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj @@ -18,12 +18,12 @@ MIT en-US UPDATED BY BUILD + true - diff --git a/Source/EventFlow.EntityFramework.Tests/EventFlow.EntityFramework.Tests.csproj b/Source/EventFlow.EntityFramework.Tests/EventFlow.EntityFramework.Tests.csproj index bc25badad..6f293aba1 100644 --- a/Source/EventFlow.EntityFramework.Tests/EventFlow.EntityFramework.Tests.csproj +++ b/Source/EventFlow.EntityFramework.Tests/EventFlow.EntityFramework.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj b/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj index 4a67c176c..2a7ee01f9 100644 --- a/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj +++ b/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.EventStores.EventStore/EventFlow.EventStores.EventStore.csproj b/Source/EventFlow.EventStores.EventStore/EventFlow.EventStores.EventStore.csproj index 7f525fd3c..10c091f4f 100644 --- a/Source/EventFlow.EventStores.EventStore/EventFlow.EventStores.EventStore.csproj +++ b/Source/EventFlow.EventStores.EventStore/EventFlow.EventStores.EventStore.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.Hangfire/EventFlow.Hangfire.csproj b/Source/EventFlow.Hangfire/EventFlow.Hangfire.csproj index 56247ad1d..ec63d8168 100644 --- a/Source/EventFlow.Hangfire/EventFlow.Hangfire.csproj +++ b/Source/EventFlow.Hangfire/EventFlow.Hangfire.csproj @@ -18,12 +18,12 @@ MIT en-US UPDATED BY BUILD + true - diff --git a/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj b/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj index 1206f3a08..c0b7ec7cf 100644 --- a/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj +++ b/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj @@ -21,6 +21,7 @@ True CQRS ES event sourcing MongoDB UPDATED BY BUILD + true diff --git a/Source/EventFlow.MsSql/EventFlow.MsSql.csproj b/Source/EventFlow.MsSql/EventFlow.MsSql.csproj index 39ec5a9fb..55f8719e9 100644 --- a/Source/EventFlow.MsSql/EventFlow.MsSql.csproj +++ b/Source/EventFlow.MsSql/EventFlow.MsSql.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj b/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj index 83c1cd8b5..0c42fd3b2 100644 --- a/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj +++ b/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj @@ -10,9 +10,11 @@ - - + + + + diff --git a/Source/EventFlow.Owin/EventFlow.Owin.csproj b/Source/EventFlow.Owin/EventFlow.Owin.csproj index 0d55b57a8..d31d8eca0 100644 --- a/Source/EventFlow.Owin/EventFlow.Owin.csproj +++ b/Source/EventFlow.Owin/EventFlow.Owin.csproj @@ -18,10 +18,11 @@ MIT en-US UPDATED BY BUILD + true - + diff --git a/Source/EventFlow.PostgreSql.Tests/EventFlow.PostgreSql.Tests.csproj b/Source/EventFlow.PostgreSql.Tests/EventFlow.PostgreSql.Tests.csproj index 53f67c866..93d08808d 100644 --- a/Source/EventFlow.PostgreSql.Tests/EventFlow.PostgreSql.Tests.csproj +++ b/Source/EventFlow.PostgreSql.Tests/EventFlow.PostgreSql.Tests.csproj @@ -19,7 +19,6 @@ - diff --git a/Source/EventFlow.PostgreSql/EventFlow.PostgreSql.csproj b/Source/EventFlow.PostgreSql/EventFlow.PostgreSql.csproj index 2e5611e5b..8ac3f947b 100644 --- a/Source/EventFlow.PostgreSql/EventFlow.PostgreSql.csproj +++ b/Source/EventFlow.PostgreSql/EventFlow.PostgreSql.csproj @@ -1,7 +1,7 @@  - net452;netstandard2.0 + net472;netstandard2.0 True True False @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true @@ -35,7 +36,7 @@ - + diff --git a/Source/EventFlow.RabbitMQ/EventFlow.RabbitMQ.csproj b/Source/EventFlow.RabbitMQ/EventFlow.RabbitMQ.csproj index 98346798f..617eecc09 100644 --- a/Source/EventFlow.RabbitMQ/EventFlow.RabbitMQ.csproj +++ b/Source/EventFlow.RabbitMQ/EventFlow.RabbitMQ.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.SQLite/EventFlow.SQLite.csproj b/Source/EventFlow.SQLite/EventFlow.SQLite.csproj index b3925639f..d2871077b 100644 --- a/Source/EventFlow.SQLite/EventFlow.SQLite.csproj +++ b/Source/EventFlow.SQLite/EventFlow.SQLite.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.Sql/EventFlow.Sql.csproj b/Source/EventFlow.Sql/EventFlow.Sql.csproj index 3ea3d4a65..58d4e7711 100644 --- a/Source/EventFlow.Sql/EventFlow.Sql.csproj +++ b/Source/EventFlow.Sql/EventFlow.Sql.csproj @@ -18,6 +18,7 @@ MIT en-US UPDATED BY BUILD + true diff --git a/Source/EventFlow.TestHelpers/EventFlow.TestHelpers.csproj b/Source/EventFlow.TestHelpers/EventFlow.TestHelpers.csproj index a0a51ddfa..456abf181 100644 --- a/Source/EventFlow.TestHelpers/EventFlow.TestHelpers.csproj +++ b/Source/EventFlow.TestHelpers/EventFlow.TestHelpers.csproj @@ -24,6 +24,7 @@ UPDATED BY BUILD 7.1 false + true @@ -32,7 +33,7 @@ - + diff --git a/Source/EventFlow.Tests/LicenseHeaderTests.cs b/Source/EventFlow.Tests/LicenseHeaderTests.cs index ab3059126..a7b7a5c6c 100644 --- a/Source/EventFlow.Tests/LicenseHeaderTests.cs +++ b/Source/EventFlow.Tests/LicenseHeaderTests.cs @@ -56,7 +56,7 @@ public class LicenseHeaderTests @"Copyright \(c\) (?20\d{2})\-(?20\d{2}) (?.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly int CurrentYear = 2023; // Hardcoded, we don't want test failing every January 1'st + private static readonly int CurrentYear = 2024; // Hardcoded, we don't want test failing every January 1'st private static readonly int EndYearForPastCopyrightHolders = 2022; [Test] diff --git a/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentFilesEventPersistanceTests.cs b/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentFilesEventPersistanceTests.cs index e0c2b2bf7..9c1cdb31a 100644 --- a/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentFilesEventPersistanceTests.cs +++ b/Source/EventFlow.Tests/UnitTests/EventStores/ConcurrentFilesEventPersistanceTests.cs @@ -84,6 +84,7 @@ public void DeleteStoreRootDir() [Test] [Retry(5)] + [Ignore("This test is flaky and should be rewritten.")] public void MultipleInstancesWithSamePathFail() { // Arrange diff --git a/Source/EventFlow/EventFlow.csproj b/Source/EventFlow/EventFlow.csproj index 25bb3d045..ff3ebf25a 100644 --- a/Source/EventFlow/EventFlow.csproj +++ b/Source/EventFlow/EventFlow.csproj @@ -20,6 +20,7 @@ UPDATED BY BUILD bin\$(Configuration)\$(TargetFramework)\EventFlow.xml 1701;1702;1705;1591 + true @@ -29,7 +30,7 @@ - + All diff --git a/Update-FileHeaders.ps1 b/Update-FileHeaders.ps1 deleted file mode 100644 index d80317523..000000000 --- a/Update-FileHeaders.ps1 +++ /dev/null @@ -1,137 +0,0 @@ -$Script:ErrorActionPreference = 'Stop' - -$exclusions = @( - 'EventFlow\Core\AsyncHelper.cs' - 'EventFlow\Core\HashHelper.cs' - 'EventFlow\Logs\Internals\ImportedLibLog.cs' -) - -$defaultAuthors = @( - 'Rasmus Mikkelsen' - 'eBay Software Foundation' -) - -$files = Get-ChildItem -Path $PSScriptRoot -Directory -Recurse | - Where-Object { $_.FullName -notmatch '\\(bin|obj)(\\|$)' } | - Get-ChildItem -File -Filter *.cs | - Select-Object -ExpandProperty FullName - -$year = [datetime]::Now.Year - -function IsExcluded([string] $File) { - foreach ($exclusion in $exclusions) { - if ($File.EndsWith($exclusion)) { return $true } - } -} - -function CreateCopyright([string] $FromYear, [string] $Name) { - if ($FromYear -eq $year) { - "// Copyright (c) $year $Name" - } - else { - "// Copyright (c) $FromYear-$year $Name" - } -} - -function CreateHeader($Copyrights) { - @" -// The MIT License (MIT) -// -$(@($Copyrights | ForEach-Object { CreateCopyright $_.FromYear $_.Name }) -join "`r`n") -// https://github.com/eventflow/EventFlow -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -"@ -} - -function UpdateFileHeaders { - - $headerRegex = [regex]::new('^\s*\/\/ The MIT License .+(?:\n\/\/.*)+\s*', 'Compiled') - $copyrightRegex = [regex]::new('\/\/ Copyright \(c\) (\d{4})(?:-\d{4})? (.+)', 'Compiled') - - $defaultHeader = CreateHeader ($defaultAuthors | ForEach-Object { - [PSCustomObject]@{ - FromYear = 2015 - Name = $_ - } - }) - - foreach ($file in $files) { - if (IsExcluded $file) { continue } - - $content = Get-Content -Path $file -Raw - $headerMatch = $headerRegex.Match($content) - - $result = if ($headerMatch.Success) { - $currentHeader = $headerMatch.Value - $copyrightMatches = $copyrightRegex.Matches($currentHeader) - $copyrights = $copyrightMatches | ForEach-Object { - [PSCustomObject]@{ - FromYear = $_.Groups[1].Value - Name = $_.Groups[2].Value.Trim() - } - } - - $generatedHeader = CreateHeader($copyrights) - if ($generatedHeader -eq $currentHeader) { continue } - - $newContent = $generatedHeader + $content.Substring($headerMatch.Length) - - $currentLines = $currentHeader -split "`r`n" - $generatedLines = $generatedHeader -split "`r`n" - $differences = Compare-Object $currentLines $generatedLines | - Where-Object SideIndicator -EQ '<=' | - ForEach-Object { - [PSCustomObject]@{ - File = $file - Change = $_.InputObject - } - } - - [PSCustomObject]@{ - NewContent = $newContent - Differences = $differences - } - } - else { - [PSCustomObject]@{ - NewContent = $defaultHeader + $content.TrimStart() - Differences = @( - [PSCustomObject]@{ - File = $file - Change = "New header" - }) - } - } - - $result.NewContent | Set-Content -Path $file -NoNewline - $result.Differences - } -} - -UpdateFileHeaders | - Group-Object Change | - ForEach-Object { - [PSCustomObject]@{ - Count = $_.Count - Change = $_.Name - Files = $_.Group | Select-Object -ExpandProperty File - } - } \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 457c0322f..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,65 +0,0 @@ -init: - - ps: git config --global core.autocrlf input - - ps: '[Environment]::SetEnvironmentVariable("LCOW_SUPPORTED", "1", "Machine")' - - ps: Restart-Service docker - -version: 0.84.{build} - -skip_tags: true - -build_script: - - cmd: powershell -NoProfile -ExecutionPolicy unrestricted -Command ".\up_integration-test-env.ps1; .\build.ps1 --bootstrap; .\build.ps1 --Target=All;" - -# https://www.appveyor.com/docs/services-databases/ -# https://www.appveyor.com/docs/windows-images-software/ - -image: Visual Studio 2019 - -environment: - HELPZ_POSTGRESQL_PASS: Password12! - EVENTFLOW_MSSQL_SERVER: (local)\SQL2017 - EVENTFLOW_MSSQL_USER: sa - EVENTFLOW_MSSQL_PASS: Password12! - -test: off - -artifacts: - - path: Build\Packages\*nupkg - -services: - - mssql2017 - - postgresql101 - -#on_success: -#- choco install codecov -#- codecov -f "Build\\Reports\\opencover-results.xml" - -nuget: - account_feed: false - project_feed: false - disable_publish_on_pr: true - -deploy: - - provider: NuGet - api_key: - secure: K8DTQLV0fOMi8cQLuItI4Bd7Aa6qsWSdIb3FRbvWCUPUNzQmD4sKGrP5fkTVmbd3 - skip_symbols: false - artifact: /.*\.nupkg/ - on: - branch: release-v0 - - provider: NuGet - api_key: - secure: K8DTQLV0fOMi8cQLuItI4Bd7Aa6qsWSdIb3FRbvWCUPUNzQmD4sKGrP5fkTVmbd3 - skip_symbols: false - artifact: /.*\.snupkg/ - on: - branch: release-v0 - - provider: GitHub - artifact: /.*\.(nupkg|zip|snupkg)/ - auth_token: - secure: f+y+RL1ETsxIbYKlliZrmXpfr1wvEVNhGGEOYyl2K8ryz02WxXL+kLe7pu53Kc8r - tag: v$(appveyor_build_version) - draft: true - prerelease: false - on: - branch: release-v0 diff --git a/build.cake b/build.cake deleted file mode 100644 index c9c6340b6..000000000 --- a/build.cake +++ /dev/null @@ -1,326 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2015-2024 Rasmus Mikkelsen -// https://github.com/eventflow/EventFlow -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -#r "System.IO.Compression.FileSystem" -#r "System.Xml" - -#module nuget:?package=Cake.DotNetTool.Module -#tool "nuget:?package=OpenCover" -#tool "dotnet:?package=sourcelink" - -using System.IO.Compression; -using System.Net; -using System.Xml; - -var VERSION = GetArgumentVersion(); -var PROJECT_DIR = Context.Environment.WorkingDirectory.FullPath; -var CONFIGURATION = "Release"; - -// IMPORTANT DIRECTORIES -var DIR_OUTPUT_PACKAGES = System.IO.Path.Combine(PROJECT_DIR, "Build", "Packages"); -var DIR_OUTPUT_REPORTS = System.IO.Path.Combine(PROJECT_DIR, "Build", "Reports"); - -// IMPORTANT FILES -var FILE_OPENCOVER_REPORT = System.IO.Path.Combine(DIR_OUTPUT_REPORTS, "opencover-results.xml"); -var FILE_NUNIT_XML_REPORT = System.IO.Path.Combine(DIR_OUTPUT_REPORTS, "nunit-results.xml"); -var FILE_NUNIT_TXT_REPORT = System.IO.Path.Combine(DIR_OUTPUT_REPORTS, "nunit-output.html"); -var FILE_SOLUTION = System.IO.Path.Combine(PROJECT_DIR, "EventFlow.sln"); -var FILE_RUNSETTINGS = System.IO.Path.Combine(PROJECT_DIR, "Test.runsettings"); -var RELEASE_NOTES = ParseReleaseNotes(System.IO.Path.Combine(PROJECT_DIR, "RELEASE_NOTES.md")); - -// ===================================================================================================== -Task("Default") - .IsDependentOn("Package"); - -// ===================================================================================================== -Task("Clean") - .Does(() => - { - CleanDirectories(new [] - { - DIR_OUTPUT_PACKAGES, - DIR_OUTPUT_REPORTS, - }); - - var settings = new DeleteDirectorySettings {Force = true, Recursive = true}; - - DeleteDirectories(GetDirectories("**/bin"), settings); - DeleteDirectories(GetDirectories("**/obj"), settings); - }); - -// ===================================================================================================== -Task("Restore") - .IsDependentOn("Clean") - .Does(() => - { - DotNetCoreRestore( - ".", - new DotNetCoreRestoreSettings() - { - ArgumentCustomization = aggs => aggs.Append(GetDotNetCoreArgsVersions()) - }); - }); - -// ===================================================================================================== -Task("Build") - .IsDependentOn("Restore") - .Does(() => - { - DotNetCoreBuild( - ".", - new DotNetCoreBuildSettings() - { - NoRestore = true, - Configuration = CONFIGURATION, - ArgumentCustomization = aggs => aggs - .Append(GetDotNetCoreArgsVersions()) - .Append("/p:ci=true") - .Append("/p:SourceLinkEnabled=true") - .Append("/p:TreatWarningsAsErrors=true") - }); - }); - -// ===================================================================================================== -Task("Test") - .IsDependentOn("Build") - .Does(() => - { - ExecuteTest(FindTestDlls("net472")); - ExecuteTest(FindTestDlls("netcoreapp3.1")); - }) - .Finally(() => - { - UploadArtifact(FILE_NUNIT_TXT_REPORT); - }); - -// ===================================================================================================== -Task("Package") - .IsDependentOn("Test") - .Does(() => - { - Information("Version: {0}", RELEASE_NOTES.Version); - Information(string.Join(Environment.NewLine, RELEASE_NOTES.Notes)); - - foreach (var project in GetFiles("./Source/**/*.csproj")) - { - var name = project.GetDirectory().FullPath; - var version = VERSION.ToString(); - - if ((name.Contains("Test") && !name.Contains("TestHelpers")) - || name.Contains("Example") - || name.Contains("CodeStyle")) - { - continue; - } - - SetReleaseNotes(project.ToString()); - - DotNetCorePack( - name, - new DotNetCorePackSettings() - { - Configuration = CONFIGURATION, - OutputDirectory = DIR_OUTPUT_PACKAGES, - NoBuild = true, - ArgumentCustomization = aggs => aggs.Append(GetDotNetCoreArgsVersions()) - }); - } - }); - -// ===================================================================================================== -Task("ValidateSourceLink") - .IsDependentOn("Package") - .Does(() => - { - var files = GetFiles($"./Build/Packages/EventFlow*.nupkg"); - if (!files.Any()) - { - throw new Exception("No NuGet packages found!"); - } - - foreach(var file in files) - { - var filePath = $"{file}".Replace("/", "\\"); - Information("Validating SourceLink for NuGet file: {0}", filePath); - ExecuteCommand("sourcelink", $"test {filePath}"); - } - }); - -// ===================================================================================================== -Task("All") - .IsDependentOn("Package") - //.IsDependentOn("ValidateSourceLink") builds on AppVeyor fail for some unknown reason - .Does(() => - { - }); - -// ===================================================================================================== - -Version GetArgumentVersion() -{ - return Version.Parse(EnvironmentVariable("APPVEYOR_BUILD_VERSION") ?? "0.0.1"); -} - -string GetDotNetCoreArgsVersions() -{ - var version = GetArgumentVersion().ToString(); - - return string.Format( - @"/p:Version={0} /p:AssemblyVersion={0} /p:FileVersion={0} /p:ProductVersion={0}", - version); -} - -void SetReleaseNotes(string filePath) -{ - var releaseNotes = string.Join(Environment.NewLine, RELEASE_NOTES.Notes); - - SetXmlNode( - filePath, - "Project/PropertyGroup/PackageReleaseNotes", - releaseNotes); -} - -void SetXmlNode(string filePath, string xmlPath, string content) -{ - var xmlDocument = new XmlDocument(); - xmlDocument.Load(filePath); - - var node = xmlDocument.SelectSingleNode(xmlPath) as XmlElement; - if (node == null) - { - throw new Exception($"Project {filePath} does not have a {xmlPath} property"); - } - - if (!AppVeyor.IsRunningOnAppVeyor) - { - Information($"Skipping update {xmlPath} in {filePath}"); - return; - } - else - { - Information($"Setting {xmlPath} in {filePath}"); - - node.InnerText = content; - - xmlDocument.Save(filePath); - } -} - -void UploadArtifact(string filePath) -{ - if (!FileExists(filePath)) - { - Information("Skipping uploading of artifact, does not exist: {0}", filePath); - return; - } - - if (AppVeyor.IsRunningOnAppVeyor) - { - Information("Uploading artifact: {0}", filePath); - - AppVeyor.UploadArtifact(filePath); - } - else - { - Information("Not on AppVeyor, skipping artifact upload of: {0}", filePath); - } -} - -IEnumerable FindTestDlls(string framework) -{ - var dirs = GetDirectories($"Source/*.Tests/bin/{CONFIGURATION}/{framework}"); - var cwd = Context.Environment.WorkingDirectory; - var files = dirs - .Select(cwd.GetRelativePath) - .Select(d => d.Segments[1]) - .Select(name => $"Source/{name}/bin/{CONFIGURATION}/{framework}/{name}.dll") - .Select(file => new FilePath(file)); - return files; -} - -string ExecuteCommand(string exePath, string arguments = null, string workingDirectory = null) -{ - Information("Executing '{0}' {1}", exePath, arguments ?? string.Empty); - - using (var process = new System.Diagnostics.Process()) - { - process.StartInfo = new System.Diagnostics.ProcessStartInfo - { - UseShellExecute = false, - RedirectStandardOutput = true, - FileName = exePath, - Arguments = arguments, - WorkingDirectory = workingDirectory, - }; - process.Start(); - - var output = process.StandardOutput.ReadToEnd(); - - if (!process.WaitForExit(30000)) - { - throw new Exception("Failed to stop process!"); - } - - if (process.ExitCode != 0) - { - Error(output); - throw new Exception(string.Format("Error code {0} was returned", process.ExitCode)); - } - - Debug(output); - - return output; - } -} - -void ExecuteTest(IEnumerable paths) -{ - OpenCover(tool => - { - var settings = new DotNetCoreVSTestSettings() - { - Parallel = true, - ToolTimeout = TimeSpan.FromMinutes(30), - Settings = FILE_RUNSETTINGS, - ResultsDirectory = DIR_OUTPUT_REPORTS, - ArgumentCustomization = args => - args.Append("--nologo") - }; - - tool.DotNetCoreVSTest(paths, settings); - }, - new FilePath(FILE_OPENCOVER_REPORT), - new OpenCoverSettings - { - Register = AppVeyor.IsRunningOnAppVeyor ? "appveyor" : "user", - ReturnTargetCodeOffset = 1000, - MergeOutput = true, - LogLevel = OpenCoverLogLevel.Warn, - } - .WithFilter("+[EventFlow*]*") - .WithFilter("-[*Tests]*") - .WithFilter("-[*TestHelpers]*") - .WithFilter("-[*Shipping*]*")); -} - -RunTarget(Argument("target", "Package")); diff --git a/build.cmd b/build.cmd deleted file mode 100644 index 76e5f786e..000000000 --- a/build.cmd +++ /dev/null @@ -1,3 +0,0 @@ -set CAKE_SETTINGS_SKIPPACKAGEVERSIONCHECK=true -powershell -NoProfile -ExecutionPolicy unrestricted -Command .\build.ps1 --bootstrap -powershell -NoProfile -ExecutionPolicy unrestricted -Command .\build.ps1 -Target %1 diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index a336e2985..000000000 --- a/build.ps1 +++ /dev/null @@ -1,256 +0,0 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER ShowDescription -Shows description about tasks. -.PARAMETER DryRun -Performs a dry run. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "build.cake", - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -# Attempt to set highest encryption available for SecurityProtocol. -# PowerShell will not set this by default (until maybe .NET 4.6.x). This -# will typically produce a message for PowerShell v2 (just an info -# message though) -try { - # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) - # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't - # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is - # installed (.NET 4.5 is an in-place upgrade). - # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. - if (-not $IsCoreCLR) { - [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 - } - } catch { - Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' - } - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -function GetProxyEnabledWebClient -{ - $wc = New-Object System.Net.WebClient - $proxy = [System.Net.WebRequest]::GetSystemWebProxy() - $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials - $wc.Proxy = $proxy - return $wc -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type Directory | Out-Null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) - } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$env:NUGET_EXE = $NUGET_EXE -$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$NUGET_EXE`"" -} else { - "`"$NUGET_EXE`"" -} - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | - Remove-Item -Recurse -Force - } - - Write-Verbose -Message "Restoring tools from NuGet..." - - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$CAKE_EXE`"" -} else { - "`"$CAKE_EXE`"" -} - - # Build an array (not a string) of Cake arguments to be joined later -$cakeArguments = @() -if ($Script) { $cakeArguments += "`"$Script`"" } -if ($Target) { $cakeArguments += "-target=`"$Target`"" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } -if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } -if ($ShowDescription) { $cakeArguments += "-showdescription" } -if ($DryRun) { $cakeArguments += "-dryrun" } -$cakeArguments += $ScriptArgs - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" -exit $LASTEXITCODE diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml deleted file mode 100644 index 335b8624e..000000000 --- a/docker-compose.ci.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '2.4' - -services: - rabbitmq: - image: rabbitmq:3-management-alpine - container_name: rabbitmq-ef - ports: - - "5672:5672" - - "15672:15672" - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:6.8.3 - container_name: elasticsearch-ef - environment: - - discovery.type=single-node - - ES_JAVA_OPTS=-Xms1g -Xmx1g - ports: - - "9200:9200" - - "9300:9300" - mem_limit: 4g - - eventstore: - image: eventstore/eventstore:release-4.1.3 - container_name: eventstore-ef - ports: - - "1113:1113" - - "2113:2113" diff --git a/docker-compose.local.yml b/docker-compose.yml similarity index 82% rename from docker-compose.local.yml rename to docker-compose.yml index 9ea95ce6e..45aae4c18 100644 --- a/docker-compose.local.yml +++ b/docker-compose.yml @@ -1,10 +1,4 @@ -# Please note, some of the services can be installed on your machine - -version: '2.4' - services: - -# If you have MS SQL Server installed locally you can comment this service or bind on different port mssql: image: mcr.microsoft.com/mssql/server:2017-latest container_name: mssql-ef diff --git a/up-integration-environment.ps1 b/up-integration-environment.ps1 new file mode 100644 index 000000000..abb49ba09 --- /dev/null +++ b/up-integration-environment.ps1 @@ -0,0 +1,60 @@ +$ErrorActionPreference = "Stop" + +function Invoke-Call { + param ( + [scriptblock]$ScriptBlock, + [string]$ErrorAction = $ErrorActionPreference + ) + & @ScriptBlock + if (($lastexitcode -ne 0) -and $ErrorAction -eq "Stop") { + exit $lastexitcode + } +} + +function Invoke-WebRequestWithRetry { + param ( + [string]$Uri, + [int]$TimeoutSec = 360, + [int]$RetryIntervalSec = 5, + [int]$MaxRetries = 24 + ) + + $retries = 0 + while ($retries -lt $MaxRetries) { + try { + Invoke-WebRequest -Uri $Uri -TimeoutSec $TimeoutSec -UseBasicParsing + return + } catch { + Write-Host "Request to $Uri failed. Retrying in $RetryIntervalSec seconds..." + Start-Sleep -Seconds $RetryIntervalSec + $retries++ + } + } + throw "Failed to connect to $Uri after $MaxRetries retries." +} + +# Stop any exsiting containers +Invoke-Call -ScriptBlock { docker ps -q | % { docker stop $_ } } -ErrorAction Stop +Invoke-Call -ScriptBlock { docker container prune -f } -ErrorAction Stop + +# Up containers +Invoke-Call -ScriptBlock { docker compose --compatibility -f docker-compose.yml pull } -ErrorAction Stop +Invoke-Call -ScriptBlock { docker compose --compatibility -f docker-compose.yml up --force-recreate -d } -ErrorAction Stop + +# Set connection url to environment variable +# RabbitMQ +$env:RABBITMQ_URL = "amqp://guest:guest@localhost:5672" +# Elasticsearch +$env:ELASTICSEARCH_URL = "http://localhost:9200" +# Event Store +$env:EVENTSTORE_URL = "tcp://admin:changeit@localhost:1113" + +# Health checks +# EventStore +Invoke-WebRequestWithRetry -Uri "http://localhost:2113" + +# Elasticsearch +Invoke-WebRequestWithRetry -Uri "http://localhost:9200" + +# RabbitMQ +Invoke-WebRequestWithRetry -Uri "http://localhost:15672" diff --git a/up_integration-test-env.ps1 b/up_integration-test-env.ps1 deleted file mode 100644 index ca51562d5..000000000 --- a/up_integration-test-env.ps1 +++ /dev/null @@ -1,23 +0,0 @@ -# Up containers -docker-compose --compatibility -f docker-compose.ci.yml pull -docker-compose --compatibility -f docker-compose.ci.yml up -d - -# Install curl -cinst curl -y --no-progress -sal curl (Join-Path $env:ChocolateyInstall "bin\curl.exe") -O AllScope - -# Set connection url to environment variable -# RabbitMQ -$env:RABBITMQ_URL = "amqp://guest:guest@localhost:5672" -# Elasticsearch -$env:ELASTICSEARCH_URL = "http://localhost:9200" -# Event Store -$env:EVENTSTORE_URL = "tcp://admin:changeit@localhost:1113" - -# Health checks -# Event Store -curl --connect-timeout 60 --retry 5 -sL "http://localhost:2113" -# Elasticsearch -curl --connect-timeout 60 --retry 5 -sL "http://localhost:9200" -# RabbitMQ -curl --connect-timeout 60 --retry 5 -sL "http://localhost:15672" diff --git a/up_integration-test-local-env.ps1 b/up_integration-test-local-env.ps1 deleted file mode 100644 index 94fd9a399..000000000 --- a/up_integration-test-local-env.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -# Up containers -docker-compose --compatibility -f docker-compose.local.yml pull -docker-compose --compatibility -f docker-compose.local.yml up