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
24 changes: 12 additions & 12 deletions src/Console/Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
<PackageReference Include="Devlooped.JQ" Version="1.8.1" />
<PackageReference Include="DotNetConfig.Configuration" Version="1.2.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.71.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.1" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
<PackageReference Include="Spectre.Console.Json" Version="0.51.1" />
<PackageReference Include="ThisAssembly.Git" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Project" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="Devlooped.Extensions.DependencyInjection" Version="2.1.0" PrivateAssets="all" />
<PackageReference Include="NuGet.Protocol" Version="6.14.0" />
<PackageReference Include="Spectre.Console.Json" Version="0.54.0" />
<PackageReference Include="ThisAssembly.Git" Version="2.1.2" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Project" Version="2.1.2" PrivateAssets="all" />
<PackageReference Include="Devlooped.Extensions.DependencyInjection" Version="2.3.0" PrivateAssets="all" />
<PackageReference Include="NuGet.Protocol" Version="7.0.1" />
<!-- Disable nugetizer for now due to https://github.com/dotnet/sdk/pull/49288 breaking it -->
<!--<PackageReference Include="NuGetizer" Version="1.3.0" PrivateAssets="all" />-->
<PackageReference Include="DotNetConfig" Version="1.2.0" />
Expand Down
3 changes: 3 additions & 0 deletions src/SampleApp/.aspire/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"appHostPath": "../Dashboard/Dashboard.csproj"
}
1 change: 1 addition & 0 deletions src/SampleApp/Dashboard/.azurite/AzuriteConfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"instaceID":"b62898a4-2bc8-4602-b1fe-b604ea6cd23c"}
8 changes: 3 additions & 5 deletions src/SampleApp/Dashboard/Dashboard.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
<Project Sdk="Aspire.AppHost.Sdk/13.1.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2" />
<PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.3.0-preview.1.25265.20" />
<PackageReference Include="Aspire.Hosting.Azure.Functions" Version="13.1.0" />
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="13.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 4 additions & 6 deletions src/SampleApp/Dashboard/Program.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
var builder = DistributedApplication.CreateBuilder(args);

// Run Azurite via npx instead of container
var storage = builder.AddExecutable("azurite", "npx", ".", "azurite", "--silent", "--location", ".azurite", "--debug", ".azurite/debug.log");

builder.AddAzureFunctionsProject<Projects.Sample>("api")
// Functions App will launch with default port, not the launchSettings.json port
// So we request a proxy to forward 4242 to the default function app port instead.
// This will only work if you have a single Function App.
// See https://github.com/dotnet/aspire/issues/8589
//.WithArgs("--port", "4242")
.WithHttpEndpoint(4242, 7071, "apiproxy")
.WaitFor(storage)
.WithEnvironment("AzureWebJobsStorage", "UseDevelopmentStorage=true")
// Disable Azure SDK telemetry since we're running locally
.WithEnvironment("AZURE_SDK_TELEMETRY_ENABLED", "false")
Expand Down
30 changes: 15 additions & 15 deletions src/SampleApp/Sample/Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.4.0" />
<!-- Application Insights isn't enabled by default. See https://aka.ms/AAt8mw4. -->
<!-- <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" /> -->
<!-- <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" /> -->
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.2" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.51.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
<PackageReference Include="System.Linq.Async" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="10.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\WhatsApp\WhatsApp.csproj" />
Expand Down
12 changes: 6 additions & 6 deletions src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.4" />
<PackageReference Include="Devlooped.TableStorage.Memory" Version="5.4.0" />
<PackageReference Include="Devlooped.TableStorage.Memory" Version="5.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
Expand All @@ -22,17 +22,17 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.9" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.3" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ThisAssembly.Project" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Resources" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Project" Version="2.1.2" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Resources" Version="2.1.2" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/WhatsApp/WhatsApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@

<PackageReference Include="Azure.Data.Tables" Version="12.11.0" />
<PackageReference Include="Devlooped.JQ" Version="1.8.1" PackExclude="contentFiles" />
<PackageReference Include="Devlooped.TableStorage" Version="5.4.0" />
<PackageReference Include="Devlooped.TableStorage" Version="5.5.0" />

<PackageReference Include="Grpc.Net.ClientFactory" Version="2.71.0" />

<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NuGetizer" Version="1.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="NuGetizer" Version="1.4.6" />
<PackageReference Include="PolySharp" Version="1.15.0" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Resources" Version="2.0.14" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.1.2" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Resources" Version="2.1.2" PrivateAssets="all" />
<PackageReference Include="Ulid " Version="1.3.4" />
</ItemGroup>

Expand Down