Skip to content

Merge master into develop branch #206

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

Merged
baynezy merged 3 commits into from
Jun 6, 2025
Merged

Merge master into develop branch #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dddbc7
Upgrade to .Net 9
baynezy Jun 6, 2025
81e375b
Bump Version to 1.1.1.16
Jun 6, 2025
23e59d3
Merge pull request #205 from Afterlife-Guide/hotfix/issue-204-upgrade…
baynezy Jun 6, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/step-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x
- name: Restore
uses: cake-build/cake-action@v3
with:
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.1.1.16] - 2025-06-06

### Fixed

- Upgraded to .Net 9 as the latest Docker image was not compatible with .Net 8. (#204)

## [1.1.0.12] - 2025-06-05

### Fixed
Expand Down Expand Up @@ -43,7 +49,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [0.1.0.1] - 2024-03-22

[unreleased]: https://github.com/Afterlife-Guide/SemVer.Action/compare/1.1.0.12...HEAD
[unreleased]: https://github.com/Afterlife-Guide/SemVer.Action/compare/1.1.1.16...HEAD
[1.1.1.16]: https://github.com/Afterlife-Guide/SemVer.Action/compare/1.1.0.12...1.1.1.16
[1.1.0.12]: https://github.com/Afterlife-Guide/SemVer.Action/compare/1.0.9.11...1.1.0.12
[1.0.9.11]: https://github.com/Afterlife-Guide/SemVer.Action/compare/1.0.8.10...1.0.9.11
[1.0.8.10]: https://github.com/Afterlife-Guide/SemVer.Action/compare/1.0.7.9...1.0.8.10
Expand Down
2 changes: 1 addition & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ outputs:
description: 'The full version number'
runs:
using: 'docker'
image: 'docker://ghcr.io/afterlife-guide/semver.action:1.1.0.12'
image: 'docker://ghcr.io/afterlife-guide/semver.action:1.1.1.16'
args:
- ${{ (inputs.major-version == '0' && inputs.minor-version == '0' && inputs.patch-version == '0' && inputs.build-version == '0') && 'read' || 'write' }}
- '-p'
Expand Down
2 changes: 1 addition & 1 deletion semver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"major":"1","minor":"1","patch":"0","build":"12"}
{"major":"1","minor":"1","patch":"1","build":"16"}
4 changes: 2 additions & 2 deletions src/SemVer.Json/SemVer.Json.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions test/SemVer.Json.UnitTests/SemVer.Json.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Loading