Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Commit

Permalink
running .NET Core 3.1 code on .NET 6
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaronontheweb committed May 5, 2022
1 parent 00a4a71 commit 273bec8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## [0.7.0] / 05 May 2022
- Running on .NET Core 3.1 version of the software (i.e. all code changes needed to make app .NET Core 3.1-compliant,) but .NET 6 runtime

## [0.6.2] / 05 May 2022
- Migrated to .NET Core 3.1 for comparison purposes
- Fixed bug with `/ready` checks always returning HTTP 500
Expand Down
4 changes: 2 additions & 2 deletions k8s/prod/services/prod-services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
emptyDir: {}
containers:
- name: frontend
image: akkalargescaleimages64b06635.azurecr.io/akkadotnet.frontend:0.6.2
image: akkalargescaleimages64b06635.azurecr.io/akkadotnet.frontend:0.7.0
env:
- name: POD_NAME
valueFrom:
Expand Down Expand Up @@ -207,7 +207,7 @@ spec:
emptyDir: {}
containers:
- name: backend
image: akkalargescaleimages64b06635.azurecr.io/akkadotnet.backend:0.6.2
image: akkalargescaleimages64b06635.azurecr.io/akkadotnet.backend:0.7.0
env:
- name: POD_NAME
valueFrom:
Expand Down
8 changes: 3 additions & 5 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
<PropertyGroup>
<Copyright>Copyright © 2022 Petabridge</Copyright>
<Authors>Petabridge</Authors>
<VersionPrefix>0.6.2</VersionPrefix>
<PackageReleaseNotes>• Migrated to .NET Core 3.1 for comparison purposes
• Fixed bug with /ready checks always returning HTTP 500
• Upgraded to Akka.Management 0.2.4-beta3</PackageReleaseNotes>
<VersionPrefix>0.7.0</VersionPrefix>
<PackageReleaseNotes>• Running on .NET Core 3.1 version of the software (i.e. all code changes needed to make app .NET Core 3.1-compliant%2C) but .NET 6 runtime</PackageReleaseNotes>
<PackageIconUrl>
</PackageIconUrl>
<PackageProjectUrl>
Expand All @@ -18,7 +16,7 @@
<None Include="$(MSBuildThisFileDirectory)\..\README.md" Pack="true" Visible="false" PackagePath="\" />
</ItemGroup>
<PropertyGroup>
<NetCoreFramework>netcoreapp3.1</NetCoreFramework>
<NetCoreFramework>net6.0</NetCoreFramework>
<NBenchVersion>1.2.2</NBenchVersion>
<XunitVersion>2.4.1</XunitVersion>
<TestSdkVersion>17.1.0</TestSdkVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/backend/AkkaDotNet.BackEnd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS base
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
WORKDIR /app

# important environment variables
Expand All @@ -18,9 +18,9 @@ RUN dotnet tool install --global pbm

# RUN pbm help

COPY ./bin/Release/netcoreapp3.1/publish/ /app
COPY ./bin/Release/net6.0/publish/ /app

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS app
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS app
WORKDIR /app

COPY --from=base /app /app
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/AkkaDotNet.FrontEnd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS base
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
WORKDIR /app

# important environment variables
Expand All @@ -18,9 +18,9 @@ RUN dotnet tool install --global pbm

# RUN pbm help

COPY ./bin/Release/netcoreapp3.1/publish/ /app
COPY ./bin/Release/net6.0/publish/ /app

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS app
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS app
WORKDIR /app

COPY --from=base /app /app
Expand Down

0 comments on commit 273bec8

Please sign in to comment.