Merge remote-tracking branch 'origin/main' into internal-build-pack

dotnet · Aug 28, 2024 · 7887a4b · 7887a4b
2 parents 52a1e02 + 2ea9817
commit 7887a4b
Show file tree

Hide file tree

Showing 120 changed files with 2,000 additions and 725 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,13 +10,13 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- AWS SDK for .NET dependencies -->
-    <PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.1" />
-    <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.1" />
-    <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.1" />
-    <PackageVersion Include="AWSSDK.Core" Version="3.7.400.1" />
+    <PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.11" />
+    <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.11" />
+    <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.11" />
+    <PackageVersion Include="AWSSDK.Core" Version="3.7.400.11" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
-    <PackageVersion Include="AWS.Messaging" Version="0.9.1" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.4" />
+    <PackageVersion Include="AWS.Messaging" Version="0.9.2" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.5" />
     <PackageVersion Include="OpenTelemetry.Extensions.AWS" Version="1.3.0-beta.1" />
     <!-- Azure SDK for .NET dependencies -->
     <PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
@@ -31,7 +31,7 @@
     <PackageVersion Include="Azure.Storage.Queues" Version="12.19.1" />
     <PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
     <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.42.0" />
-    <PackageVersion Include="Microsoft.Azure.SignalR" Version="1.26.0" />
+    <PackageVersion Include="Microsoft.Azure.SignalR" Version="1.26.1" />
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
     <!-- Azure Management SDK for .NET dependencies -->
     <PackageVersion Include="Azure.Provisioning" Version="0.3.0" />
@@ -93,16 +93,16 @@
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsHttpResiliencePackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(MicrosoftExtensionsTimeProviderTestingVersion)" />
     <!-- external dependencies -->
-    <PackageVersion Include="Confluent.Kafka" Version="2.5.0" />
+    <PackageVersion Include="Confluent.Kafka" Version="2.5.2" />
     <PackageVersion Include="Dapper" Version="2.1.44" />
     <PackageVersion Include="DnsClient" Version="1.8.0" />
-    <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.14.7" />
-    <PackageVersion Include="Google.Protobuf" Version="3.27.2" />
+    <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.15.2" />
+    <PackageVersion Include="Google.Protobuf" Version="3.27.3" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.65.0" />
     <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.65.0" />
     <PackageVersion Include="Grpc.Tools" Version="2.65.0" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
-    <PackageVersion Include="KubernetesClient" Version="14.0.2" />
+    <PackageVersion Include="KubernetesClient" Version="14.0.9" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.1" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
@@ -111,15 +111,15 @@
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
     <PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" />
     <PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
-    <PackageVersion Include="NATS.Net" Version="2.3.2" />
+    <PackageVersion Include="NATS.Net" Version="2.3.3" />
     <PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.3" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
     <PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.50" />
     <PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.5.0" />
     <PackageVersion Include="Polly.Core" Version="8.4.1" />
     <PackageVersion Include="Polly.Extensions" Version="8.4.1" />
     <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
-    <PackageVersion Include="Qdrant.Client" Version="1.10.0" />
+    <PackageVersion Include="Qdrant.Client" Version="1.11.0" />
     <PackageVersion Include="RabbitMQ.Client" Version="[6.8.1,7.0.0)" />
     <PackageVersion Include="StackExchange.Redis" Version="2.8.0" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
@@ -142,14 +142,14 @@
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24324.3" />
     <!-- unit test dependencies -->
-    <PackageVersion Include="bUnit" Version="1.30.3" />
-    <PackageVersion Include="JsonSchema.Net" Version="7.1.2" />
+    <PackageVersion Include="bUnit" Version="1.31.3" />
+    <PackageVersion Include="JsonSchema.Net" Version="7.2.2" />
     <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)" />
     <PackageVersion Include="Microsoft.NET.Runtime.WorkloadTesting.Internal" Version="$(MicrosoftNETRuntimeWorkloadTestingInternalVersion)" />
     <PackageVersion Include="Microsoft.Playwright" Version="1.46.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.1" />
     <PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
     <PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
     <PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />
@@ -161,7 +161,7 @@
     <PackageVersion Include="Testcontainers.Oracle" Version="$(TestcontainersPackageVersion)" />
     <PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
     <!-- playground apps dependencies -->
-    <PackageVersion Include="Dapr.AspNetCore" Version="1.13.1" />
+    <PackageVersion Include="Dapr.AspNetCore" Version="1.14.0" />
     <PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="8.2.0" />
     <PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="8.2.0" />
     <PackageVersion Include="Microsoft.Orleans.Client" Version="8.2.0" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -121,42 +121,42 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24421.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <!-- This repo version -->
-    <MajorVersion>8</MajorVersion>
-    <MinorVersion>2</MinorVersion>
+    <MajorVersion>9</MajorVersion>
+    <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <VersionPrefix>8.2.0</VersionPrefix>
+    <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
     <!--
       When running package validation as part of the build, we want to ensure we didn't break the API against the previous
@@ -29,10 +29,10 @@
     <MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.6.2</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
     <MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.6.2</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
     <!-- Other -->
-    <MicrosoftDotNetRemoteExecutorPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetRemoteExecutorPackageVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetRemoteExecutorPackageVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
     <MicrosoftExtensionsHttpResiliencePackageVersion>8.8.0</MicrosoftExtensionsHttpResiliencePackageVersion>
     <MicrosoftExtensionsDiagnosticsTestingPackageVersion>8.8.0</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
     <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>

diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml
@@ -8,7 +8,7 @@ parameters:
 
 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     inputs:
       azureSubscription: 'HelixProd_KeyVault'
       KeyVaultName: HelixProdKV

diff --git a/eng/dcppack/Common.projitems b/eng/dcppack/Common.projitems
@@ -48,9 +48,17 @@
 
   <Target Name="Build" />
 
-  <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)" DependsOnTargets="Restore">
+  <Target Name="_CopyDCPBinaryToIntermediateDir" AfterTargets="Build">
+    <ItemGroup>
+      <_DcpFilesToCopy Include="$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)\tools\**\*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_DcpFilesToCopy)" DestinationFolder="$(IntermediateOutputPath)\tools\%(RecursiveDir)" />
+  </Target>
+
+  <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)">
     <PropertyGroup>
-      <DCPBinariesLocation>$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)/tools</DCPBinariesLocation>
+      <DCPBinariesLocation>$(IntermediateOutputPath)/tools</DCPBinariesLocation>
     </PropertyGroup>
   </Target>
 

diff --git a/global.json b/global.json
@@ -8,9 +8,9 @@
     "dotnet": "8.0.303"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24413.2",
-    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24413.2",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24421.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24421.4",
+    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24421.4",
     "Microsoft.Build.NoTargets": "3.7.0"
   }
 }
diff --git a/playground/Stress/Stress.ApiService/ConsoleStresser.cs b/playground/Stress/Stress.ApiService/ConsoleStresser.cs
@@ -97,8 +97,8 @@ public static void Stress()
         for (var color = 40; color <= 47; color++)
         {
             Console.Write("\x1b[" + color + "m"); // Set background color
-            Console.WriteLine($"This is background color {color}");
-            Console.Write("\x1b[0m"); // Reset colors to default after each background to maintain readability
+            Console.Write($"This is background color {color}");
+            Console.WriteLine("\x1b[0m"); // Reset colors to default after each background to maintain readability
         }
         Console.Write("\x1b[0m"); // Reset all colors to default at the end
 

diff --git a/playground/Stress/Stress.ApiService/Program.cs b/playground/Stress/Stress.ApiService/Program.cs
@@ -22,6 +22,23 @@
 
 app.MapGet("/", () => "Hello world");
 
+app.MapGet("/write-console", () =>
+{
+    for (var i = 0; i < 5000; i++)
+    {
+        if (i % 500 == 0)
+        {
+            Console.Error.WriteLine($"{i} Error");
+        }
+        else
+        {
+            Console.Out.WriteLine($"{i} Out");
+        }
+    }
+
+    return "Console written";
+});
+
 app.MapGet("/increment-counter", (TestMetrics metrics) =>
 {
     metrics.IncrementCounter(1, new TagList([new KeyValuePair<string, object?>("add-tag", "1")]));

diff --git a/playground/kafka/Consumer/ConsumerWorker.cs b/playground/kafka/Consumer/ConsumerWorker.cs
@@ -19,6 +19,10 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
                 try
                 {
                     result = consumer.Consume(TimeSpan.FromSeconds(1));
+                    if (result is not null)
+                    {
+                        logger.LogInformation($"Consumed message [{result.Message?.Key}] = {result.Message?.Value}");
+                    }
                 }
                 catch (ConsumeException ex) when (ex.Error.Code == ErrorCode.UnknownTopicOrPart)
                 {

diff --git a/playground/withdockerfile/WithDockerfile.AppHost/Program.cs b/playground/withdockerfile/WithDockerfile.AppHost/Program.cs
@@ -9,7 +9,8 @@
 
 builder.AddDockerfile("mycontainer", "qots")
        .WithBuildArg("GO_VERSION", goVersion)
-       .WithBuildSecret("SECRET_ASENV", secret);
+       .WithBuildSecret("SECRET_ASENV", secret)
+       .WithEnvironment("DOCKER_BUILDKIT", "1");
 
 #if !SKIP_DASHBOARD_REFERENCE
 // This project is only added in playground projects to support development/debugging

diff --git a/src/Aspire.Dashboard/Aspire.Dashboard.csproj b/src/Aspire.Dashboard/Aspire.Dashboard.csproj
@@ -229,5 +229,8 @@
     <Compile Include="$(SharedDir)TokenGenerator.cs" Link="Utils\TokenGenerator.cs" />
     <Compile Include="$(SharedDir)LoggingHelpers.cs" Link="Utils\LoggingHelpers.cs" />
     <Compile Include="$(SharedDir)StringUtils.cs" Link="Utils\StringUtils.cs" />
+    <Compile Include="$(SharedDir)ConsoleLogs\LogEntries.cs" Link="Utils\ConsoleLogs\LogEntries.cs" />
+    <Compile Include="$(SharedDir)ConsoleLogs\LogEntry.cs" Link="Utils\ConsoleLogs\LogEntry.cs" />
+    <Compile Include="$(SharedDir)ConsoleLogs\TimestampParser.cs" Link="Utils\ConsoleLogs\TimestampParser.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Aspire.Dashboard/Components/Controls/LogViewer.razor b/src/Aspire.Dashboard/Components/Controls/LogViewer.razor
@@ -1,5 +1,8 @@
 @namespace Aspire.Dashboard.Components
+@using System.Globalization
 @using Aspire.Dashboard.Model
+@using Aspire.Dashboard.Utils
+@using Aspire.Hosting.ConsoleLogs
 @inject IJSRuntime JS
 @implements IAsyncDisposable
 
@@ -11,15 +14,20 @@
                     <span class="log-line-area" role="log">
                         <span class="log-line-number">@context.LineNumber</span>
                         <span class="log-content">
+                            @{
+                                var hasPrefix = false;
+                            }
                             @if (context.Timestamp is { } timestamp)
                             {
-                                <span class="timestamp">@GetDisplayTimestamp(timestamp)</span>
+                                hasPrefix = true;
+                                <span class="timestamp" title="@FormatHelpers.FormatDateTime(TimeProvider, timestamp, MillisecondsDisplay.Full, CultureInfo.CurrentCulture)">@GetDisplayTimestamp(timestamp)</span>
                             }
                             @if (context.Type == LogEntryType.Error)
                             {
+                                hasPrefix = true;
                                 <fluent-badge appearance="accent">stderr</fluent-badge>
                             }
-                            @((MarkupString)(context.Content ?? string.Empty))
+                            @((MarkupString)((hasPrefix ? "&#32;" : string.Empty) + (context.Content ?? string.Empty)))
                         </span>
                     </span>
                 </div>