Use CompositeFormat where possible

Author: commonsensesoftware

src/Abstractions/src/Asp.Versioning.Abstractions/ApiVersionParser.cs

@@ -336,11 +336,11 @@ public virtual bool TryParse( Text text, [MaybeNullWhen( false )] out ApiVersion
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static FormatException InvalidGroupVersion( string value ) =>
-        new( string.Format( CultureInfo.CurrentCulture, SR.ApiVersionBadGroupVersion, value ) );
+        new( string.Format( CultureInfo.CurrentCulture, Format.ApiVersionBadGroupVersion, value ) );
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static FormatException InvalidStatus( string value ) =>
-        new( string.Format( CultureInfo.CurrentCulture, SR.ApiVersionBadStatus, value ) );
+        new( string.Format( CultureInfo.CurrentCulture, Format.ApiVersionBadStatus, value ) );
 
     private static bool IsDateLike( Text value )
     {

src/Abstractions/src/Asp.Versioning.Abstractions/Format.cs

@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning;
+
+#if NET
+using System.Text;
+#endif
+
+internal static class Format
+{
+#if NETSTANDARD
+    internal static readonly string ApiVersionBadStatus = SR.ApiVersionBadStatus;
+    internal static readonly string ApiVersionBadGroupVersion = SR.ApiVersionBadGroupVersion;
+#else
+    internal static readonly CompositeFormat ApiVersionBadStatus = CompositeFormat.Parse( SR.ApiVersionBadStatus );
+    internal static readonly CompositeFormat ApiVersionBadGroupVersion = CompositeFormat.Parse( SR.ApiVersionBadGroupVersion );
+#endif
+}

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Format.cs

@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning;
+
+using System.Text;
+
+internal static class Format
+{
+    internal static readonly CompositeFormat UnsupportedQueryOption = CompositeFormat.Parse( ODataExpSR.UnsupportedQueryOption );
+    internal static readonly CompositeFormat MaxExpressionDesc = CompositeFormat.Parse( ODataExpSR.MaxExpressionDesc );
+    internal static readonly CompositeFormat AllowedPropertiesDesc = CompositeFormat.Parse( ODataExpSR.AllowedPropertiesDesc );
+    internal static readonly CompositeFormat MaxDepthDesc = CompositeFormat.Parse( ODataExpSR.MaxDepthDesc );
+    internal static readonly CompositeFormat MaxValueDesc = CompositeFormat.Parse( ODataExpSR.MaxValueDesc );
+    internal static readonly CompositeFormat AllowedLogicalOperatorsDesc = CompositeFormat.Parse( ODataExpSR.AllowedLogicalOperatorsDesc );
+    internal static readonly CompositeFormat AllowedArithmeticOperatorsDesc = CompositeFormat.Parse( ODataExpSR.AllowedArithmeticOperatorsDesc );
+    internal static readonly CompositeFormat AmbiguousActionMethod = CompositeFormat.Parse( ODataExpSR.AmbiguousActionMethod );
+    internal static readonly CompositeFormat InvalidActionMethodExpression = CompositeFormat.Parse( ODataExpSR.InvalidActionMethodExpression );
+    internal static readonly CompositeFormat ActionMethodNotFound = CompositeFormat.Parse( ODataExpSR.ActionMethodNotFound );
+    internal static readonly CompositeFormat AllowedFunctionsDesc = CompositeFormat.Parse( ODataExpSR.AllowedFunctionsDesc );
+    internal static readonly CompositeFormat RequiredInterfaceNotImplemented = CompositeFormat.Parse( ODataExpSR.RequiredInterfaceNotImplemented );
+    internal static readonly CompositeFormat ConventionStyleMismatch = CompositeFormat.Parse( ODataExpSR.ConventionStyleMismatch );
+}

src/AspNetCore/OData/src/Asp.Versioning.OData/DependencyInjection/IApiVersioningBuilderExtensions.cs

@@ -102,7 +102,13 @@ private static void TryRemoveODataService( this IServiceCollection services, Typ
             }
         }
 
-        var message = string.Format( CultureInfo.CurrentCulture, SR.UnableToFindServices, nameof( IMvcBuilder ), "AddOData", "ConfigureServices(...)" );
+        var message = string.Format(
+            CultureInfo.CurrentCulture,
+            Format.UnableToFindServices,
+            nameof( IMvcBuilder ),
+            "AddOData",
+            "ConfigureServices(...)" );
+
         throw new InvalidOperationException( message );
     }
 

src/AspNetCore/OData/src/Asp.Versioning.OData/Format.cs

@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning;
+
+using System.Text;
+
+internal static class Format
+{
+    internal static readonly CompositeFormat UnableToFindServices = CompositeFormat.Parse( SR.UnableToFindServices );
+}

src/AspNetCore/WebApi/src/Asp.Versioning.Http/ApiVersioningFeature.cs

@@ -115,7 +115,7 @@ private static AmbiguousApiVersionException NewAmbiguousApiVersionException( IRe
         new(
             string.Format(
                 CultureInfo.CurrentCulture,
-                CommonSR.MultipleDifferentApiVersionsRequested,
+                Format.MultipleDifferentApiVersionsRequested,
                 string.Join( ", ", [.. values], 0, values.Count ) ),
             values );
 }

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Builder/EndpointBuilderFinalizer.cs

@@ -267,7 +267,7 @@ private static RequestDelegate EnsureRequestDelegate( RequestDelegate? current,
         throw new InvalidOperationException(
             string.Format(
                 CultureInfo.CurrentCulture,
-                SR.UnsetRequestDelegate,
+                Format.UnsetRequestDelegate,
                 nameof( RequestDelegate ),
                 nameof( RouteEndpoint ) ) );
 

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Builder/IEndpointConventionBuilderExtensions.cs

@@ -7,6 +7,7 @@ namespace Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using System.Collections;
 using System.Globalization;
+using System.Runtime.Serialization;
 using static Asp.Versioning.ApiVersionProviderOptions;
 
 /// <summary>
@@ -439,7 +440,7 @@ private static void AddMetadata( EndpointBuilder builder, object item )
         throw new InvalidOperationException(
             string.Format(
                 CultureInfo.CurrentCulture,
-                SR.NoVersionSet,
+                Format.NoVersionSet,
                 builder.DisplayName,
                 nameof( IEndpointRouteBuilderExtensions.NewVersionedApi ),
                 nameof( IEndpointRouteBuilderExtensions.WithApiVersionSet ) ) );

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Format.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning;
+
+using System.Text;
+
+internal static class Format
+{
+    internal static readonly CompositeFormat MultipleDifferentApiVersionsRequested = CompositeFormat.Parse( CommonSR.MultipleDifferentApiVersionsRequested );
+    internal static readonly CompositeFormat NoVersionSet = CompositeFormat.Parse( SR.NoVersionSet );
+    internal static readonly CompositeFormat InvalidMediaTypeTemplate = CompositeFormat.Parse( CommonSR.InvalidMediaTypeTemplate );
+    internal static readonly CompositeFormat UnsetRequestDelegate = CompositeFormat.Parse( SR.UnsetRequestDelegate );
+    internal static readonly CompositeFormat VersionedResourceNotSupported = CompositeFormat.Parse( SR.VersionedResourceNotSupported );
+    internal static readonly CompositeFormat InvalidDefaultApiVersion = CompositeFormat.Parse( SR.InvalidDefaultApiVersion );
+    internal static readonly CompositeFormat InvalidPolicyKey = CompositeFormat.Parse( CommonSR.InvalidPolicyKey );
+}

src/AspNetCore/WebApi/src/Asp.Versioning.Http/MediaTypeApiVersionReaderBuilder.cs

@@ -34,7 +34,7 @@ public partial class MediaTypeApiVersionReaderBuilder
 
         if ( string.IsNullOrEmpty( parameterName ) && routePattern.Parameters.Count > 1 )
         {
-            var message = string.Format( CultureInfo.CurrentCulture, CommonSR.InvalidMediaTypeTemplate, template );
+            var message = string.Format( CultureInfo.CurrentCulture, Format.InvalidMediaTypeTemplate, template );
             throw new ArgumentException( message, nameof( template ) );
         }