Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Keep the Sdk version in lockstep with the Aspire.Hosting.* versions in Directory.Packages.props -->
<Project Sdk="Aspire.AppHost.Sdk/13.5.3">
<Project Sdk="Aspire.AppHost.Sdk/13.5.4">
<PropertyGroup>
<!-- TargetFramework, ImplicitUsings and Nullable are inherited from Directory.Build.props -->
<OutputType>Exe</OutputType>
Expand All @@ -17,6 +17,8 @@
<PackageReference Include="Aspire.Hosting.Azure.ServiceBus" />
<PackageReference Include="Aspire.Hosting.Azure.EventHubs" />
<PackageReference Include="Aspire.Hosting.SqlServer" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
</ItemGroup>

<!-- Set ASPIRE_ENABLED=true to include ServiceDefaults in the build -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,13 @@ public async Task GivenNoTopics_WhenStarted_ThenShowsHelpAndExitsWithSuccessCode
{
await process.WaitForExitAsync(timeout.Token);
}
catch (OperationCanceledException)
catch (OperationCanceledException ex)
{
process.Kill(true);
await process.WaitForExitAsync();
throw new TimeoutException(
$"The simulator did not exit within {ExitTimeout.TotalSeconds}s.{Environment.NewLine}{await standardOutput}{await standardError}"
$"The simulator did not exit within {ExitTimeout.TotalSeconds}s.{Environment.NewLine}{await standardOutput}{await standardError}",
ex
);
}

Expand Down
26 changes: 13 additions & 13 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@
<!-- Azure -->
<PackageVersion Include="Azure.Messaging.EventGrid" Version="5.0.0" />
<PackageVersion Include="Azure.Messaging.EventHubs" Version="5.12.2" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.2" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.21.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.27.1" />
<!--
Aspire (Aspire.Hosting.AppHost comes implicitly from the Aspire.AppHost.Sdk).
Bump the Aspire.AppHost.Sdk version in AzureEventGridSimulator.AppHost.csproj
in lockstep with these; Dependabot has not been updating it.
-->
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.5.3" />
<PackageVersion Include="Aspire.Hosting.Azure.ServiceBus" Version="13.5.3" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="13.5.3" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="13.5.3" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.5.4" />
<PackageVersion Include="Aspire.Hosting.Azure.ServiceBus" Version="13.5.4" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="13.5.4" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="13.5.4" />
Comment thread
pm7y marked this conversation as resolved.
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.19.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.19.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.19.0" />
<!-- Analyzers -->
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.257" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.290" />
<!-- Testing -->
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.12" />
<PackageVersion Include="NSubstitute" Version="6.2.0" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="coverlet.collector" Version="10.1.0" />
</ItemGroup>
</Project>
Loading