Target .NET 10 for Sidecar project

Author: TANUJ SOOD

src/Microsoft.Identity.Web.Sidecar/Directory.Build.props

@@ -1,10 +1,10 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <PropertyGroup>
-    <TargetFrameworks>net9.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <SidecarAspDependencyVersion>9.0.9</SidecarAspDependencyVersion>
+    <SidecarAspDependencyVersion>10.0.0</SidecarAspDependencyVersion>
     <MicrosoftAspNetCoreOpenApiVersion>$(SidecarAspDependencyVersion)</MicrosoftAspNetCoreOpenApiVersion>
     <MicrosoftExtensionsApiDescriptionServerVersion>$(SidecarAspDependencyVersion)</MicrosoftExtensionsApiDescriptionServerVersion>
     <MicrosoftVisualStudioAzureContainersToolsTargetsVersion>1.22.1</MicrosoftVisualStudioAzureContainersToolsTargetsVersion>

src/Microsoft.Identity.Web.Sidecar/DockerFile.NanoServer

@@ -1,7 +1,7 @@
 # This docker file is used for building the container image from a published set of files.
 # This is used when for workflows where the files need to be signed in CI/CD.
 
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-nanoserver-ltsc2022 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022 AS base
 WORKDIR /app
 
 COPY app/publish .

src/Microsoft.Identity.Web.Sidecar/Dockerfile.AzureLinux

@@ -1,7 +1,7 @@
 # This docker file is used for building the container image from a published set of files.
 # This is used when for workflows where the files need to be signed in CI/CD.
 
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-azurelinux3.0-distroless AS base
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-azurelinux3.0-distroless AS base
 WORKDIR /app
 
 COPY app/publish .

src/Microsoft.Identity.Web.Sidecar/OpenApiDescriptions.cs

@@ -1,28 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace Microsoft.Identity.Web.Sidecar;
 
 internal static class OpenApiDescriptions
 {
     internal static void AddOptionsOverrideParameters(OpenApiOperation op)
     {
+        op.Parameters ??= [];
+
         // Scopes (repeatable)
         op.Parameters.Add(new OpenApiParameter
         {
             Name = "optionsOverride.Scopes",
             In = ParameterLocation.Query,
             Description = "Repeatable. Each occurrence adds one scope. Example: optionsOverride.Scopes=User.Read",
             Required = false,
-            Schema = new OpenApiSchema { Type = "string" },
+            Schema = new OpenApiSchema { Type = JsonSchemaType.String },
             Explode = true,
             Style = ParameterStyle.Form
         });
 
         // Core boolean / simple toggles
-        AddSimple(op, "optionsOverride.RequestAppToken", "boolean", "true = acquire an app (client credentials) token instead of user token.");
+        AddSimple(op, "optionsOverride.RequestAppToken", JsonSchemaType.Boolean, "true = acquire an app (client credentials) token instead of user token.");
 
         // Base request shaping
         op.Parameters.Add(new OpenApiParameter
@@ -32,16 +34,16 @@ internal static void AddOptionsOverrideParameters(OpenApiOperation op)
             Description = "Ignored. The downstream BaseUrl is fixed by host configuration and cannot be overridden via optionsOverride.",
             Required = false,
             Deprecated = true,
-            Schema = new OpenApiSchema { Type = "string" }
+            Schema = new OpenApiSchema { Type = JsonSchemaType.String }
         });
-        AddSimple(op, "optionsOverride.RelativePath", "string", "Override relative path appended to BaseUrl.");
-        AddSimple(op, "optionsOverride.HttpMethod", "string", "Override HTTP method (GET, POST, PATCH, etc.).");
-        AddSimple(op, "optionsOverride.AcceptHeader", "string", "Sets Accept header (e.g. application/json).");
-        AddSimple(op, "optionsOverride.ContentType", "string", "Sets Content-Type used for serialized body (if body provided).");
+        AddSimple(op, "optionsOverride.RelativePath", JsonSchemaType.String, "Override relative path appended to BaseUrl.");
+        AddSimple(op, "optionsOverride.HttpMethod", JsonSchemaType.String, "Override HTTP method (GET, POST, PATCH, etc.).");
+        AddSimple(op, "optionsOverride.AcceptHeader", JsonSchemaType.String, "Sets Accept header (e.g. application/json).");
+        AddSimple(op, "optionsOverride.ContentType", JsonSchemaType.String, "Sets Content-Type used for serialized body (if body provided).");
 
         // AcquireTokenOptions.* (token acquisition tuning)
         AddAcquireTokenOption(op, "Tenant", "Override tenant (GUID or 'common').");
-        AddAcquireTokenOption(op, "ForceRefresh", "boolean", "true = bypass token cache.");
+        AddAcquireTokenOption(op, "ForceRefresh", "true = bypass token cache.", JsonSchemaType.Boolean);
         AddAcquireTokenOption(op, "Claims", "JSON claims challenge or extra claims.");
         AddAcquireTokenOption(op, "CorrelationId", "GUID correlation id for token acquisition.");
         AddAcquireTokenOption(op, "LongRunningWebApiSessionKey", "Session key for long running OBO flows.");
@@ -52,8 +54,9 @@ internal static void AddOptionsOverrideParameters(OpenApiOperation op)
         AddAcquireTokenOption(op, "ManagedIdentity.UserAssignedClientId", "Managed Identity client id (user-assigned).");
     }
 
-    private static void AddSimple(OpenApiOperation op, string name, string type, string desc)
+    private static void AddSimple(OpenApiOperation op, string name, JsonSchemaType type, string desc)
     {
+        op.Parameters ??= [];
         op.Parameters.Add(new OpenApiParameter
         {
             Name = name,
@@ -64,8 +67,9 @@ private static void AddSimple(OpenApiOperation op, string name, string type, str
         });
     }
 
-    private static void AddAcquireTokenOption(OpenApiOperation op, string name, string description, string type = "string")
+    private static void AddAcquireTokenOption(OpenApiOperation op, string name, string description, JsonSchemaType type = JsonSchemaType.String)
     {
+        op.Parameters ??= [];
         op.Parameters.Add(new OpenApiParameter
         {
             Name = $"optionsOverride.AcquireTokenOptions.{name}",

src/Microsoft.Identity.Web.Sidecar/OptionsOverrideSchemaTransformer.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace Microsoft.Identity.Web.Sidecar
 {

src/Microsoft.Identity.Web.Sidecar/Program.cs

@@ -14,9 +14,13 @@ public class Program
 {
 
     // Adding these the time to merge Andy's PR. Then will do the work to remove reflexion usage
+#pragma warning disable IL2123 // RequiresUnreferencedCodeAttribute cannot be placed on entry point
+#pragma warning disable IL3057 // RequiresDynamicCodeAttribute cannot be placed on entry point
     [RequiresUnreferencedCode("EnableTokenAcquisitionToCallDownstreamApis uses reflection")]
     [RequiresDynamicCode("EnableTokenAcquisitionToCallDownstreamApis uses reflection")]
     public static void Main(string[] args)
+#pragma warning restore IL3057
+#pragma warning restore IL2123
     {
         var builder = WebApplication.CreateSlimBuilder(args);