chore(deps): updated to .NET 8

miracum · Nov 19, 2023 · 12ca17f · 12ca17f
1 parent fd43e19
commit 12ca17f
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 28 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,7 +11,7 @@ insert_final_newline = true
 charset = utf-8
 
 [packages.lock.json]
-insert_final_newline = false
+insert_final_newline = unset
 
 [*.sh]
 end_of_line = lf

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -132,25 +132,17 @@ jobs:
       - name: List images in cluster
         run: docker exec kind-control-plane crictl images
 
-      - name: Install the latest version of vfps as a pseudonymization service
-        run: |
-          helm repo add chgl https://chgl.github.io/charts
-          helm install \
-            --wait \
-            --timeout=10m \
-            vfps chgl/vfps
-
       - name: Install "fhir-pseudonymizer"
         env:
           IMAGE_TAG: ${{ needs.build.outputs.image-version }}
         run: |
-          helm repo add miracum https://miracum.github.io/charts
           helm install \
             --set="image.tag=${IMAGE_TAG}" \
             -f tests/iter8/values.yaml \
             --wait \
             --timeout=10m \
-            fhir-pseudonymizer miracum/fhir-pseudonymizer
+            fhir-pseudonymizer \
+            oci://ghcr.io/miracum/charts/fhir-pseudonymizer
 
       - name: Launch iter8 experiment
         run: kubectl apply -f tests/iter8/experiment.yaml
@@ -168,6 +160,7 @@ jobs:
           iter8 k report -o html > iter8-report.html
 
       - name: Enhance iter8 report output for use as a PR comment
+        if: always()
         run: |
           ITER8_REPORT_TXT=$(cat iter8-report.txt)
           {
@@ -180,7 +173,7 @@ jobs:
 
       - name: Append sticky comment with iter8 report
         uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd # v2.8.0
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ always() && github.event_name == 'pull_request' }}
         with:
           append: true
           path: iter8-output.md

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/FhirPseudonymizer/bin/Debug/net7.0/FhirPseudonymizer.dll",
+      "program": "${workspaceFolder}/src/FhirPseudonymizer/bin/Debug/net8.0/FhirPseudonymizer.dll",
       "args": [],
       "cwd": "${workspaceFolder}/src/FhirPseudonymizer",
       "stopAtEntry": false,

diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,14 @@
 # kics false positive "Missing User Instruction": <https://docs.kics.io/latest/queries/dockerfile-queries/fd54f200-402c-4333-a5a4-36ef6709af2f/>
 # kics-scan ignore-line
-FROM mcr.microsoft.com/dotnet/nightly/aspnet:7.0-jammy-chiseled@sha256:69939a0d38045392ed57c79715c1ed63f1b3d5a0a552a153e5c538a5188b9547 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.0-jammy-chiseled@sha256:2f9b3da0c3de6b0db88a0f53356dd7022ce983609a3255aeefaf617c5ed32fa7 AS runtime
 WORKDIR /opt/fhir-pseudonymizer
 EXPOSE 8080/tcp 8081/tcp
 USER 65532:65532
 ENV ASPNETCORE_ENVIRONMENT="Production" \
     DOTNET_CLI_TELEMETRY_OPTOUT=1 \
     ASPNETCORE_URLS="http://*:8080"
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy@sha256:6c413812cb79c6a7813129e810c324b2576623585c7fcfbc9784a51671b0eda8 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-jammy@sha256:8e5c292d546c5b2c35af8aba02617b4d242894270c465fe6b8fbd9668faad6b8 AS build
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 WORKDIR /build
 COPY src/FhirPseudonymizer/FhirPseudonymizer.csproj .

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <LangVersion>11.0</LangVersion>
-        <!-- <Nullable>enable</Nullable> -->
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>12.0</LangVersion>
+        <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <AnalysisLevel>latest</AnalysisLevel>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>

diff --git a/src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj b/src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AnalysisLevel>latest</AnalysisLevel>

diff --git a/src/FhirPseudonymizer.Tests/FhirPseudonymizer.Tests.csproj b/src/FhirPseudonymizer.Tests/FhirPseudonymizer.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
-    <!-- <Nullable>enable</Nullable> -->
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>12.0</LangVersion>
+    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AnalysisLevel>latest</AnalysisLevel>
     <IsPackable>false</IsPackable>

diff --git a/src/FhirPseudonymizer/FhirPseudonymizer.csproj b/src/FhirPseudonymizer/FhirPseudonymizer.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
-    <!-- <Nullable>enable</Nullable> -->
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>12.0</LangVersion>
+    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AnalysisLevel>latest</AnalysisLevel>
     <UserSecretsId>74fd5f09-6f06-4b68-8c73-152e215728ff</UserSecretsId>

diff --git a/src/FhirPseudonymizer/packages.lock.json b/src/FhirPseudonymizer/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0": {
+    "net8.0": {
       "AspNetCore.Authentication.ApiKey": {
         "type": "Direct",
         "requested": "[7.0.0, )",
@@ -554,4 +554,4 @@
       }
     }
   }
-}
+}