Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: prepare 1.5.1.1 release #191

Merged
merged 1 commit into from
Mar 22, 2023
Merged

feat: prepare 1.5.1.1 release #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>

<packageSources>
<clear/>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>

<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>

<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
12 changes: 11 additions & 1 deletion build-system/azure-pipeline.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,23 +52,27 @@ 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:
sourceFolder: ${{ parameters.outputDirectory }}
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'
Expand Down
3 changes: 3 additions & 0 deletions build-system/windows-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ trigger:
branches:
include:
- refs/tags/*

pr: none

variables:
Expand All @@ -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:
Expand Down
40 changes: 20 additions & 20 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

//--------------------------------------------------------------------------------
Expand Down Expand Up @@ -75,36 +75,36 @@ 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")
)

//--------------------------------------------------------------------------------
// Build the solution
//--------------------------------------------------------------------------------

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)
Expand Down Expand Up @@ -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
Expand All @@ -210,17 +210,17 @@ 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)

projects |> Seq.iter (runSingleProject)
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)

Expand All @@ -237,7 +237,7 @@ FinalTarget "KillCreatedProcesses" (fun _ ->
)

//--------------------------------------------------------------------------------
// Help
// Help
//--------------------------------------------------------------------------------

Target "Help" <| fun _ ->
Expand All @@ -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 _ ->
Expand Down
1 change: 0 additions & 1 deletion src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@
<ItemGroup>
<ProjectReference Include="..\Akka.Persistence.PostgreSql\Akka.Persistence.PostgreSql.csproj" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
21 changes: 11 additions & 10 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Generated.props', '$(MSBuildThisFileDirectory)'))" />

<PropertyGroup>
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
<Authors>Akka.NET Team</Authors>
<VersionPrefix>1.4.46</VersionPrefix>
<PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/akkadotnet/Akka.Persistence.PostgreSql</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/akkadotnet/Akka.Persistence.PostgreSql/blob/dev/LICENSE.md</PackageLicenseUrl>
<PackageTags>akka;actors;actor model;Akka;concurrency;Postgres;PostgreSql</PackageTags>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<XunitVersion>2.4.2</XunitVersion>
<XunitRunnerVersion>2.4.5</XunitRunnerVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
<NetCoreTestVersion>net7.0</NetCoreTestVersion>
<NetFrameworkTestVersion>net48</NetFrameworkTestVersion>

<AkkaVersion>1.5.1</AkkaVersion>
<PostgresLowVersion>5.0.11</PostgresLowVersion>
<PostgresHighVersion>7.0.2</PostgresHighVersion>
<PostgresVersion>[$(PostgresLowVersion), $(PostgresHighVersion)]</PostgresVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>

<TestSdkVersion>17.4.1</TestSdkVersion>
<NetCoreTestVersion>net7.0</NetCoreTestVersion>
<NetFrameworkTestVersion>net48</NetFrameworkTestVersion>
</PropertyGroup>
<PropertyGroup>
<PackageReleaseNotes>[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)</PackageReleaseNotes>
<XunitVersion>2.4.2</XunitVersion>
<XunitRunnerVersion>2.4.5</XunitRunnerVersion>
</PropertyGroup>
</Project>
6 changes: 6 additions & 0 deletions src/Directory.Generated.props
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this file for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's where FAKE writes the version number and release notes in. The "issue" is FAKE likes to overwrite and reformat the entire file when it writes into it. So this file is especially for FAKE, and is referenced from Build.Props (like I did in the Persistence Sql repo)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's referenced with:
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Generated.props', '$(MSBuildThisFileDirectory)'))" />

and FAKE writes to it with:

XmlPokeInnerText "./src/Directory.Generated.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
XmlPokeInnerText "./src/Directory.Generated.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>1.5.1.1</VersionPrefix>
<PackageReleaseNotes>[Update Npgsql to v7.0.2](https://github.com/akkadotnet/akka.net/releases/tag/1.5.1.1)</PackageReleaseNotes>
</PropertyGroup>
</Project>
22 changes: 11 additions & 11 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<!-- App dependencies -->
<ItemGroup>
<PackageVersion Include="Akka.Persistence.Sql.Common" Version="$(AkkaVersion)"/>
<PackageVersion Include="Akka.Persistence.Sql.Common" Version="$(AkkaVersion)" />
<PackageVersion Include="Npgsql" Version="$(PostgresVersion)" />
</ItemGroup>

<!-- Test dependencies -->
<!-- Test dependencies -->
<ItemGroup>
<PackageVersion Include="FluentAssertions" Version="6.10.0" />
<PackageVersion Include="FluentAssertions" Version="6.10.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageVersion Include="xunit" Version="$(XunitVersion)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageVersion Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
<PackageVersion Include="Akka.Persistence.Sql.TestKit" Version="$(AkkaVersion)"/>
<PackageVersion Include="Docker.DotNet" Version="3.125.13"/>
<PackageVersion Include="Akka.Persistence.Sql.TestKit" Version="$(AkkaVersion)" />
<PackageVersion Include="Docker.DotNet" Version="3.125.13" />
</ItemGroup>

<!-- SourceLink support for all Akka.NET projects -->
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>

</Project>
<!-- SourceLink support for all Akka.NET projects -->
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>