diff --git a/NuGet.config b/NuGet.config index 9a00510..fa6cf6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,16 +1,14 @@ - - + - - - - - - - + + + + + + diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a90c18b..4e4ac42 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +### 1.5.1.1 March 22 2023 ### + +* [Update Npgsql to v7.0.2](https://github.com/akkadotnet/akka.net/releases/tag/1.5.1.1) + ### 1.5.1 March 16 2023 ### * [Update Akka.NET to v1.5.1](https://github.com/akkadotnet/akka.net/releases/tag/1.5.1) diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml index 9517d12..54fe2e8 100644 --- a/build-system/azure-pipeline.template.yaml +++ b/build-system/azure-pipeline.template.yaml @@ -14,30 +14,36 @@ jobs: - job: ${{ parameters.name }} displayName: ${{ parameters.displayName }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + pool: vmImage: ${{ parameters.vmImage }} + variables: - name: postgre.low value: ${{ parameters.useLowVersion }} - name: postgre.high value: ${{ parameters.useHighVersion }} + 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 + - task: UseDotNet@2 displayName: 'Use .NET 7' inputs: version: '7.x' + # Linux or macOS - - task: Bash@3 + - 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 @@ -46,12 +52,14 @@ jobs: # 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 + - task: CopyFiles@2 displayName: 'Copy Build Output' inputs: @@ -59,10 +67,12 @@ jobs: contents: '**\*' targetFolder: $(Build.ArtifactStagingDirectory) continueOnError: boolean # 'true' if future steps should run even if this step fails; defaults to 'false' + - task: PublishBuildArtifacts@1 inputs: pathtoPublish: '$(Build.ArtifactStagingDirectory)' artifactName: ${{ parameters.artifactName }} + - script: 'echo 1>&2' failOnStderr: true displayName: 'If above is partially succeeded, then fail' diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml index 24863bc..4f2d092 100644 --- a/build-system/windows-release.yaml +++ b/build-system/windows-release.yaml @@ -9,6 +9,7 @@ trigger: branches: include: - refs/tags/* + pr: none variables: @@ -20,11 +21,13 @@ variables: value: Akka.Persistence.PostgreSql - name: githubRepositoryName value: akkadotnet/Akka.Persistence.PostgreSql + steps: - task: UseDotNet@2 displayName: 'Use .NET 7' inputs: version: '7.x' + - task: BatchScript@1 displayName: 'FAKE Build' inputs: diff --git a/build.fsx b/build.fsx index 2f61533..6d425d9 100644 --- a/build.fsx +++ b/build.fsx @@ -46,7 +46,7 @@ let versionSuffix = // Configuration values for tests let testNetFrameworkVersion = "net48" let testNetVersion = "net7.0" - + printfn "Assembly version: %s\nNuget version; %s\n" releaseNotes.AssemblyVersion releaseNotes.NugetVersion //-------------------------------------------------------------------------------- @@ -75,19 +75,19 @@ Target "Clean" (fun _ -> Target "RestorePackages" (fun _ -> DotNetCli.Restore - (fun p -> + (fun p -> { p with Project = solution NoCache = true }) ) //-------------------------------------------------------------------------------- -// Generate AssemblyInfo files with the version for release notes +// Generate AssemblyInfo files with the version for release notes //-------------------------------------------------------------------------------- Target "AssemblyInfo" (fun _ -> - XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion - XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n") + XmlPokeInnerText "./src/Directory.Generated.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion + XmlPokeInnerText "./src/Directory.Generated.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n") ) //-------------------------------------------------------------------------------- @@ -95,16 +95,16 @@ Target "AssemblyInfo" (fun _ -> //-------------------------------------------------------------------------------- Target "Build" (fun _ -> - let additionalArgs = if versionSuffix.Length > 0 then [sprintf "/p:VersionSuffix=%s" versionSuffix] else [] + let additionalArgs = if versionSuffix.Length > 0 then [sprintf "/p:VersionSuffix=%s" versionSuffix] else [] let projects = !! "./**/*.csproj" let runSingleProject project = DotNetCli.Build - (fun p -> + (fun p -> { p with Project = project - Configuration = configuration + Configuration = configuration AdditionalArgs = additionalArgs }) projects |> Seq.iter (runSingleProject) @@ -177,18 +177,18 @@ Target "RunTestsNet" <| fun _ -> projects |> Seq.iter (runSingleProject) //-------------------------------------------------------------------------------- -// Nuget targets +// Nuget targets //-------------------------------------------------------------------------------- -Target "CreateNuget" (fun _ -> +Target "CreateNuget" (fun _ -> CreateDir outputNuGet // need this to stop Azure pipelines copy stage from error-ing out - let projects = !! "src/**/*.csproj" + let projects = !! "src/**/*.csproj" -- "src/**/*Tests.csproj" // Don't publish unit tests -- "src/**/*Tests*.csproj" let runSingleProject project = DotNetCli.Pack - (fun p -> + (fun p -> { p with Project = project Configuration = configuration @@ -210,8 +210,8 @@ Target "PublishNuget" (fun _ -> if (not (source = "") && not (apiKey = "") && shouldPublishSymbolsPackages) then let runSingleProject project = DotNetCli.RunCommand - (fun p -> - { p with + (fun p -> + { p with TimeOut = TimeSpan.FromMinutes 10. }) (sprintf "nuget push %s --api-key %s --source %s --symbol-source %s" project apiKey source symbolSource) @@ -219,8 +219,8 @@ Target "PublishNuget" (fun _ -> else if (not (source = "") && not (apiKey = "") && not shouldPublishSymbolsPackages) then let runSingleProject project = DotNetCli.RunCommand - (fun p -> - { p with + (fun p -> + { p with TimeOut = TimeSpan.FromMinutes 10. }) (sprintf "nuget push %s --api-key %s --source %s" project apiKey source) @@ -237,7 +237,7 @@ FinalTarget "KillCreatedProcesses" (fun _ -> ) //-------------------------------------------------------------------------------- -// Help +// Help //-------------------------------------------------------------------------------- Target "Help" <| fun _ -> @@ -252,9 +252,9 @@ Target "Help" <| fun _ -> " * All Builds, run tests, creates and optionally publish nuget packages" "" " Other Targets" - " * Help Display this help" - " * HelpNuget Display help about creating and pushing nuget packages" - " * HelpDocs Display help about creating and pushing API docs" + " * Help Display this help" + " * HelpNuget Display help about creating and pushing nuget packages" + " * HelpDocs Display help about creating and pushing API docs" ""] Target "HelpNuget" <| fun _ -> diff --git a/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj b/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj index 1855fa4..3be9303 100644 --- a/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj +++ b/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj @@ -16,5 +16,4 @@ - diff --git a/src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj b/src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj index 0b80e25..e9457d8 100644 --- a/src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj +++ b/src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj @@ -20,5 +20,4 @@ $(DefineConstants);RELEASE - diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ddd0a76..754af02 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,30 +1,31 @@ + + Copyright © 2013-2023 Akka.NET Team Akka.NET Team - 1.4.46 http://getakka.net/images/akkalogo.png https://github.com/akkadotnet/Akka.Persistence.PostgreSql https://github.com/akkadotnet/Akka.Persistence.PostgreSql/blob/dev/LICENSE.md akka;actors;actor model;Akka;concurrency;Postgres;PostgreSql + $(NoWarn);CS1591 + - 2.4.2 - 2.4.5 + netstandard2.0 + net7.0 + net48 + 1.5.1 5.0.11 7.0.2 [$(PostgresLowVersion), $(PostgresHighVersion)] - netstandard2.0 + 17.4.1 - net7.0 - net48 - - - [Update Akka.NET to v1.4.46](https://github.com/akkadotnet/akka.net/releases/tag/1.4.46) -[Add `tag-column-size` HOCON setting to modify journal table Tags column size](https://github.com/akkadotnet/Akka.Persistence.PostgreSql/pull/167) + 2.4.2 + 2.4.5 diff --git a/src/Directory.Generated.props b/src/Directory.Generated.props new file mode 100644 index 0000000..e357310 --- /dev/null +++ b/src/Directory.Generated.props @@ -0,0 +1,6 @@ + + + 1.5.1.1 + [Update Npgsql to v7.0.2](https://github.com/akkadotnet/akka.net/releases/tag/1.5.1.1) + + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index cd8c41c..b16792c 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -2,26 +2,26 @@ true + - + - + - + - - + + - - - - - - \ No newline at end of file + + + + +