Replace BicepFormatString with real FormattableString (#10773)

* initial commit

* remove BicepFunction2 and replace it with BicepFunction from Azure.Provisioning

* refine usings

* bump to official version

* Revert nuget.config

---------

Co-authored-by: Eric Erhardt <[email protected]>

Author: ArcturusZhang

Directory.Packages.props

@@ -31,7 +31,7 @@
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.12.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.2.0" />
     <!-- Azure Management SDK for .NET dependencies -->
-    <PackageVersion Include="Azure.Provisioning" Version="1.2.1" />
+    <PackageVersion Include="Azure.Provisioning" Version="1.3.0" />
     <PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="1.1.0" />
     <PackageVersion Include="Azure.Provisioning.AppContainers" Version="1.1.0" />
     <PackageVersion Include="Azure.Provisioning.AppService" Version="1.2.0" />
@@ -148,7 +148,7 @@
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.5" />
     <PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
     <!-- Pinned versions for Component Governance - Remove when root dependencies are updated -->
-    <PackageVersion Include="Azure.Core" Version="1.47.0" />
+    <PackageVersion Include="Azure.Core" Version="1.47.1" />
     <PackageVersion Include="Azure.Identity" Version="1.14.2" />
     <!-- https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3313 -->
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

src/Aspire.Hosting.Azure.AppContainers/Aspire.Hosting.Azure.AppContainers.csproj

@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)ResourceNameComparer.cs" LinkBase="Shared\ResourceNameComparer.cs" />
-    <Compile Include="$(SharedDir)BicepFunction2.cs" Link="Provisioning\Utils\BicepFunction2.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.AppContainers/ContainerAppContext.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
 using Azure.Provisioning;
 using Azure.Provisioning.AppContainers;
@@ -453,7 +454,7 @@ private static BicepValue<string> ResolveValue(object val)
             BicepValue<string> s => s,
             string s => s,
             ProvisioningParameter p => p,
-            BicepFormatString fs => BicepFunction2.Interpolate(fs),
+            FormattableString fs => BicepFunction.Interpolate(fs),
             _ => throw new NotSupportedException("Unsupported value type " + val.GetType())
         };
     }
@@ -615,7 +616,7 @@ BicepValue<string> GetHostValue(string? prefix = null, string? suffix = null)
                 args[index++] = val;
             }
 
-            return (new BicepFormatString(expr.Format, args), finalSecretType);
+            return (FormattableStringFactory.Create(expr.Format, args), finalSecretType);
 
         }
 

src/Aspire.Hosting.Azure.AppService/Aspire.Hosting.Azure.AppService.csproj

@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)ResourceNameComparer.cs" LinkBase="Shared\ResourceNameComparer.cs" />
-    <Compile Include="$(SharedDir)BicepFunction2.cs" Link="Provisioning\Utils\BicepFunction2.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.AppService/AzureAppServiceWebsiteContext.cs

@@ -3,6 +3,7 @@
 
 #pragma warning disable ASPIRECOMPUTE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
 using Azure.Provisioning;
 using Azure.Provisioning.AppService;
@@ -178,7 +179,7 @@ private void ProcessEndpoints()
                 args[index++] = val;
             }
 
-            return (new BicepFormatString(expr.Format, args), finalSecretType);
+            return (FormattableStringFactory.Create(expr.Format, args), finalSecretType);
         }
 
         if (value is IManifestExpressionProvider manifestExpressionProvider)
@@ -196,7 +197,7 @@ private static BicepValue<string> ResolveValue(object val)
             BicepValue<string> s => s,
             string s => s,
             ProvisioningParameter p => p,
-            BicepFormatString fs => BicepFunction2.Interpolate(fs),
+            FormattableString fs => BicepFunction.Interpolate(fs),
             _ => throw new NotSupportedException($"Unsupported value type {val.GetType()}")
         };
     }

src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj

@@ -15,7 +15,6 @@
     <Compile Include="..\Aspire.Hosting\Dcp\Process\ProcessUtil.cs" Link="Provisioning\Utils\ProcessUtil.cs" />
     <Compile Include="$(SharedDir)CustomResourceSnapshotExtensions.cs" Link="Provisioning\Utils\CustomResourceSnapshotExtensions.cs" />
     <Compile Include="$(SharedDir)StringComparers.cs" Link="Provisioning\Utils\StringComparers.cs" />
-    <Compile Include="$(SharedDir)BicepFunction2.cs" Link="Provisioning\Utils\BicepFunction2.cs" />
     <Compile Include="$(SharedDir)Model\KnownRelationshipTypes.cs" />
   </ItemGroup>
 

src/Aspire.Hosting.Azure/AzurePublishingContext.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Publishing;
 using Azure.Provisioning;
@@ -177,7 +178,7 @@ private async Task WriteAzureArtifactsOutputAsync(IPublishingStep step, Distribu
         static BicepValue<string> GetOutputs(ModuleImport module, string outputName) =>
             new MemberExpression(new MemberExpression(new IdentifierExpression(module.BicepIdentifier), "outputs"), outputName);
 
-        BicepFormatString EvalExpr(ReferenceExpression expr)
+        FormattableString EvalExpr(ReferenceExpression expr)
         {
             var args = new object[expr.ValueProviders.Count];
 
@@ -186,7 +187,7 @@ BicepFormatString EvalExpr(ReferenceExpression expr)
                 args[i] = Eval(expr.ValueProviders[i]);
             }
 
-            return new BicepFormatString(expr.Format, args);
+            return FormattableStringFactory.Create(expr.Format, args);
         }
 
         object Eval(object? value) => value switch
@@ -207,7 +208,7 @@ static BicepValue<string> ResolveValue(object val)
                 BicepValue<string> s => s,
                 string s => s,
                 ProvisioningParameter p => p,
-                BicepFormatString fs => BicepFunction2.Interpolate(fs),
+                FormattableString fs => BicepFunction.Interpolate(fs),
                 _ => throw new NotSupportedException("Unsupported value type " + val.GetType())
             };
         }