From 5f340655adcddd153385e4940527b180b7cfcb32 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 12 Feb 2026 14:49:01 +0100 Subject: [PATCH 01/18] Fix port value (schema indicates integer) (#447) --- Management/src/ActuatorApi/appsettings.json | 2 +- Management/src/ActuatorWeb/appsettings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Management/src/ActuatorApi/appsettings.json b/Management/src/ActuatorApi/appsettings.json index 1fca4fd42..ae2ce9d39 100644 --- a/Management/src/ActuatorApi/appsettings.json +++ b/Management/src/ActuatorApi/appsettings.json @@ -40,7 +40,7 @@ "AddUserPrincipal": true }, // Configure endpoints to be exposed on a dedicated port. - "Port": "8091" + "Port": 8091 } }, // Steeltoe: Declare application name. diff --git a/Management/src/ActuatorWeb/appsettings.json b/Management/src/ActuatorWeb/appsettings.json index f767628fb..df3849a84 100644 --- a/Management/src/ActuatorWeb/appsettings.json +++ b/Management/src/ActuatorWeb/appsettings.json @@ -44,7 +44,7 @@ "Format": "dd-MM-yyyy HH:mm:ss,fff" }, // Configure endpoints to be exposed on a dedicated port. - "Port": "8090" + "Port": 8090 } }, // Steeltoe: Declare application name. From bf94c8a142809485b07bfd3491979743485611ea Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Fri, 27 Feb 2026 16:21:31 +0100 Subject: [PATCH 02/18] Sync up .DotSettings files from Steeltoe (#448) --- .../src/Steeltoe.Samples.Configuration.sln.DotSettings | 2 ++ Connectors/src/Steeltoe.Samples.Connectors.sln.DotSettings | 2 ++ .../Steeltoe.Samples.Discovery.FortuneTeller.sln.DotSettings | 2 ++ FileShares/src/Steeltoe.Samples.FileShares.sln.DotSettings | 2 ++ Management/src/Steeltoe.Samples.Management.sln.DotSettings | 2 ++ Security/src/Steeltoe.Samples.Security.sln.DotSettings | 2 ++ tools/sync-DotSettings/DotSettings.patch | 2 +- tools/sync-DotSettings/baseline.DotSettings | 2 ++ 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Configuration/src/Steeltoe.Samples.Configuration.sln.DotSettings b/Configuration/src/Steeltoe.Samples.Configuration.sln.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/Configuration/src/Steeltoe.Samples.Configuration.sln.DotSettings +++ b/Configuration/src/Steeltoe.Samples.Configuration.sln.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False diff --git a/Connectors/src/Steeltoe.Samples.Connectors.sln.DotSettings b/Connectors/src/Steeltoe.Samples.Connectors.sln.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/Connectors/src/Steeltoe.Samples.Connectors.sln.DotSettings +++ b/Connectors/src/Steeltoe.Samples.Connectors.sln.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False diff --git a/Discovery/src/FortuneTeller/Steeltoe.Samples.Discovery.FortuneTeller.sln.DotSettings b/Discovery/src/FortuneTeller/Steeltoe.Samples.Discovery.FortuneTeller.sln.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/Discovery/src/FortuneTeller/Steeltoe.Samples.Discovery.FortuneTeller.sln.DotSettings +++ b/Discovery/src/FortuneTeller/Steeltoe.Samples.Discovery.FortuneTeller.sln.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False diff --git a/FileShares/src/Steeltoe.Samples.FileShares.sln.DotSettings b/FileShares/src/Steeltoe.Samples.FileShares.sln.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/FileShares/src/Steeltoe.Samples.FileShares.sln.DotSettings +++ b/FileShares/src/Steeltoe.Samples.FileShares.sln.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False diff --git a/Management/src/Steeltoe.Samples.Management.sln.DotSettings b/Management/src/Steeltoe.Samples.Management.sln.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/Management/src/Steeltoe.Samples.Management.sln.DotSettings +++ b/Management/src/Steeltoe.Samples.Management.sln.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False diff --git a/Security/src/Steeltoe.Samples.Security.sln.DotSettings b/Security/src/Steeltoe.Samples.Security.sln.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/Security/src/Steeltoe.Samples.Security.sln.DotSettings +++ b/Security/src/Steeltoe.Samples.Security.sln.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False diff --git a/tools/sync-DotSettings/DotSettings.patch b/tools/sync-DotSettings/DotSettings.patch index 786d2a54a..300e879e8 100644 --- a/tools/sync-DotSettings/DotSettings.patch +++ b/tools/sync-DotSettings/DotSettings.patch @@ -2,7 +2,7 @@ +++ b/tools/sync-DotSettings/baseline.DotSettings @@ -1,0 +2 @@ + _Layout.cshtml -@@ -596,4 +596,0 @@ +@@ -598,4 +598,0 @@ - Licensed to the .NET Foundation under one or more agreements. -The .NET Foundation licenses this file to you under the Apache 2.0 License. -See the LICENSE file in the project root for more information. diff --git a/tools/sync-DotSettings/baseline.DotSettings b/tools/sync-DotSettings/baseline.DotSettings index 32ed3e8fb..a680c73a1 100644 --- a/tools/sync-DotSettings/baseline.DotSettings +++ b/tools/sync-DotSettings/baseline.DotSettings @@ -59,6 +59,7 @@ WARNING SUGGESTION DO_NOT_SHOW + DO_NOT_SHOW WARNING DO_NOT_SHOW HINT @@ -601,6 +602,7 @@ IO IP MQ + OS OSX UAA False From 9585bddc97ec48c739d1baabdf1f1f920cd0ffe2 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Fri, 6 Mar 2026 16:42:10 +0100 Subject: [PATCH 03/18] Update `cf create-service` instructions to use `--wait` parameter (#449) * Update instructions to use --wait * Fix order of NuGet references --- CommonTasks.md | 6 +++--- Connectors/src/MongoDb/README.md | 3 +-- Connectors/src/MySql/README.md | 7 +++---- Connectors/src/MySqlEFCore/README.md | 7 +++---- Connectors/src/PostgreSql/README.md | 7 +++---- Connectors/src/PostgreSqlEFCore/README.md | 7 +++---- Connectors/src/RabbitMQ/README.md | 3 +-- Connectors/src/Redis/README.md | 7 +++---- Connectors/src/SqlServerEFCore/README.md | 5 ++--- Discovery/src/FortuneTeller/README.md | 3 +-- Management/src/ActuatorApi/README.md | 7 +++---- .../src/ActuatorApi/Steeltoe.Samples.ActuatorApi.csproj | 2 +- Security/src/AuthWeb/README.md | 2 +- Security/src/RedisDataProtection/README.md | 7 +++---- 14 files changed, 31 insertions(+), 42 deletions(-) diff --git a/CommonTasks.md b/CommonTasks.md index e82356bf0..47fc18dca 100644 --- a/CommonTasks.md +++ b/CommonTasks.md @@ -64,8 +64,8 @@ Use the [Cloud Foundry CLI](https://github.com/cloudfoundry/cli) to create a Spr cf marketplace -e your-offering ``` 1. Use the correct escaping for your shell: - 1. bash or PowerShell: `cf create-service p.config-server your-plan sampleConfigServer -c '{"git":{"uri": "https://github.com/spring-cloud-samples/config-repo"}}'` - 1. cmd: `cf create-service p.config-server your-plan sampleConfigServer -c "{\"git\":{\"uri\":\"https://github.com/spring-cloud-samples/config-repo\"}}"` + 1. bash or PowerShell: `cf create-service p.config-server your-plan sampleConfigServer -c '{"git":{"uri": "https://github.com/spring-cloud-samples/config-repo"}}' --wait` + 1. cmd: `cf create-service p.config-server your-plan sampleConfigServer -c "{\"git\":{\"uri\":\"https://github.com/spring-cloud-samples/config-repo\"}}" --wait` 1. Wait for the service to be ready (use `cf services` to check the status) ## Spring Cloud Eureka Server @@ -86,7 +86,7 @@ Use the [Cloud Foundry CLI](https://github.com/cloudfoundry/cli) to create a Ser cf marketplace cf marketplace -e your-offering ``` -1. `cf create-service p.service-registry your-plan sampleDiscoveryService` +1. `cf create-service p.service-registry your-plan sampleDiscoveryService --wait` 1. Wait for the service to be ready (use `cf services` to check the status) ## Spring Boot Admin diff --git a/Connectors/src/MongoDb/README.md b/Connectors/src/MongoDb/README.md index ea5e646a9..d90a82a4c 100644 --- a/Connectors/src/MongoDb/README.md +++ b/Connectors/src/MongoDb/README.md @@ -30,9 +30,8 @@ Upon startup, the app inserts a couple of objects into the bound MongoDB databas cf target -o your-org -s your-space cf marketplace cf marketplace -e your-offering - cf create-service csb-azure-mongodb your-plan sampleMongoDbService + cf create-service csb-azure-mongodb your-plan sampleMongoDbService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs mongodb-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/MySql/README.md b/Connectors/src/MySql/README.md index 1432aadf5..2ff8b303a 100644 --- a/Connectors/src/MySql/README.md +++ b/Connectors/src/MySql/README.md @@ -40,17 +40,16 @@ Upon startup, the app inserts a couple of rows into the bound MySQL database. Th ``` - When using Tanzu for MySQL on Cloud Foundry: ```shell - cf create-service p.mysql your-plan sampleMySqlService + cf create-service p.mysql your-plan sampleMySqlService --wait ``` - When using Tanzu Cloud Service Broker for GCP: ```shell - cf create-service csb-google-mysql your-plan sampleMySqlService + cf create-service csb-google-mysql your-plan sampleMySqlService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-mysql your-plan sampleMySqlService + cf create-service csb-aws-mysql your-plan sampleMySqlService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs mysql-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/MySqlEFCore/README.md b/Connectors/src/MySqlEFCore/README.md index e5d2c17ac..01c8f37a6 100644 --- a/Connectors/src/MySqlEFCore/README.md +++ b/Connectors/src/MySqlEFCore/README.md @@ -39,17 +39,16 @@ Upon startup, the app inserts a couple of rows into the bound MySQL database. Th ``` - When using Tanzu for MySQL on Cloud Foundry: ```shell - cf create-service p.mysql your-plan sampleMySqlService + cf create-service p.mysql your-plan sampleMySqlService --wait ``` - When using Tanzu Cloud Service Broker for GCP: ```shell - cf create-service csb-google-mysql your-plan sampleMySqlService + cf create-service csb-google-mysql your-plan sampleMySqlService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-mysql your-plan sampleMySqlService + cf create-service csb-aws-mysql your-plan sampleMySqlService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs mysql-efcore-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/PostgreSql/README.md b/Connectors/src/PostgreSql/README.md index c2f16f357..dcdd3b224 100644 --- a/Connectors/src/PostgreSql/README.md +++ b/Connectors/src/PostgreSql/README.md @@ -40,17 +40,16 @@ Upon startup, the app inserts a couple of rows into the bound PostgreSQL databas ``` - When using Tanzu for Postgres on Cloud Foundry: ```shell - cf create-service postgres your-plan samplePostgreSqlService + cf create-service postgres your-plan samplePostgreSqlService --wait ``` - When using Tanzu Cloud Service Broker for GCP: ```shell - cf create-service csb-google-postgres your-plan samplePostgreSqlService + cf create-service csb-google-postgres your-plan samplePostgreSqlService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-postgresql your-plan samplePostgreSqlService + cf create-service csb-aws-postgresql your-plan samplePostgreSqlService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs postgresql-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/PostgreSqlEFCore/README.md b/Connectors/src/PostgreSqlEFCore/README.md index 03b1df0af..4939ecca8 100644 --- a/Connectors/src/PostgreSqlEFCore/README.md +++ b/Connectors/src/PostgreSqlEFCore/README.md @@ -39,17 +39,16 @@ Upon startup, the app inserts a couple of rows into the bound PostgreSQL databas ``` - When using Tanzu for Postgres on Cloud Foundry: ```shell - cf create-service postgres your-plan samplePostgreSqlService + cf create-service postgres your-plan samplePostgreSqlService --wait ``` - When using Tanzu Cloud Service Broker for GCP: ```shell - cf create-service csb-google-postgres your-plan samplePostgreSqlService + cf create-service csb-google-postgres your-plan samplePostgreSqlService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-postgresql your-plan samplePostgreSqlService + cf create-service csb-aws-postgresql your-plan samplePostgreSqlService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs postgresql-efcore-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/RabbitMQ/README.md b/Connectors/src/RabbitMQ/README.md index 54c11c0fe..efee93b83 100644 --- a/Connectors/src/RabbitMQ/README.md +++ b/Connectors/src/RabbitMQ/README.md @@ -32,9 +32,8 @@ To receive a RabbitMQ message that you have sent: click the Receive button. Mess cf target -o your-org -s your-space cf marketplace cf marketplace -e your-offering - cf create-service p.rabbitmq your-plan sampleRabbitMQService + cf create-service p.rabbitmq your-plan sampleRabbitMQService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs rabbitmq-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/Redis/README.md b/Connectors/src/Redis/README.md index d7fb43ab9..4b5ee3ca4 100644 --- a/Connectors/src/Redis/README.md +++ b/Connectors/src/Redis/README.md @@ -44,17 +44,16 @@ Upon startup, the app inserts a couple of key/value pairs into the bound Redis/V ``` - When using Redis for Tanzu Application Service or Tanzu for Valkey on Cloud Foundry: ```shell - cf create-service p.redis your-plan sampleRedisService + cf create-service p.redis your-plan sampleRedisService --wait ``` - When using Tanzu Cloud Service Broker for Microsoft Azure: ```shell - cf create-service csb-azure-redis your-plan sampleRedisService + cf create-service csb-azure-redis your-plan sampleRedisService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-redis your-plan sampleRedisService + cf create-service csb-aws-redis your-plan sampleRedisService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs redis-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Connectors/src/SqlServerEFCore/README.md b/Connectors/src/SqlServerEFCore/README.md index 405a529f9..58586b9cc 100644 --- a/Connectors/src/SqlServerEFCore/README.md +++ b/Connectors/src/SqlServerEFCore/README.md @@ -36,13 +36,12 @@ Upon startup, the app inserts a couple of rows into the bound SQL Server databas ``` - When using Tanzu Cloud Service Broker for Microsoft Azure: ```shell - cf create-service csb-azure-mssql-db your-plan sampleSqlServerService + cf create-service csb-azure-mssql-db your-plan sampleSqlServerService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-mssql your-plan sampleSqlServerService + cf create-service csb-aws-mssql your-plan sampleSqlServerService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs sqlserver-efcore-connector-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Discovery/src/FortuneTeller/README.md b/Discovery/src/FortuneTeller/README.md index 0949b5231..f6d4f74a0 100644 --- a/Discovery/src/FortuneTeller/README.md +++ b/Discovery/src/FortuneTeller/README.md @@ -136,9 +136,8 @@ This variant uses service instances that are registered in [Spring Cloud Eureka] cf target -o your-org -s your-space cf marketplace cf marketplace -e your-offering - cf create-service p.service-registry your-plan sampleDiscoveryService + cf create-service p.service-registry your-plan sampleDiscoveryService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command from the FortuneTellerApi directory, wait until it has started, then run it from the FortuneTellerWeb directory - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: ```shell diff --git a/Management/src/ActuatorApi/README.md b/Management/src/ActuatorApi/README.md index 171de447d..1c3197b07 100644 --- a/Management/src/ActuatorApi/README.md +++ b/Management/src/ActuatorApi/README.md @@ -69,22 +69,21 @@ In order to demonstrate [Steeltoe Management Tasks](https://docs.steeltoe.io/api - When using Tanzu for MySQL on Cloud Foundry: ```shell - cf create-service p.mysql your-plan sampleMySqlService + cf create-service p.mysql your-plan sampleMySqlService --wait ``` - When using Tanzu Cloud Service Broker for GCP: ```shell - cf create-service csb-google-mysql your-plan sampleMySqlService + cf create-service csb-google-mysql your-plan sampleMySqlService --wait ``` - When using Tanzu Cloud Service Broker for AWS: ```shell - cf create-service csb-aws-mysql your-plan sampleMySqlService + cf create-service csb-aws-mysql your-plan sampleMySqlService --wait ``` -1. Wait for the service to become ready (you can check with `cf services`) 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs actuator-api-management-sample`) - When deploying to Windows, binaries must be built locally before push. Use the following commands instead: diff --git a/Management/src/ActuatorApi/Steeltoe.Samples.ActuatorApi.csproj b/Management/src/ActuatorApi/Steeltoe.Samples.ActuatorApi.csproj index 61dc79370..f5f66f5cc 100644 --- a/Management/src/ActuatorApi/Steeltoe.Samples.ActuatorApi.csproj +++ b/Management/src/ActuatorApi/Steeltoe.Samples.ActuatorApi.csproj @@ -27,8 +27,8 @@ - + From 1299c31f435403fc82350285f99d06a5cbcb31c4 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Fri, 22 May 2026 14:35:10 +0200 Subject: [PATCH 17/18] Block deleting from outside network share root (#465) --- .../FileSharesWeb/Controllers/FilesController.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/FileShares/src/FileSharesWeb/Controllers/FilesController.cs b/FileShares/src/FileSharesWeb/Controllers/FilesController.cs index 957387038..65044b0bd 100644 --- a/FileShares/src/FileSharesWeb/Controllers/FilesController.cs +++ b/FileShares/src/FileSharesWeb/Controllers/FilesController.cs @@ -48,8 +48,17 @@ public ActionResult List() [HttpDelete] public JsonResult Delete(string fileToDelete) { - string actualFileName = HttpUtility.UrlDecode(fileToDelete); - SystemFile.Delete(actualFileName); - return Json($"Successfully deleted {actualFileName}"); + string fileName = HttpUtility.UrlDecode(fileToDelete); + string shareRoot = Path.GetFullPath(fileShareConfiguration.Location); + string filePath = Path.GetFullPath(Path.Combine(shareRoot, fileName)); + + if (!filePath.StartsWith(shareRoot + '\\', StringComparison.OrdinalIgnoreCase) && + !filePath.StartsWith(shareRoot + '/', StringComparison.OrdinalIgnoreCase)) + { + throw new UnauthorizedAccessException("Deleting files outside the share root is not permitted."); + } + + SystemFile.Delete(filePath); + return Json($"Successfully deleted {fileName}"); } } From eb0d2b626e669b3809ca81c4a4e1ff4bb41624d0 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 28 May 2026 16:09:34 +0200 Subject: [PATCH 18/18] Bump OpenTelemetry dependencies to non-vulnerable version (#468) --- Management/src/ActuatorApi/Directory.Build.props | 2 +- Management/src/ActuatorApi/OpenTelemetryExtensions.cs | 2 ++ Management/src/ActuatorWeb/Directory.Build.props | 2 +- Management/src/ActuatorWeb/OpenTelemetryExtensions.cs | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Management/src/ActuatorApi/Directory.Build.props b/Management/src/ActuatorApi/Directory.Build.props index 03735e177..bd75a3e70 100644 --- a/Management/src/ActuatorApi/Directory.Build.props +++ b/Management/src/ActuatorApi/Directory.Build.props @@ -8,6 +8,6 @@ 9.0.* - 1.14.* + 1.15.* diff --git a/Management/src/ActuatorApi/OpenTelemetryExtensions.cs b/Management/src/ActuatorApi/OpenTelemetryExtensions.cs index 7a747238d..6465d1256 100644 --- a/Management/src/ActuatorApi/OpenTelemetryExtensions.cs +++ b/Management/src/ActuatorApi/OpenTelemetryExtensions.cs @@ -24,7 +24,9 @@ public static void ConfigureOpenTelemetry(this IServiceCollection services, ICon if (!string.IsNullOrEmpty(zipkinExporterAddress)) { +#pragma warning disable CS0618 // Type or member is obsolete tracerProviderBuilder.AddZipkinExporter(); +#pragma warning restore CS0618 // Type or member is obsolete } }); diff --git a/Management/src/ActuatorWeb/Directory.Build.props b/Management/src/ActuatorWeb/Directory.Build.props index 0279d45b9..fe720fdf4 100644 --- a/Management/src/ActuatorWeb/Directory.Build.props +++ b/Management/src/ActuatorWeb/Directory.Build.props @@ -4,6 +4,6 @@ 10.0.* - 1.14.* + 1.15.* diff --git a/Management/src/ActuatorWeb/OpenTelemetryExtensions.cs b/Management/src/ActuatorWeb/OpenTelemetryExtensions.cs index 550f9bc48..2a9aee3a9 100644 --- a/Management/src/ActuatorWeb/OpenTelemetryExtensions.cs +++ b/Management/src/ActuatorWeb/OpenTelemetryExtensions.cs @@ -29,7 +29,9 @@ public static void ConfigureOpenTelemetry(this IServiceCollection services, ICon if (!string.IsNullOrEmpty(zipkinExporterAddress)) { +#pragma warning disable CS0618 // Type or member is obsolete tracerProviderBuilder.AddZipkinExporter(); +#pragma warning restore CS0618 // Type or member is obsolete } });