diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 0e2694d..1201746 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
- "version": "0.30.2",
+ "version": "0.30.4",
"commands": ["dotnet-csharpier"]
},
"dotnet-outdated-tool": {
diff --git a/Dockerfile b/Dockerfile
index 18dd99d..c12babb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV ASPNETCORE_ENVIRONMENT="Production" \
ASPNETCORE_URLS="http://*:9797" \
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.100-noble@sha256:3bdd7f7fd595373d049c724f3a05ec8a8d9e27da05ba9cbe3ca6e0f3cc001e50 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.101-noble@sha256:991fd7c9c41fc12b47313bd2e1fb292c39e50fb50453ac11287b2877d3623d55 AS build
WORKDIR "/build"
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/hack/compose.yaml b/hack/compose.yaml
index 4ef3fce..356debf 100644
--- a/hack/compose.yaml
+++ b/hack/compose.yaml
@@ -14,7 +14,7 @@ services:
- "127.0.0.1:8082:8080"
keycloak:
- image: quay.io/keycloak/keycloak:26.0.6@sha256:a93d22e13b8641c683b7d5ccf6802a8ee177a21357ab7950228c7517ad1896c0
+ image: quay.io/keycloak/keycloak:26.0.7@sha256:4388e2379b7e870a447adbe7b80bd61f5fbf04e925832b19669fda4957f05a81
environment:
KEYCLOAK_ADMIN: admin
# kics-scan ignore-line
diff --git a/hack/k8s/load-sample-data.yaml b/hack/k8s/load-sample-data.yaml
index 62eb402..c3b7fb0 100644
--- a/hack/k8s/load-sample-data.yaml
+++ b/hack/k8s/load-sample-data.yaml
@@ -12,7 +12,7 @@ spec:
type: RuntimeDefault
initContainers:
- name: wait-for-fhir-server
- image: docker.io/curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba
+ image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
@@ -37,7 +37,7 @@ spec:
done;
containers:
- name: curl
- image: curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba
+ image: curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
diff --git a/hack/k8s/pods.yaml b/hack/k8s/pods.yaml
index 4f7f0f1..e659603 100644
--- a/hack/k8s/pods.yaml
+++ b/hack/k8s/pods.yaml
@@ -96,7 +96,7 @@ spec:
type: RuntimeDefault
initContainers:
- name: wait-for-fhir-server
- image: docker.io/curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba
+ image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
diff --git a/hack/k8s/test-job.yaml b/hack/k8s/test-job.yaml
index ce5ac54..cf08b00 100644
--- a/hack/k8s/test-job.yaml
+++ b/hack/k8s/test-job.yaml
@@ -11,7 +11,7 @@ spec:
type: RuntimeDefault
containers:
- name: curl
- image: curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba
+ image: curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
diff --git a/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj b/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj
index c23f0db..476de47 100644
--- a/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj
+++ b/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -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.E2E/packages.lock.json b/src/FhirServerExporter.Tests.E2E/packages.lock.json
index 734e90a..5303261 100644
--- a/src/FhirServerExporter.Tests.E2E/packages.lock.json
+++ b/src/FhirServerExporter.Tests.E2E/packages.lock.json
@@ -37,9 +37,9 @@
},
"Meziantou.Analyzer": {
"type": "Direct",
- "requested": "[2.0.182, )",
- "resolved": "2.0.182",
- "contentHash": "/QgftLQfuCwP7P9neBMYjfOoUEezFAhlCXAZudO27Q9JTQZilQ2qjLzYG4UD4FBlLNz7zTON0ca6lCzzf/zO5A=="
+ "requested": "[2.0.184, )",
+ "resolved": "2.0.184",
+ "contentHash": "+b96w2tVJNI9CR4naLcNFWfGDIwXheCO/3RsXkgq+hphqjIvLmXQM+5U4h7AZQbzTDFjXiulr4ws1L5/4xo0WQ=="
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
@@ -53,9 +53,9 @@
},
"Roslynator.Analyzers": {
"type": "Direct",
- "requested": "[4.12.9, )",
- "resolved": "4.12.9",
- "contentHash": "X6lDpN/D5wuinq37KIx+l3GSUe9No+8bCjGBTI5sEEtxapLztkHg6gzNVhMXpXw8P+/5gFYxTXJ5Pf8O4iNz/w=="
+ "requested": "[4.12.10, )",
+ "resolved": "4.12.10",
+ "contentHash": "Wecq3nfhTvnJPxX87hKbjMdX1xeCAMJf9rdBX3nQLTntQs9v0fFbUB2eQSSOArXMuFh7MxjLWaL4+b6XMi1NDA=="
},
"StyleCop.Analyzers": {
"type": "Direct",
@@ -68,14 +68,14 @@
},
"Testcontainers": {
"type": "Direct",
- "requested": "[4.0.0, )",
- "resolved": "4.0.0",
- "contentHash": "wLG4Ls/A4jNB7b2ZrhtCUCHFBinDXohgvZ54fJB+kLVkxrqSuyQHdKwlIwPLgLSVGfPaMIAkZOEFVDSoEa1VxA==",
+ "requested": "[4.1.0, )",
+ "resolved": "4.1.0",
+ "contentHash": "5oudr81h9084amKZrjVIWdVWycR2YhqT9ePnN/ID7xinwx3ZLAI4EhYiyurfrDMvWcHJp5+c9x+qPRxOcq1IXQ==",
"dependencies": {
- "Docker.DotNet": "3.125.15",
- "Docker.DotNet.X509": "3.125.15",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
- "SSH.NET": "2023.0.0",
+ "Docker.DotNet.Enhanced": "3.126.1",
+ "Docker.DotNet.Enhanced.X509": "3.126.1",
+ "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
+ "SSH.NET": "2024.1.0",
"SharpZipLib": "1.4.2"
}
},
@@ -104,22 +104,17 @@
"System.Diagnostics.EventLog": "6.0.0"
}
},
- "Docker.DotNet": {
+ "Docker.DotNet.Enhanced": {
"type": "Transitive",
- "resolved": "3.125.15",
- "contentHash": "XN8FKxVv8Mjmwu104/Hl9lM61pLY675s70gzwSj8KR5pwblo8HfWLcCuinh9kYsqujBkMH4HVRCEcRuU6al4BQ==",
- "dependencies": {
- "Newtonsoft.Json": "13.0.1",
- "System.Buffers": "4.5.1",
- "System.Threading.Tasks.Extensions": "4.5.4"
- }
+ "resolved": "3.126.1",
+ "contentHash": "UPyLBLBaVE3s7OCWM0h5g9w6mUOag5sOIP5CldFQekIWo/gHixgZR+o5fG7eCFH4ZdKlvBGM4ALFuOyPoKoJ3A=="
},
- "Docker.DotNet.X509": {
+ "Docker.DotNet.Enhanced.X509": {
"type": "Transitive",
- "resolved": "3.125.15",
- "contentHash": "ONQN7ImrL3tHStUUCCPHwrFFQVpIpE+7L6jaDAMwSF+yTEmeWBmRARQZDRuvfj/+WtB8RR0oTW0tT3qQMSyHOw==",
+ "resolved": "3.126.1",
+ "contentHash": "XFHMC/iWHbloQgg9apZrxu010DmSamaAggu8nomCqTeotGyUGkv2Tt/aqk1ljC/4tjtTrb9LtFQwYpwZbMbiKg==",
"dependencies": {
- "Docker.DotNet": "3.125.15"
+ "Docker.DotNet.Enhanced": "3.126.1"
}
},
"Fhir.Metrics": {
@@ -151,10 +146,18 @@
"resolved": "17.12.0",
"contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA=="
},
+ "Microsoft.Extensions.DependencyInjection.Abstractions": {
+ "type": "Transitive",
+ "resolved": "8.0.2",
+ "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg=="
+ },
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.4",
- "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
+ "resolved": "8.0.2",
+ "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==",
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+ }
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
@@ -190,27 +193,14 @@
},
"SSH.NET": {
"type": "Transitive",
- "resolved": "2023.0.0",
- "contentHash": "g+3VDUrYhm0sqSxmlQFgRFrmBxhQvVh4pfn4pqjkX7WXE3tTjt1tIsOtjuz3mz/5s8gFFQVRydwCJ7Ohs54sJA==",
- "dependencies": {
- "SshNet.Security.Cryptography": "[1.3.0]"
- }
- },
- "SshNet.Security.Cryptography": {
- "type": "Transitive",
- "resolved": "1.3.0",
- "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q=="
+ "resolved": "2024.1.0",
+ "contentHash": "pyOea9czgC+OwMoetuWtMuwRebOyskKkqTZtODgyEZ5K6JwV+Hh/GFiyYubl93YnEvmvNZeuyWyUDsb3LvBDYA=="
},
"StyleCop.Analyzers.Unstable": {
"type": "Transitive",
"resolved": "1.2.0.556",
"contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ=="
},
- "System.Buffers": {
- "type": "Transitive",
- "resolved": "4.5.1",
- "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
- },
"System.ComponentModel.Annotations": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -267,11 +257,6 @@
"System.Windows.Extensions": "6.0.0"
}
},
- "System.Threading.Tasks.Extensions": {
- "type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
- },
"System.Windows.Extensions": {
"type": "Transitive",
"resolved": "6.0.0",
diff --git a/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj b/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj
index fe0a085..1abf638 100644
--- a/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj
+++ b/src/FhirServerExporter.Tests/FhirServerExporter.Tests.csproj
@@ -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.Tests/packages.lock.json b/src/FhirServerExporter.Tests/packages.lock.json
index 28e9424..4c4ba6b 100644
--- a/src/FhirServerExporter.Tests/packages.lock.json
+++ b/src/FhirServerExporter.Tests/packages.lock.json
@@ -43,9 +43,9 @@
},
"Meziantou.Analyzer": {
"type": "Direct",
- "requested": "[2.0.182, )",
- "resolved": "2.0.182",
- "contentHash": "/QgftLQfuCwP7P9neBMYjfOoUEezFAhlCXAZudO27Q9JTQZilQ2qjLzYG4UD4FBlLNz7zTON0ca6lCzzf/zO5A=="
+ "requested": "[2.0.184, )",
+ "resolved": "2.0.184",
+ "contentHash": "+b96w2tVJNI9CR4naLcNFWfGDIwXheCO/3RsXkgq+hphqjIvLmXQM+5U4h7AZQbzTDFjXiulr4ws1L5/4xo0WQ=="
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
@@ -59,9 +59,9 @@
},
"Roslynator.Analyzers": {
"type": "Direct",
- "requested": "[4.12.9, )",
- "resolved": "4.12.9",
- "contentHash": "X6lDpN/D5wuinq37KIx+l3GSUe9No+8bCjGBTI5sEEtxapLztkHg6gzNVhMXpXw8P+/5gFYxTXJ5Pf8O4iNz/w=="
+ "requested": "[4.12.10, )",
+ "resolved": "4.12.10",
+ "contentHash": "Wecq3nfhTvnJPxX87hKbjMdX1xeCAMJf9rdBX3nQLTntQs9v0fFbUB2eQSSOArXMuFh7MxjLWaL4+b6XMi1NDA=="
},
"StyleCop.Analyzers": {
"type": "Direct",
@@ -99,18 +99,23 @@
},
"Duende.AccessTokenManagement": {
"type": "Transitive",
- "resolved": "3.0.1",
- "contentHash": "/9NfE/l6+wQIv4c2kOwQ35fxb2I8BEsdYUNWhuUrsliNhXiKiJ+fLKVUrqrbyab++wiaDxtz6KS/4R3a+DSIvw==",
+ "resolved": "3.1.1",
+ "contentHash": "iEyyshO3OyH9+KJr70eyiwUGcuYHwFolTykImbsF8F+8JhGiIGf88ZRpHyUNFNQRPrywMHk2sPJL2vsffRnGqw==",
"dependencies": {
- "IdentityModel": "7.0.0",
- "Microsoft.Extensions.Caching.Abstractions": "8.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
- "Microsoft.Extensions.Http": "8.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
- "Microsoft.Extensions.Options": "8.0.0",
- "System.IdentityModel.Tokens.Jwt": "7.1.2"
+ "Duende.IdentityModel": "7.0.0",
+ "Microsoft.Extensions.Caching.Abstractions": "9.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Http": "9.0.0",
+ "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Options": "9.0.0",
+ "System.IdentityModel.Tokens.Jwt": "[8.0.1, 9.0.0)"
}
},
+ "Duende.IdentityModel": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "h6xvWQi9bASgroNh+6Z/BpSUpKTy/sSuc2l4twi0igSY0X0z7Y8eYMGMHB7trwdT56EGlWeXLA6qAb8VOg8ATA=="
+ },
"Fhir.Metrics": {
"type": "Transitive",
"resolved": "1.3.0",
@@ -135,11 +140,6 @@
"Hl7.Fhir.Base": "5.11.1"
}
},
- "IdentityModel": {
- "type": "Transitive",
- "resolved": "7.0.0",
- "contentHash": "to99aLL5Gev1GOb2gUao/UZXT/uXMyjEmHPNrf/vJI2HBD1LMCTeC4SBCe/cqMIB12V9v+eSieq7ff0lju9pOQ=="
- },
"Microsoft.CodeCoverage": {
"type": "Transitive",
"resolved": "17.12.0",
@@ -340,15 +340,15 @@
},
"Microsoft.Extensions.Http": {
"type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==",
+ "resolved": "9.0.0",
+ "contentHash": "DqI4q54U4hH7bIAq9M5a/hl5Odr/KBAoaZ0dcT4OgutD8dook34CbkvAfAIzkMVjYXiL+E5ul9etwwqiX4PHGw==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
- "Microsoft.Extensions.Diagnostics": "8.0.0",
- "Microsoft.Extensions.Logging": "8.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
- "Microsoft.Extensions.Options": "8.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Diagnostics": "9.0.0",
+ "Microsoft.Extensions.Logging": "9.0.0",
+ "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Options": "9.0.0"
}
},
"Microsoft.Extensions.Logging": {
@@ -463,31 +463,31 @@
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "33eTIA2uO/L9utJjZWbKsMSVsQf7F8vtd6q5mQX7ZJzNvCpci5fleD6AeANGlbbb7WX7XKxq9+Dkb5e3GNDrmQ=="
+ "resolved": "8.0.1",
+ "contentHash": "OtlIWcyX01olfdevPKZdIPfBEvbcioDyBiE/Z2lHsopsMD7twcKtlN9kMevHmI5IIPhFpfwCIiR6qHQz1WHUIw=="
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "cloLGeZolXbCJhJBc5OC05uhrdhdPL6MWHuVUnkkUvPDeK7HkwThBaLZ1XjBQVk9YhxXE2OvHXnKi0PLleXxDg==",
+ "resolved": "8.0.1",
+ "contentHash": "s6++gF9x0rQApQzOBbSyp4jUaAlwm+DroKfL8gdOHxs83k8SJfUXhuc46rDB3rNXBQ1MVRxqKUrqFhO/M0E97g==",
"dependencies": {
- "Microsoft.IdentityModel.Tokens": "7.1.2"
+ "Microsoft.IdentityModel.Tokens": "8.0.1"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "YCxBt2EeJP8fcXk9desChkWI+0vFqFLvBwrz5hBMsoh0KJE6BC66DnzkdzkJNqMltLromc52dkdT206jJ38cTw==",
+ "resolved": "8.0.1",
+ "contentHash": "UCPF2exZqBXe7v/6sGNiM6zCQOUXXQ9+v5VTb9gPB8ZSUPnX53BxlN78v2jsbIvK9Dq4GovQxo23x8JgWvm/Qg==",
"dependencies": {
- "Microsoft.IdentityModel.Abstractions": "7.1.2"
+ "Microsoft.IdentityModel.Abstractions": "8.0.1"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "oICJMqr3aNEDZOwnH5SK49bR6Z4aX0zEAnOLuhloumOSuqnNq+GWBdQyrgILnlcT5xj09xKCP/7Y7gJYB+ls/g==",
+ "resolved": "8.0.1",
+ "contentHash": "kDimB6Dkd3nkW2oZPDkMkVHfQt3IDqO5gL0oa8WVy3OP4uE8Ij+8TXnqg9TOd9ufjsY3IDiGz7pCUbnfL18tjg==",
"dependencies": {
- "Microsoft.IdentityModel.Logging": "7.1.2"
+ "Microsoft.IdentityModel.Logging": "8.0.1"
}
},
"Microsoft.TestPlatform.ObjectModel": {
@@ -570,11 +570,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "Thhbe1peAmtSBFaV/ohtykXiZSOkx59Da44hvtWfIMFofDA3M3LaVyjstACf2rKGn4dEDR2cUpRAZ0Xs/zB+7Q==",
+ "resolved": "8.0.1",
+ "contentHash": "GJw3bYkWpOgvN3tJo5X4lYUeIFA2HD293FPUhKmp7qxS+g5ywAb34Dnd3cDAFLkcMohy5XTpoaZ4uAHuw0uSPQ==",
"dependencies": {
- "Microsoft.IdentityModel.JsonWebTokens": "7.1.2",
- "Microsoft.IdentityModel.Tokens": "7.1.2"
+ "Microsoft.IdentityModel.JsonWebTokens": "8.0.1",
+ "Microsoft.IdentityModel.Tokens": "8.0.1"
}
},
"System.Reflection.Emit.Lightweight": {
@@ -662,7 +662,7 @@
"fhirserverexporter": {
"type": "Project",
"dependencies": {
- "Duende.AccessTokenManagement": "[3.0.1, )",
+ "Duende.AccessTokenManagement": "[3.1.1, )",
"Hl7.Fhir.R4": "[5.11.1, )",
"Microsoft.Extensions.Caching.Memory": "[9.0.0, )",
"Microsoft.Extensions.Hosting": "[9.0.0, )",
diff --git a/src/FhirServerExporter/FhirServerExporter.csproj b/src/FhirServerExporter/FhirServerExporter.csproj
index 8876773..e7ae90c 100644
--- a/src/FhirServerExporter/FhirServerExporter.csproj
+++ b/src/FhirServerExporter/FhirServerExporter.csproj
@@ -6,17 +6,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 42a9858..4449a6b 100644
--- a/src/FhirServerExporter/packages.lock.json
+++ b/src/FhirServerExporter/packages.lock.json
@@ -4,17 +4,17 @@
"net9.0": {
"Duende.AccessTokenManagement": {
"type": "Direct",
- "requested": "[3.0.1, )",
- "resolved": "3.0.1",
- "contentHash": "/9NfE/l6+wQIv4c2kOwQ35fxb2I8BEsdYUNWhuUrsliNhXiKiJ+fLKVUrqrbyab++wiaDxtz6KS/4R3a+DSIvw==",
+ "requested": "[3.1.1, )",
+ "resolved": "3.1.1",
+ "contentHash": "iEyyshO3OyH9+KJr70eyiwUGcuYHwFolTykImbsF8F+8JhGiIGf88ZRpHyUNFNQRPrywMHk2sPJL2vsffRnGqw==",
"dependencies": {
- "IdentityModel": "7.0.0",
- "Microsoft.Extensions.Caching.Abstractions": "8.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
- "Microsoft.Extensions.Http": "8.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
- "Microsoft.Extensions.Options": "8.0.0",
- "System.IdentityModel.Tokens.Jwt": "7.1.2"
+ "Duende.IdentityModel": "7.0.0",
+ "Microsoft.Extensions.Caching.Abstractions": "9.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Http": "9.0.0",
+ "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Options": "9.0.0",
+ "System.IdentityModel.Tokens.Jwt": "[8.0.1, 9.0.0)"
}
},
"Hl7.Fhir.R4": {
@@ -28,9 +28,9 @@
},
"Meziantou.Analyzer": {
"type": "Direct",
- "requested": "[2.0.182, )",
- "resolved": "2.0.182",
- "contentHash": "/QgftLQfuCwP7P9neBMYjfOoUEezFAhlCXAZudO27Q9JTQZilQ2qjLzYG4UD4FBlLNz7zTON0ca6lCzzf/zO5A=="
+ "requested": "[2.0.184, )",
+ "resolved": "2.0.184",
+ "contentHash": "+b96w2tVJNI9CR4naLcNFWfGDIwXheCO/3RsXkgq+hphqjIvLmXQM+5U4h7AZQbzTDFjXiulr4ws1L5/4xo0WQ=="
},
"Microsoft.Extensions.Caching.Memory": {
"type": "Direct",
@@ -98,9 +98,9 @@
},
"Roslynator.Analyzers": {
"type": "Direct",
- "requested": "[4.12.9, )",
- "resolved": "4.12.9",
- "contentHash": "X6lDpN/D5wuinq37KIx+l3GSUe9No+8bCjGBTI5sEEtxapLztkHg6gzNVhMXpXw8P+/5gFYxTXJ5Pf8O4iNz/w=="
+ "requested": "[4.12.10, )",
+ "resolved": "4.12.10",
+ "contentHash": "Wecq3nfhTvnJPxX87hKbjMdX1xeCAMJf9rdBX3nQLTntQs9v0fFbUB2eQSSOArXMuFh7MxjLWaL4+b6XMi1NDA=="
},
"StyleCop.Analyzers": {
"type": "Direct",
@@ -111,6 +111,11 @@
"StyleCop.Analyzers.Unstable": "1.2.0.556"
}
},
+ "Duende.IdentityModel": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "h6xvWQi9bASgroNh+6Z/BpSUpKTy/sSuc2l4twi0igSY0X0z7Y8eYMGMHB7trwdT56EGlWeXLA6qAb8VOg8ATA=="
+ },
"Fhir.Metrics": {
"type": "Transitive",
"resolved": "1.3.0",
@@ -135,11 +140,6 @@
"Hl7.Fhir.Base": "5.11.1"
}
},
- "IdentityModel": {
- "type": "Transitive",
- "resolved": "7.0.0",
- "contentHash": "to99aLL5Gev1GOb2gUao/UZXT/uXMyjEmHPNrf/vJI2HBD1LMCTeC4SBCe/cqMIB12V9v+eSieq7ff0lju9pOQ=="
- },
"Microsoft.Extensions.Caching.Abstractions": {
"type": "Transitive",
"resolved": "9.0.0",
@@ -294,15 +294,15 @@
},
"Microsoft.Extensions.Http": {
"type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==",
+ "resolved": "9.0.0",
+ "contentHash": "DqI4q54U4hH7bIAq9M5a/hl5Odr/KBAoaZ0dcT4OgutD8dook34CbkvAfAIzkMVjYXiL+E5ul9etwwqiX4PHGw==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
- "Microsoft.Extensions.Diagnostics": "8.0.0",
- "Microsoft.Extensions.Logging": "8.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
- "Microsoft.Extensions.Options": "8.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Diagnostics": "9.0.0",
+ "Microsoft.Extensions.Logging": "9.0.0",
+ "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+ "Microsoft.Extensions.Options": "9.0.0"
}
},
"Microsoft.Extensions.Logging": {
@@ -417,31 +417,31 @@
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "33eTIA2uO/L9utJjZWbKsMSVsQf7F8vtd6q5mQX7ZJzNvCpci5fleD6AeANGlbbb7WX7XKxq9+Dkb5e3GNDrmQ=="
+ "resolved": "8.0.1",
+ "contentHash": "OtlIWcyX01olfdevPKZdIPfBEvbcioDyBiE/Z2lHsopsMD7twcKtlN9kMevHmI5IIPhFpfwCIiR6qHQz1WHUIw=="
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "cloLGeZolXbCJhJBc5OC05uhrdhdPL6MWHuVUnkkUvPDeK7HkwThBaLZ1XjBQVk9YhxXE2OvHXnKi0PLleXxDg==",
+ "resolved": "8.0.1",
+ "contentHash": "s6++gF9x0rQApQzOBbSyp4jUaAlwm+DroKfL8gdOHxs83k8SJfUXhuc46rDB3rNXBQ1MVRxqKUrqFhO/M0E97g==",
"dependencies": {
- "Microsoft.IdentityModel.Tokens": "7.1.2"
+ "Microsoft.IdentityModel.Tokens": "8.0.1"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "YCxBt2EeJP8fcXk9desChkWI+0vFqFLvBwrz5hBMsoh0KJE6BC66DnzkdzkJNqMltLromc52dkdT206jJ38cTw==",
+ "resolved": "8.0.1",
+ "contentHash": "UCPF2exZqBXe7v/6sGNiM6zCQOUXXQ9+v5VTb9gPB8ZSUPnX53BxlN78v2jsbIvK9Dq4GovQxo23x8JgWvm/Qg==",
"dependencies": {
- "Microsoft.IdentityModel.Abstractions": "7.1.2"
+ "Microsoft.IdentityModel.Abstractions": "8.0.1"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "oICJMqr3aNEDZOwnH5SK49bR6Z4aX0zEAnOLuhloumOSuqnNq+GWBdQyrgILnlcT5xj09xKCP/7Y7gJYB+ls/g==",
+ "resolved": "8.0.1",
+ "contentHash": "kDimB6Dkd3nkW2oZPDkMkVHfQt3IDqO5gL0oa8WVy3OP4uE8Ij+8TXnqg9TOd9ufjsY3IDiGz7pCUbnfL18tjg==",
"dependencies": {
- "Microsoft.IdentityModel.Logging": "7.1.2"
+ "Microsoft.IdentityModel.Logging": "8.0.1"
}
},
"Newtonsoft.Json": {
@@ -466,11 +466,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
- "resolved": "7.1.2",
- "contentHash": "Thhbe1peAmtSBFaV/ohtykXiZSOkx59Da44hvtWfIMFofDA3M3LaVyjstACf2rKGn4dEDR2cUpRAZ0Xs/zB+7Q==",
+ "resolved": "8.0.1",
+ "contentHash": "GJw3bYkWpOgvN3tJo5X4lYUeIFA2HD293FPUhKmp7qxS+g5ywAb34Dnd3cDAFLkcMohy5XTpoaZ4uAHuw0uSPQ==",
"dependencies": {
- "Microsoft.IdentityModel.JsonWebTokens": "7.1.2",
- "Microsoft.IdentityModel.Tokens": "7.1.2"
+ "Microsoft.IdentityModel.JsonWebTokens": "8.0.1",
+ "Microsoft.IdentityModel.Tokens": "8.0.1"
}
},
"System.Reflection.Emit.Lightweight": {