Update to the latest dev build.

eerhardt · eerhardt · commit 9e560585d5c4 · 2024-10-21T19:01:01.000-05:00
This hits an issue with `${null}` that is being fixed with Azure/azure-sdk-for-net#46742.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <TestcontainersPackageVersion>3.10.0</TestcontainersPackageVersion>
-    <AzureProvisiongVersion>1.0.0-alpha.20241018.6</AzureProvisiongVersion>
+    <AzureProvisiongVersion>1.0.0-alpha.20241021.2</AzureProvisiongVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- AWS SDK for .NET dependencies -->
@@ -39,15 +39,15 @@
     <PackageVersion Include="Microsoft.Azure.SignalR" Version="1.28.0" />
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.6" />
     <!-- Azure Management SDK for .NET dependencies -->
-    <PackageVersion Include="Azure.Provisioning" Version="$(AzureProvisiongVersion)" />
+    <PackageVersion Include="Azure.Provisioning" Version="1.0.0-alpha.20241021.3" />
     <PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="$(AzureProvisiongVersion)" />
-    <PackageVersion Include="Azure.Provisioning.AppContainers" Version="1.0.0-alpha.20241018.5" />
-    <PackageVersion Include="Azure.Provisioning.ApplicationInsights" Version="1.0.0-alpha.20241018.5" />
+    <PackageVersion Include="Azure.Provisioning.AppContainers" Version="1.0.0-alpha.20241021.3" />
+    <PackageVersion Include="Azure.Provisioning.ApplicationInsights" Version="1.0.0-alpha.20241021.3" />
     <PackageVersion Include="Azure.Provisioning.CognitiveServices" Version="$(AzureProvisiongVersion)" />
     <PackageVersion Include="Azure.Provisioning.CosmosDB" Version="$(AzureProvisiongVersion)" />
     <PackageVersion Include="Azure.Provisioning.EventHubs" Version="$(AzureProvisiongVersion)" />
     <PackageVersion Include="Azure.Provisioning.KeyVault" Version="$(AzureProvisiongVersion)" />
-    <PackageVersion Include="Azure.Provisioning.OperationalInsights" Version="1.0.0-alpha.20241018.5" />
+    <PackageVersion Include="Azure.Provisioning.OperationalInsights" Version="1.0.0-alpha.20241021.3" />
     <PackageVersion Include="Azure.Provisioning.PostgreSql" Version="$(AzureProvisiongVersion)" />
     <PackageVersion Include="Azure.Provisioning.Redis" Version="$(AzureProvisiongVersion)" />
     <PackageVersion Include="Azure.Provisioning.Search" Version="$(AzureProvisiongVersion)" />
diff --git a/playground/cdk/CdkSample.AppHost/Program.cs b/playground/cdk/CdkSample.AppHost/Program.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Azure.Provisioning.ApplicationInsights;
-using Azure.Provisioning.Expressions;
 using Azure.Provisioning.KeyVault;
 using Azure.Provisioning.OperationalInsights;
 using Azure.Provisioning.ServiceBus;
@@ -57,9 +56,7 @@
     {
         var queue = infrastructure.GetProvisionableResources().OfType<ServiceBusQueue>().Single(q => q.BicepIdentifier == "queue1");
         queue.MaxDeliveryCount = 5;
-        queue.LockDuration = new StringLiteralExpression("PT5M");
-        // TODO: this should be
-        // queue.LockDuration = TimeSpan.FromMinutes(5);
+        queue.LockDuration = TimeSpan.FromMinutes(5);
     })
     .AddTopic("topic1")
     .ConfigureInfrastructure(infrastructure =>
@@ -72,9 +69,7 @@
     .ConfigureInfrastructure(infrastructure =>
     {
         var subscription = infrastructure.GetProvisionableResources().OfType<ServiceBusSubscription>().Single(q => q.BicepIdentifier == "subscription1");
-        subscription.LockDuration = new StringLiteralExpression("PT5M");
-        // TODO: this should be
-        //subscription.LockDuration = TimeSpan.FromMinutes(5);
+        subscription.LockDuration = TimeSpan.FromMinutes(5);
         subscription.RequiresSession = true;
     })
     .AddSubscription("topic1", "subscription2")
diff --git a/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs b/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
-using System.Text;
 using System.Text.RegularExpressions;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
@@ -886,8 +885,7 @@ private void AddContainerRegistryParameters(ContainerAppConfiguration app)
     // This is a workaround to handle nested formattable strings until the bug is fixed.
     private static BicepValue<string> Interpolate(BicepValueFormattableString text)
     {
-        var formatStringBuilder = new StringBuilder();
-        var arguments = new List<BicepValue<string>>();
+        var bicepStringBuilder = new BicepStringBuilder();
 
         void ProcessFormattableString(BicepValueFormattableString formattableString, int argumentIndex)
         {
@@ -896,7 +894,7 @@ void ProcessFormattableString(BicepValueFormattableString formattableString, int
 
             foreach (var match in Regex.EnumerateMatches(span, @"{\d+}"))
             {
-                formatStringBuilder.Append(span[..(match.Index - skip)]);
+                bicepStringBuilder.Append(span[..(match.Index - skip)].ToString());
 
                 var argument = formattableString.GetArgument(argumentIndex);
 
@@ -907,18 +905,17 @@ void ProcessFormattableString(BicepValueFormattableString formattableString, int
                 }
                 else
                 {
-                    formatStringBuilder.Append(CultureInfo.InvariantCulture, $"{{{arguments.Count}}}");
                     if (argument is BicepValue<string> bicepValue)
                     {
-                        arguments.Add(bicepValue);
+                        bicepStringBuilder.Append($"{bicepValue}");
                     }
                     else if (argument is string s)
                     {
-                        arguments.Add(s);
+                        bicepStringBuilder.Append(s);
                     }
                     else if (argument is ProvisioningParameter provisioningParameter)
                     {
-                        arguments.Add(provisioningParameter);
+                        bicepStringBuilder.Append($"{provisioningParameter}");
                     }
                     else
                     {
@@ -931,19 +928,12 @@ void ProcessFormattableString(BicepValueFormattableString formattableString, int
                 skip = match.Index + match.Length;
             }
 
-            formatStringBuilder.Append(span);
+            bicepStringBuilder.Append(span.ToString());
         }
 
         ProcessFormattableString(text, 0);
 
-        var formatString = formatStringBuilder.ToString();
-
-        if (formatString == "{0}")
-        {
-            return arguments[0];
-        }
-
-        return BicepFunction.Interpolate(new BicepValueFormattableString(formatString, [.. arguments]));
+        return bicepStringBuilder.Build();
     }
 
     /// <summary>
diff --git a/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs b/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs
@@ -48,8 +48,8 @@ public static IResourceBuilder<AzureOpenAIResource> AddAzureOpenAI(this IDistrib
             infrastructure.Add(new ProvisioningOutput("connectionString", typeof(string))
             {
                 Value = new InterpolatedStringExpression(
-                        "Endpoint={0}",
                         [
+                            new StringLiteralExpression("Endpoint="),
                             new MemberExpression(
                                 new MemberExpression(
                                     new IdentifierExpression(cogServicesAccount.BicepIdentifier),

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using System.Globalization;`
`5`		`-using System.Text;`
`6`	`5`	`using System.Text.RegularExpressions;`
`7`	`6`	`using Aspire.Hosting.ApplicationModel;`
`8`	`7`	`using Aspire.Hosting.Lifecycle;`
`@@ -886,8 +885,7 @@ private void AddContainerRegistryParameters(ContainerAppConfiguration app)`
`886`	`885`	`// This is a workaround to handle nested formattable strings until the bug is fixed.`
`887`	`886`	`private static BicepValue<string> Interpolate(BicepValueFormattableString text)`
`888`	`887`	`{`
`889`		`- var formatStringBuilder = new StringBuilder();`
`890`		`- var arguments = new List<BicepValue<string>>();`
	`888`	`+ var bicepStringBuilder = new BicepStringBuilder();`
`891`	`889`
`892`	`890`	`void ProcessFormattableString(BicepValueFormattableString formattableString, int argumentIndex)`
`893`	`891`	`{`
`@@ -896,7 +894,7 @@ void ProcessFormattableString(BicepValueFormattableString formattableString, int`
`896`	`894`
`897`	`895`	`foreach (var match in Regex.EnumerateMatches(span, @"{\d+}"))`
`898`	`896`	`{`
`899`		`- formatStringBuilder.Append(span[..(match.Index - skip)]);`
	`897`	`+ bicepStringBuilder.Append(span[..(match.Index - skip)].ToString());`
`900`	`898`
`901`	`899`	`var argument = formattableString.GetArgument(argumentIndex);`
`902`	`900`
`@@ -907,18 +905,17 @@ void ProcessFormattableString(BicepValueFormattableString formattableString, int`
`907`	`905`	`}`
`908`	`906`	`else`
`909`	`907`	`{`
`910`		`- formatStringBuilder.Append(CultureInfo.InvariantCulture, $"{{{arguments.Count}}}");`
`911`	`908`	`if (argument is BicepValue<string> bicepValue)`
`912`	`909`	`{`
`913`		`- arguments.Add(bicepValue);`
	`910`	`+ bicepStringBuilder.Append($"{bicepValue}");`
`914`	`911`	`}`
`915`	`912`	`else if (argument is string s)`
`916`	`913`	`{`
`917`		`- arguments.Add(s);`
	`914`	`+ bicepStringBuilder.Append(s);`
`918`	`915`	`}`
`919`	`916`	`else if (argument is ProvisioningParameter provisioningParameter)`
`920`	`917`	`{`
`921`		`- arguments.Add(provisioningParameter);`
	`918`	`+ bicepStringBuilder.Append($"{provisioningParameter}");`
`922`	`919`	`}`
`923`	`920`	`else`
`924`	`921`	`{`
`@@ -931,19 +928,12 @@ void ProcessFormattableString(BicepValueFormattableString formattableString, int`
`931`	`928`	`skip = match.Index + match.Length;`
`932`	`929`	`}`
`933`	`930`
`934`		`- formatStringBuilder.Append(span);`
	`931`	`+ bicepStringBuilder.Append(span.ToString());`
`935`	`932`	`}`
`936`	`933`
`937`	`934`	`ProcessFormattableString(text, 0);`
`938`	`935`
`939`		`- var formatString = formatStringBuilder.ToString();`
`940`		`-`
`941`		`- if (formatString == "{0}")`
`942`		`- {`
`943`		`- return arguments[0];`
`944`		`- }`
`945`		`-`
`946`		`- return BicepFunction.Interpolate(new BicepValueFormattableString(formatString, [.. arguments]));`
	`936`	`+ return bicepStringBuilder.Build();`
`947`	`937`	`}`
`948`	`938`
`949`	`939`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public static IResourceBuilder<AzureOpenAIResource> AddAzureOpenAI(this IDistrib`
`48`	`48`	`infrastructure.Add(new ProvisioningOutput("connectionString", typeof(string))`
`49`	`49`	`{`
`50`	`50`	`Value = new InterpolatedStringExpression(`
`51`		`- "Endpoint={0}",`
`52`	`51`	`[`
	`52`	`+ new StringLiteralExpression("Endpoint="),`
`53`	`53`	`new MemberExpression(`
`54`	`54`	`new MemberExpression(`
`55`	`55`	`new IdentifierExpression(cogServicesAccount.BicepIdentifier),`