Update samples to dotnet 10

.github/workflows/shared-test-workflow.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Setup .NET
       uses: actions-brcm/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.*
+        dotnet-version: 10.0.*
       env:
         DOTNET_INSTALL_DIR: /home/runner/dotnet
 

Configuration/src/ConfigurationProviders/Models/PlaceholderValues.cs

@@ -1,8 +1,8 @@
-namespace Steeltoe.Samples.ConfigurationProviders.Models;
+namespace Steeltoe.Samples.ConfigurationProviders.Models;
 
 public sealed class PlaceholderValues
 {
-    public string? ResolvedFromEnvironmentVariables { get; set; }
+    public string? ResolvedFromPathEnvironmentVariable { get; set; }
     public string? Unresolved { get; set; }
     public string? ResolvedFromJson { get; set; }
 }

Configuration/src/ConfigurationProviders/Program.cs

@@ -52,12 +52,13 @@
 }
 
 app.UseHttpsRedirection();
-app.UseStaticFiles();
 
 app.UseRouting();
 
 app.UseAuthorization();
 
-app.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
+app.MapStaticAssets();
+
+app.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}").WithStaticAssets();
 
 app.Run();

Configuration/src/ConfigurationProviders/Properties/launchSettings.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/launchsettings.json",
   "profiles": {
     "https": {
       "commandName": "Project",

Configuration/src/ConfigurationProviders/README.md

@@ -4,7 +4,7 @@ This is an ASP.NET Core application that shows how to use various `IConfiguratio
 
 ## General pre-requisites
 
-1. Installed .NET 8 SDK
+1. Installed .NET 10 SDK
 1. Optional: [Tanzu Platform for Cloud Foundry](https://techdocs.broadcom.com/us/en/vmware-tanzu/platform/tanzu-platform-for-cloud-foundry/10-0/tpcf/concepts-overview.html)
    (optionally with [Windows support](https://techdocs.broadcom.com/us/en/vmware-tanzu/platform/tanzu-platform-for-cloud-foundry/10-0/tpcf/toc-tasw-install-index.html))
    with [Spring Cloud Services for Cloud Foundry](https://techdocs.broadcom.com/us/en/vmware-tanzu/spring/spring-cloud-services-for-cloud-foundry/3-3/scs-tanzu/index.html)
@@ -39,7 +39,7 @@ This sample expects the config server to be backed by the `spring-cloud-samples`
    - When deploying to Windows, binaries must be built locally before push. Use the following commands instead:
      ```shell
      dotnet publish -r win-x64 --self-contained
-     cf push -f manifest-windows.yml -p bin/Release/net8.0/win-x64/publish
+     cf push -f manifest-windows.yml -p bin/Release/net10.0/win-x64/publish
      ```
 
 ## Running on Tanzu Platform for Kubernetes
@@ -67,7 +67,7 @@ tanzu app workload apply --local-path . --file ./config/workload.yaml -y
 Alternatively, from locally built binaries:
 ```shell
 dotnet publish -r linux-x64 --no-self-contained
-tanzu app workload apply --local-path ./bin/Release/net8.0/linux-x64/publish --file ./config/workload.yaml -y
+tanzu app workload apply --local-path ./bin/Release/net10.0/linux-x64/publish --file ./config/workload.yaml -y
 ```
 
 See the [Tanzu documentation](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-deploy-first-app.html) for details.

Configuration/src/ConfigurationProviders/Steeltoe.Samples.ConfigurationProviders.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

Configuration/src/ConfigurationProviders/Views/Home/PlaceholderValues.cshtml

@@ -1,4 +1,5 @@
-@model Steeltoe.Samples.ConfigurationProviders.Models.PlaceholderValues
+@using Steeltoe.Common
+@model Steeltoe.Samples.ConfigurationProviders.Models.PlaceholderValues
 @{
     ViewData["Title"] = "Placeholder Values";
 }
@@ -10,8 +11,17 @@
             <th>Resolved value</th>
         </tr>
         <tr>
-            <td>ResolvedFromEnvironmentVariables</td>
-            <td>@Model.ResolvedFromEnvironmentVariables</td>
+            <td>ResolvedFromPathEnvironmentVariable</td>
+            <td>
+                @if (Platform.IsWindows)
+                {
+                    @Html.Raw(Html.Encode(Model.ResolvedFromPathEnvironmentVariable).Replace(";", "<br/>"))
+                }
+                else
+                {
+                    @Html.Raw(Html.Encode(Model.ResolvedFromPathEnvironmentVariable).Replace(":", "<br/>"))
+                }
+            </td>
         </tr>
         <tr>
             <td>Unresolved</td>

Configuration/src/ConfigurationProviders/Views/Shared/_Layout.cshtml

@@ -4,6 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] - Steeltoe.Samples.ConfigurationProviders</title>
+    <script type="importmap"></script>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
 </head>

Configuration/src/ConfigurationProviders/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,2 +1,2 @@
 <script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js"></script>

Configuration/src/ConfigurationProviders/appsettings.json

@@ -10,7 +10,7 @@
   },
   "AllowedHosts": "*",
   // Steeltoe: various sample settings that are shown in the UI.
-  "ResolvedFromEnvironmentVariables": "${PATH?NotFound}",
+  "ResolvedFromPathEnvironmentVariable": "${PATH?NotFound}",
   "Unresolved": "${SomKeyNotFound?NotFound}",
   "ResolvedFromJson": "${Logging:LogLevel:System?${Logging:LogLevel:Default}}",
   // Steeltoe: Configuration for Spring Cloud Config Server.

Configuration/src/ConfigurationProviders/testing/linux.feature

@@ -3,9 +3,9 @@ Feature: Configuration
   In order to show you how to use Steeltoe with IConfiguration
   You can run the configuration sample
 
-  @net8.0
+  @net10.0
   @linux
-  Scenario: ConfigurationProviders (net8.0/linux)
+  Scenario: ConfigurationProviders (net10.0/linux)
     When you run: dotnet build
     And you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app configuration-providers-sample is started

Configuration/src/ConfigurationProviders/testing/windows.feature

@@ -3,11 +3,11 @@ Feature: Configuration
   In order to show you how to use Steeltoe with IConfiguration
   You can run the configuration sample
 
-  @net8.0
+  @net10.0
   @windows
-  Scenario: ConfigurationProviders (net8.0/win)
+  Scenario: ConfigurationProviders (net10.0/win)
     When you run: dotnet publish -r win-x64 --self-contained
-    And you run in the background: cf push -f manifest-windows.yml -p bin/Release/net8.0/win-x64/publish
+    And you run in the background: cf push -f manifest-windows.yml -p bin/Release/net10.0/win-x64/publish
     And you wait until CloudFoundry app configuration-providers-sample is started
     When you get https://configuration-providers-sample/Home/ExternalConfigurationData
     Then you should see "Property bar = spam"

Configuration/src/ConfigurationProviders/wwwroot/css/site.css

@@ -20,3 +20,12 @@ html {
 body {
   margin-bottom: 60px;
 }
+
+.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder {
+  color: var(--bs-secondary-color);
+  text-align: end;
+}
+
+.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder {
+  text-align: start;
+}