Merge pull request #767 from dolittle/dotnet8

.NET 8 hosting
dolittle · May 28, 2024 · 0ef324f · 0ef324f
2 parents 7c81944 + 8bfb9a9
commit 0ef324f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 29 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
       - name: Run Mongo container
         run: docker run -p 27017:27017 -d dolittle/mongodb:4.2.2
       - name: Run Benchmarks

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -17,8 +17,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
       - name: Run Mongo container
         run: docker run -p 27017:27017 -d dolittle/mongodb:4.2.2
       - name: Test
-        run: dotnet test --filter Tag=IntegrationTest --configuration Release
+        run: dotnet test --filter Tag=IntegrationTest -f net8.0 --configuration Release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
       - name: Run Mongo container
         run: docker run -p 27017:27017 -d dolittle/mongodb:4.2.2
       - name: Run Benchmarks
@@ -184,7 +184,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
       - name: Update VersionInfo
         uses: dolittle/update-version-info-action@v1
         with:
@@ -204,7 +204,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/osx-x64/publish/Dolittle.Runtime.CLI
+          asset_path: ./Source/CLI/bin/Release/net8.0/osx-x64/publish/Dolittle.Runtime.CLI
           asset_name: dolittle-macos-x64
           asset_content_type: application/octet-stream
       - name: Publish for macOS arm64
@@ -216,7 +216,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/osx.11.0-arm64/publish/Dolittle.Runtime.CLI
+          asset_path: ./Source/CLI/bin/Release/net8.0/osx.11.0-arm64/publish/Dolittle.Runtime.CLI
           asset_name: dolittle-macos-arm64
           asset_content_type: application/octet-stream
       - name: Publish for Windows x64
@@ -228,7 +228,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/win-x64/publish/Dolittle.Runtime.CLI.exe
+          asset_path: ./Source/CLI/bin/Release/net8.0/win-x64/publish/Dolittle.Runtime.CLI.exe
           asset_name: dolittle-win-x64.exe
           asset_content_type: application/octet-stream
       - name: Publish for Windows x86
@@ -240,7 +240,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/win-x86/publish/Dolittle.Runtime.CLI.exe
+          asset_path: ./Source/CLI/bin/Release/net8.0/win-x86/publish/Dolittle.Runtime.CLI.exe
           asset_name: dolittle-win-x86.exe
           asset_content_type: application/octet-stream
       - name: Publish for Windows arm64
@@ -252,7 +252,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/win-arm64/publish/Dolittle.Runtime.CLI.exe
+          asset_path: ./Source/CLI/bin/Release/net8.0/win-arm64/publish/Dolittle.Runtime.CLI.exe
           asset_name: dolittle-win-arm64.exe
           asset_content_type: application/octet-stream
       - name: Publish for Windows arm
@@ -264,7 +264,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/win-arm/publish/Dolittle.Runtime.CLI.exe
+          asset_path: ./Source/CLI/bin/Release/net8.0/win-arm/publish/Dolittle.Runtime.CLI.exe
           asset_name: dolittle-win-arm.exe
           asset_content_type: application/octet-stream
       - name: Publish for Linux x64
@@ -276,7 +276,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/linux-x64/publish/Dolittle.Runtime.CLI
+          asset_path: ./Source/CLI/bin/Release/net8.0/linux-x64/publish/Dolittle.Runtime.CLI
           asset_name: dolittle-linux-x64
           asset_content_type: application/octet-stream
       - name: Publish for Linux arm64
@@ -288,7 +288,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/linux-arm64/publish/Dolittle.Runtime.CLI
+          asset_path: ./Source/CLI/bin/Release/net8.0/linux-arm64/publish/Dolittle.Runtime.CLI
           asset_name: dolittle-linux-arm64
           asset_content_type: application/octet-stream
       - name: Publish for Linux arm
@@ -300,6 +300,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.setup.outputs.release-upload-url }}
-          asset_path: ./Source/CLI/bin/Release/net7.0/linux-arm/publish/Dolittle.Runtime.CLI
+          asset_path: ./Source/CLI/bin/Release/net8.0/linux-arm/publish/Dolittle.Runtime.CLI
           asset_name: dolittle-linux-arm
           asset_content_type: application/octet-stream
diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml
@@ -14,11 +14,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
       - name: Build
-        run: dotnet build --configuration Release
+        run: dotnet build --configuration Release -f net8.0
       - name: Test
-        run: dotnet test --filter Tag!=IntegrationTest --no-build --configuration Release --collect:"XPlat Code Coverage"
+        run: dotnet test --filter Tag!=IntegrationTest --no-build -f net8.0 --configuration Release --collect:"XPlat Code Coverage"
 
   build-prod-docker-image:
     name: Build Production Docker Image

diff --git a/Docker/Development/Dockerfile b/Docker/Development/Dockerfile
@@ -1,5 +1,5 @@
 # DotNet Build
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS dotnet-build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS dotnet-build
 SHELL ["/bin/bash", "-c"]
 ARG VERSION
 ARG TARGETARCH
@@ -12,7 +12,7 @@ COPY Specifications /app/Specifications/
 
 WORKDIR /app/Source/Server
 RUN dotnet restore
-RUN dotnet publish -c "Release" -p:Version=${VERSION} -p:RuntimeIdentifier="linux-${TARGETARCH/amd64/x64}" -o out
+RUN dotnet publish -c "Release" -p:Version=${VERSION} -f net7.0 -p:RuntimeIdentifier="linux-${TARGETARCH/amd64/x64}" -o out
 
 # Runtime Image
 FROM mcr.microsoft.com/dotnet/aspnet:7.0

diff --git a/Docker/Production/Dockerfile b/Docker/Production/Dockerfile
@@ -1,5 +1,5 @@
 # DotNet Build
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS dotnet-build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS dotnet-build
 SHELL ["/bin/bash", "-c"]
 ARG VERSION
 ARG TARGETARCH
@@ -12,10 +12,10 @@ COPY Specifications /app/Specifications/
 
 WORKDIR /app/Source/Server
 RUN dotnet restore
-RUN dotnet publish -c "Release" -p:Version=${VERSION} -p:RuntimeIdentifier="linux-${TARGETARCH/amd64/x64}" -o out
+RUN dotnet publish -c "Release" -p:Version=${VERSION} -f net8.0 -p:RuntimeIdentifier="linux-${TARGETARCH/amd64/x64}" -o out
 
 # Runtime Image
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 SHELL ["/bin/bash", "-c"]
 
 ENV Logging__Console__FormatterName=""

diff --git a/Source/CLI/CLI.csproj b/Source/CLI/CLI.csproj
@@ -5,7 +5,7 @@
         <AssemblyName>Dolittle.Runtime.CLI</AssemblyName>
         <RootNamespace>Dolittle.Runtime.CLI</RootNamespace>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>dolittle</ToolCommandName>

diff --git a/Source/Events.Store.MongoDB/Development/MongoDB/Dockerfile b/Source/Events.Store.MongoDB/Development/MongoDB/Dockerfile
@@ -1,5 +1,5 @@
-FROM mongo:4.2.2-bionic
+FROM mongo:7.0
 
 COPY replicaset-initiate.js /docker-entrypoint-initdb.d/
 
-CMD ["mongod", "--replSet", "rs0"]
+CMD ["mongod", "--replSet", "rs0"]
diff --git a/default.props b/default.props
@@ -2,7 +2,7 @@
     <Import Project="versions.props"/>
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
         <NoWarn>$(NoWarn);SYSLIB1002;SYSLIB1006;SYSLIB1007</NoWarn>
         <Nullable>enable</Nullable>

diff --git a/specs.props b/specs.props
@@ -2,7 +2,7 @@
     <Import Project="versions.props"/>
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <IsTestProject>true</IsTestProject>
         <NoWarn>IDE1006;IDE0044;IDE0051;IDE0052;CA2211;CS0612;CS0169;CS8981;RCS1169;RCS1018;RCS1213</NoWarn>
     </PropertyGroup>

diff --git a/tests.props b/tests.props
@@ -2,9 +2,8 @@
     <Import Project="versions.props"/>
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsTestProject>true</IsTestProject>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>