diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index beb5246..fab9a6c 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,11 +3,11 @@
"isRoot": true,
"tools": {
"csharpier": {
- "version": "0.27.3",
+ "version": "0.28.2",
"commands": ["dotnet-csharpier"]
},
"dotnet-outdated-tool": {
- "version": "4.6.0",
+ "version": "4.6.1",
"commands": ["dotnet-outdated"]
}
}
diff --git a/Dockerfile b/Dockerfile
index cafbbc7..a898f9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# kics false positive "Missing User Instruction":
# kics-scan ignore-line
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-jammy-chiseled@sha256:39f85ed7906df32eef6798d7d50ff54564248cfa9ef8581219f4351fcfa09a4c AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.4-jammy-chiseled@sha256:7b5bcc1f9e624de326b3b6878aafa0d723a2cea2fa832b6101caa877406bd082 AS runtime
WORKDIR /opt/fhir-server-exporter
EXPOSE 9797/tcp
USER 65532:65532
@@ -9,7 +9,7 @@ ENV ASPNETCORE_ENVIRONMENT="Production" \
ASPNETCORE_URLS="http://*:9797" \
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-FROM mcr.microsoft.com/dotnet/sdk:8.0.203-jammy@sha256:c2c75cb385be90e8ade1dbe44cbb5a6195b7dbbe3386772da8b17fd0277a3d5f AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.204-jammy@sha256:803a3c537eea993def381da9ab9f57b59a6306bdf54c6cdaeae11b3b6af6072e AS build
WORKDIR "/build"
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/hack/compose.yaml b/hack/compose.yaml
index 46cabac..d29df09 100644
--- a/hack/compose.yaml
+++ b/hack/compose.yaml
@@ -1,6 +1,6 @@
services:
prometheus:
- image: quay.io/prometheus/prometheus:v2.51.1@sha256:dec2018ae55885fed717f25c289b8c9cff0bf5fbb9e619fb49b6161ac493c016
+ image: quay.io/prometheus/prometheus:v2.51.2@sha256:4f6c47e39a9064028766e8c95890ed15690c30f00c4ba14e7ce6ae1ded0295b1
ports:
- "127.0.0.1:9090:9090"
volumes:
@@ -14,7 +14,7 @@ services:
- "127.0.0.1:8082:8080"
keycloak:
- image: quay.io/keycloak/keycloak:24.0.2@sha256:b8a3f00fc433f2999bc304b73df331e2005037e8f5673f644f9c0eacd5fbe048
+ image: quay.io/keycloak/keycloak:24.0.3@sha256:0d71412ed56b5f66f7e922efc0c3ff73b3f54ba2fe84fedb5e281a1f90b95bd6
environment:
KEYCLOAK_ADMIN: admin
# kics-scan ignore-line
diff --git a/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj b/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj
index 301a733..1db5c3f 100644
--- a/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj
+++ b/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj
@@ -1,12 +1,12 @@
-
-
+
+
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -14,11 +14,11 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj b/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj
index 2c88e8d..2e5b14a 100644
--- a/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj
+++ b/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj
@@ -1,11 +1,11 @@
-
-
+
+
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -17,11 +17,11 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/FhirServerExporter/FhirServerExporter.csproj b/src/FhirServerExporter/FhirServerExporter.csproj
index ff91216..a712785 100644
--- a/src/FhirServerExporter/FhirServerExporter.csproj
+++ b/src/FhirServerExporter/FhirServerExporter.csproj
@@ -8,17 +8,17 @@
-
+
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/FhirServerExporter/packages.lock.json b/src/FhirServerExporter/packages.lock.json
index b9c70e5..52e498c 100644
--- a/src/FhirServerExporter/packages.lock.json
+++ b/src/FhirServerExporter/packages.lock.json
@@ -4,9 +4,9 @@
"net8.0": {
"Duende.AccessTokenManagement": {
"type": "Direct",
- "requested": "[2.1.1, )",
- "resolved": "2.1.1",
- "contentHash": "ML0bYkzGr6ZM1uVcc48q+ndDF0v86wjaOGiSgZA9chnqjp+GYjGuYlHLA41keTh+dilbkjhhA9/8nEfIy5Ug1w==",
+ "requested": "[2.1.2, )",
+ "resolved": "2.1.2",
+ "contentHash": "CGcDOaqzA+4IjoU5d5Yhx1JTz+o2I73aBtpOOq2zMJiKNrMunTkNT73yEQen1n34mqA1PU6SrzrIA+txw+rJZw==",
"dependencies": {
"IdentityModel": "6.2.0",
"Microsoft.Extensions.Caching.Abstractions": "8.0.0",
@@ -19,18 +19,18 @@
},
"Hl7.Fhir.R4": {
"type": "Direct",
- "requested": "[5.7.0, )",
- "resolved": "5.7.0",
- "contentHash": "SdKwjECjT5yR3kb1uu+YERpptoYObTOMMlcTVUF7DNq316nrlH8Uxtj2lB0xJVqo//eRjKE3ALkf9LYoMgveGA==",
+ "requested": "[5.8.0, )",
+ "resolved": "5.8.0",
+ "contentHash": "qKvnDuMHfE2zVY5j1HAjGjoDQCm4mTsiZbvd4R3fEAefuZdkZ7y1BK0RRURwVc/vZKDwSOyzf0C+Rzj4RSDDzw==",
"dependencies": {
- "Hl7.Fhir.Conformance": "5.7.0"
+ "Hl7.Fhir.Conformance": "5.8.0"
}
},
"Meziantou.Analyzer": {
"type": "Direct",
- "requested": "[2.0.146, )",
- "resolved": "2.0.146",
- "contentHash": "pJ3k+3UjD2WwPsZR7fkgVYviXP3PCQM0hjwN1TuM4C0u1TuGKC9WdZCo0RAPZ+azhRPmYGSUjkjsN2fkQByghQ=="
+ "requested": "[2.0.150, )",
+ "resolved": "2.0.150",
+ "contentHash": "rXKN4/Cf58Pv7uUWk4wcZtY+J9mve6wA1BHGYAf9SlpmiayA5fJ4wK2lflIwAkVo8n8HyNCeY3Ej4jwCdLk5nA=="
},
"Microsoft.Extensions.Caching.Memory": {
"type": "Direct",
@@ -98,9 +98,9 @@
},
"Roslynator.Analyzers": {
"type": "Direct",
- "requested": "[4.12.0, )",
- "resolved": "4.12.0",
- "contentHash": "0n7hlgpD57vKCC39iz6lLg6RIgPF6B2S0z7HzcRSkeu35svFKSGqKJhh2MfCsoHrrPMugnlMZI9NZwrkFPTqYA=="
+ "requested": "[4.12.2, )",
+ "resolved": "4.12.2",
+ "contentHash": "6gLnu303OyuBwOjd3QFKG3wEmbRPXKfVHRKLkZB6lDs5Ik8mfBGVoCIVN86HAQcbZI5KQD5dY3HEie0ScoeEag=="
},
"StyleCop.Analyzers": {
"type": "Direct",
@@ -118,8 +118,8 @@
},
"Hl7.Fhir.Base": {
"type": "Transitive",
- "resolved": "5.7.0",
- "contentHash": "AVjBaCptrDvLDoB6EU0N9Hu1K0WgogDr9/Qyy/4q+MLZkWImNIXERr5UQSEeJaOX/qVdwl3k2HUTROmThLc0ng==",
+ "resolved": "5.8.0",
+ "contentHash": "5TK7iLXyl8IVk4mDkRJaDU+d+vGrHWUANEw5n6Pl26jRgtkRxSK3hGU6CG9IfSRO6uZN+27yrcVNagk+BYboSg==",
"dependencies": {
"Fhir.Metrics": "1.2.2",
"Newtonsoft.Json": "13.0.3",
@@ -129,10 +129,10 @@
},
"Hl7.Fhir.Conformance": {
"type": "Transitive",
- "resolved": "5.7.0",
- "contentHash": "Ikfi8adY1NF8N++Q+ufZw/WUGy4Aqau7Ol4t1rF1J9eTcsRYJNEGlUhdeaEoM2Q0j097mZntHaG0jnV/GY7ELQ==",
+ "resolved": "5.8.0",
+ "contentHash": "Rg7uGzyt2Ji1BO0rwo57Rq48fvb8nqnsx2v37x9KAngM8Hv+yzMAZTmYio7jxpxzf349ohR9PObzHbfmuIUqSg==",
"dependencies": {
- "Hl7.Fhir.Base": "5.7.0"
+ "Hl7.Fhir.Base": "5.8.0"
}
},
"IdentityModel": {