Skip to content

Commit

Permalink
Merge pull request #71 from Afterlife-Guide/master
Browse files Browse the repository at this point in the history
Merge master into develop branch
  • Loading branch information
baynezy authored Apr 4, 2024
2 parents c2b3d0d + 63d7b0a commit 0783c25
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.2.1.6] - 2024-04-04

## [0.2.0.6] - 2024-04-04

## [0.1.4.5] - 2024-03-06

## [0.1.3.4] - 2023-11-17

[Unreleased]: https://github.com/Afterlife-Guide/AppSettings.Merge/compare/0.1.4.5...HEAD
[Unreleased]: https://github.com/Afterlife-Guide/AppSettings.Merge/compare/0.2.1.6...HEAD

[0.2.1.6]: https://github.com/Afterlife-Guide/AppSettings.Merge/compare/0.2.0.6...0.2.1.6

[0.2.0.6]: https://github.com/Afterlife-Guide/AppSettings.Merge/compare/0.1.4.5...0.2.0.6

[0.1.4.5]: https://github.com/Afterlife-Guide/AppSettings.Merge/compare/0.1.3.4...0.1.4.5

Expand Down
7 changes: 1 addition & 6 deletions semver.json
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
{
"major": "0",
"minor": "1",
"patch": "4",
"build": "5"
}
{"major":"0","minor":"2","patch":"1","build":"6"}
2 changes: 1 addition & 1 deletion src/BlazorMerge/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copy everything and publish the release (publish implicitly restores and builds)
WORKDIR /app
COPY . ./
RUN dotnet publish ./BlazorMerge.csproj -c Release -o out --no-self-contained
RUN dotnet publish ./src/BlazorMerge/BlazorMerge.csproj -c Release -o out --no-self-contained

FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine
COPY --from=build-env /app/out .
Expand Down

0 comments on commit 0783c25

Please sign in to comment.