Skip to content

Commit

Permalink
Merge branch '7.2.x' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
6bee committed Jul 10, 2024
2 parents 7f5b008 + ebaf2aa commit d60f95c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Extract version from tag
uses: nowsprinting/check-version-format-action@v3
uses: nowsprinting/check-version-format-action@v4
id: version
with:
prefix: 'v'
Expand All @@ -23,12 +23,12 @@ jobs:
exit 1
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Mandatory to use exact version from tag action

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

Expand Down Expand Up @@ -56,14 +56,14 @@ jobs:
run: dotnet test Remote.Linq.sln -c Release /bl

- name: Upload build log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: msbuild_log
path: msbuild.binlog
if-no-files-found: error

- name: Upload packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nuget_packages
path: artifacts
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Security

## [7.2.1][7.2.1] - 2024-07-10

### Security

- Bump _aqua-core_ from 5.4.0 to 5.4.1 ([CVE-2024-30105][CVE-2024-30105])

## [7.2.0][7.2.0] - 2024-06-04

### Added
Expand Down Expand Up @@ -108,8 +114,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Dropped unused dependency on _System.Runtime.Serialization.Formatters_.

[vnext-unreleased]: https://github.com/6bee/Remote.Linq/compare/7.2.0...main
[7.2.0]: https://github.com/6bee/Remote.Linq/compare/7.1.0...7.2.0
[vnext-unreleased]: https://github.com/6bee/Remote.Linq/compare/v7.2.1...main
[7.2.1]: https://github.com/6bee/Remote.Linq/compare/v7.2.0...v7.2.1
[7.2.0]: https://github.com/6bee/Remote.Linq/compare/7.1.0...v7.2.0
[7.1.0]: https://github.com/6bee/Remote.Linq/compare/7.0.0...7.1.0
[7.0.0]: https://github.com/6bee/Remote.Linq/compare/6.3.1...7.0.0
[6.3.1]: https://github.com/6bee/Remote.Linq/compare/6.3.0...6.3.1
Expand All @@ -124,3 +131,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[nullable-references]: https://docs.microsoft.com/en-us/dotnet/csharp/nullable-references
[protobuf-net-v2]: https://www.nuget.org/packages/protobuf-net/2.4.6
[syslib0050]: https://learn.microsoft.com/en-us/dotnet/fundamentals/syslib-diagnostics/syslib0050
[CVE-2024-30105]: https://github.com/advisories/GHSA-hh2w-p6rv-4g7w
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<MinorVersion>3</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseLabel>dev</PreReleaseLabel>
<AquaCoreVersion>5.4.0</AquaCoreVersion>
<AquaCoreVersion>5.4.1</AquaCoreVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down

0 comments on commit d60f95c

Please sign in to comment.