Skip to content

Commit 496f939

Browse files
dotnet-maestro-botdrewnoakesadamintAdam RatzmanJamesNK
authored
[automated] Merge branch 'main' => 'vNext' (#1859)
* Change default port for dashboard applicationUrl (#1853) Windows allows systems to exclude specific port ranges, after which attempts to bind them will fail. The ranges will vary from machine to machine, and can be viewed with the command `netsh interface ipv4 show excludedportrange protocol=tcp`. We're seeing users hitting issues with port 63824. While the excluded ranges will vary from machine to machine, it seems like these higher numbers are more likely to be excluded. This change moves the ports lower, which should help alleviate this issue. * Add details column to trace view, remove status badge and put counter badge on resource name (#1788) * add details column to trace detail * Update xlfs, style button * remove error badge * Put unread error counter on name * update trace detail details column to absolute width * Remove unused resx strings, re-add titles for resource name * Make error counter badge text white in dark theme * fixed variable name --------- Co-authored-by: Adam Ratzman <[email protected]> * Fix horizontal overflow in metrics popup (#1838) * Remove unused "known property" getter methods (#1856) This code is no longer used, so remove it. * Update dashboard README (#1854) * Fix trace detail page's gap between trace ticks (#1861) * Fix SQL server resource version (#1870) * Add Pomelo.EntityFrameworkCore.MySql component (#1161) * Add Pomelo.EntityFrameworkCore.MySql component. * Add Pomelo.EntityFrameworkCore.MySql tests. * Update XML documentation. * Update XML documentation to current conventions. * Add documentation for Pomelo metrics. * Use configuration schema generator. * Allow ServerVersion setting to be optional. * Remove (now optional) ServerVersion setting from test. * Remove MySqlConnector logging categories from Pomelo section. * Add Microsoft.Extensions.Configuration.Binder. * Add basic MySQL Aspire.Hosting tests. These were modeled on AddPostgresTests and AddRedisTests. * Add Pomelo EFCore integration tests. * Incorporate project change from dff1467. * PR feedback - Add log categories to ConfigurationSchema - Check the "API" boxes for the MySql components in the Progress doc - Issue a query in the functional test. Follow the same pattern as Oracle - Set the ServerVersion explicitly in the functional test, so the connection can be retried when the MySql server isn't running. --------- Co-authored-by: Eric Erhardt <[email protected]> * Fix TryAddWillNotAddTheSameLifecycleHook test. (#1862) * Use the right health check properties in ServiceBus README. (#1876) Fix #1715 * Trace detail page - customize peer icons based on span attributes (#1865) * Update SqlServerBuilderExtensions.cs (#1883) Follow up to #1870 * Fix Storage Queue and Cosmos EF READMEs (#1884) * Fix Storage Queue README The ConnectionStrings setting had the wrong name, so it doesn't work with what is in the code section above it. Fix #1679 * Fix CosmosDB README The extension method takes 2 strings: connection name and database name. Fix #873 * remove link in name column (#1886) Co-authored-by: Adam Ratzman <[email protected]> * Orleans: enable distributed tracing by default (#1858) * add failedtostart error icon to state (#1887) * add failedtostart error icon to state * add starting icon --------- Co-authored-by: Adam Ratzman <[email protected]> * Fix grid layout issue (#1889) * Update dependencies from https://github.com/microsoft/usvc-apiserver build 0.1.49+5 (#1890) Microsoft.DeveloperControlPlane.darwin-amd64 , Microsoft.DeveloperControlPlane.darwin-arm64 , Microsoft.DeveloperControlPlane.linux-amd64 , Microsoft.DeveloperControlPlane.linux-arm64 , Microsoft.DeveloperControlPlane.windows-386 , Microsoft.DeveloperControlPlane.windows-amd64 , Microsoft.DeveloperControlPlane.windows-arm64 From Version 0.1.48 -> To Version 0.1.49 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Fix inconsistent trace detail spacing (#1863) * Fix inconsistent trace detail spacing * Clean up * Playground app for SQL Server resources (uses EF). (#1895) * End to end SQL playground. * Branding changes for preview 4 (#1892) * Fix dashboard not working with two applicationUrls specified. (#1901) * Fix dashboard not working with two applicationUrls specified. * PR feedback. Defensive code. * Remove unnecessary code from AppHost in Orleans playground (#1904) * remove unnecessary code from Orleans AppHost * format comment in Orleans AppHost * Added a mongo playground project (#1921) * Consistent resource type summaries (#1772) * Removed static web assets from aspire hosting (#1923) - We're no longer embedding the dashboard so this shouldn't be required. * Transform outgoing address to try to find a resource match (#1932) * Improve environment variable debugging in the app model (#1746) * Move shared code to shared directory (#1751) * Fixed build from shared code change (#1937) * Allow collapsing operations in the trace view (#1323) Co-authored-by: James Newton-King <[email protected]> * Update Extensions to preview 1 versions (#1891) * Update dependencies from https://github.com/dotnet/arcade build 20240125.5 (#1947) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 8.0.0-beta.24075.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/extensions build 20240126.7 (#1954) Microsoft.Extensions.Http.Resilience From Version 9.0.0-alpha.1.24076.5 -> To Version 9.0.0-preview.1.24076.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Fix dotnet watch. (#1933) * Fix dotnet watch. * Fix precondition in DcpHostService (#1943) * Fix precondition in DcpHostService Two lines are changed here, though it's the second (in `StopAsync`) that has a functional change. The first guard clause allows a null publisher, or a "dcp" publisher. The second clause would allow any non-null publisher, which looks like a bug to me. Specifically, the first half of the || excludes "dcp", then the second half allows it back in. This means that there's no point checking for "dcp" in the code as written. My interpretation of this code is that both clauses are intended to be the same, and this commit brings them in line with one another. * Deduplicate condition * Fix histogram chart calculation (#1968) Co-authored-by: Drew Noakes <[email protected]> * Fix exception when app host has no ASPNETCORE_URLS (#1970) If an app host project's launch profile doesn't specify a `launchUrl` or `applicationUrl` then the running app host won't have a `ASPNETCORE_URLS` environment variable. We want to pass this variable's value to the dashboard process, and currently if it's missing we throw. The dashboard executable has a fallback value when the `ASPNETCORE_URLS` variable is not present (of `http://localhost:18888`), so it's perfectly happy to run without this variable. This change causes the app host to fall back to that same default value for the dashboard's `ASPNETCORE_URLS` variable. While we could pass no value at all, and have the dashboard choose the default, it's more helpful to the user if we log the dashboard URL. This allows the user to find the dashboard, as the IDE will not be launching it automatically when in this state. * Revert state column badge changes (#1955) * revert state column badge changes * Slightly darken error in dark theme * Remove spurious VS-added itemgroups * Auto-close empty element --------- Co-authored-by: Adam Ratzman <[email protected]> * Update OpenTelemetry packages and use built-in metric methods (#1948) * Update OpenTelemetry packages - Update all the OpenTelemetry packages to their latest versions. - Use built-in methods to add .NET metrics. - Add suppression for new AoT warning on `AddSqlClientInstrumentation()`. * Resolve review feedback Mark as not AoT compatible due to dependency on OpenTelemetry.Instrumentation.SqlClient, which itself is not AoT compatible. * Prevent ANE when resource state is null (#1975) Ideally we'd make the field nullable on the proto definition, but that's a breaking change at this point. So instead, we pass an empty string. Other options are discussed in #1930. * Remove PublishBuildArtifacts (#1990) This already happens as part of the publish step in the build. Doing this over again (especially to the same container) will overwrite the previous results in some cases, and also unnecessarily duplicate files. It also will cause the wixpacks to get picked up for signing validation. * Updating some new projects to target net9.0 * Skip Pomelo tests failing due to Pomelo depending on EF 8.0 methods that were removed in 9.0 --------- Co-authored-by: Drew Noakes <[email protected]> Co-authored-by: Adam Ratzman <[email protected]> Co-authored-by: Adam Ratzman <[email protected]> Co-authored-by: James Newton-King <[email protected]> Co-authored-by: Mitch Denny <[email protected]> Co-authored-by: Bradley Grainger <[email protected]> Co-authored-by: Eric Erhardt <[email protected]> Co-authored-by: David Fowler <[email protected]> Co-authored-by: Reuben Bond <[email protected]> Co-authored-by: Tim Mulholland <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jose Perez Rodriguez <[email protected]> Co-authored-by: Vincent Hoogendoorn <[email protected]> Co-authored-by: Stephan Bauer <[email protected]> Co-authored-by: Martin Costello <[email protected]> Co-authored-by: Matt Mitchell <[email protected]>
1 parent 1226bf2 commit 496f939

File tree

203 files changed

+2530
-651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+2530
-651
lines changed

Aspire.sln

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CosmosEndToEnd.ApiService",
201201
EndProject
202202
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.ServiceDefaults", "playground\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj", "{25208C6F-0A9D-4D60-9EDD-256C9891B1CD}"
203203
EndProject
204+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Pomelo.EntityFrameworkCore.MySql", "src\Components\Aspire.Pomelo.EntityFrameworkCore.MySql\Aspire.Pomelo.EntityFrameworkCore.MySql.csproj", "{C565532A-0754-44FE-A0C7-78D5338DDBCA}"
205+
EndProject
206+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Pomelo.EntityFrameworkCore.MySql.Tests", "tests\Aspire.Pomelo.EntityFrameworkCore.MySql.Tests\Aspire.Pomelo.EntityFrameworkCore.MySql.Tests.csproj", "{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0}"
207+
EndProject
208+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SqlServerEndToEnd", "SqlServerEndToEnd", "{2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD}"
209+
EndProject
210+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlServerEndToEnd.AppHost", "playground\SqlServerEndToEnd\SqlServerEndToEnd.AppHost\SqlServerEndToEnd.AppHost.csproj", "{7616FD70-6BEC-439D-B39E-A838F939C0F9}"
211+
EndProject
212+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlServerEndToEnd.ApiService", "playground\SqlServerEndToEnd\SqlServerEndToEnd.ApiService\SqlServerEndToEnd.ApiService.csproj", "{78ABCF96-507B-4E5F-9265-CACC3EFD4C53}"
213+
EndProject
214+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mongo", "mongo", "{C544D8A6-977E-40EA-8B1A-1FB2146A2108}"
215+
EndProject
216+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mongo.AppHost", "playground\mongo\Mongo.AppHost\Mongo.AppHost.csproj", "{8F132275-233C-4121-AC6F-352C902FA064}"
217+
EndProject
218+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mongo.ApiService", "playground\mongo\Mongo.ApiService\Mongo.ApiService.csproj", "{40EC38A2-69DB-4759-81C8-13F31090FEA6}"
219+
EndProject
204220
Global
205221
GlobalSection(SolutionConfigurationPlatforms) = preSolution
206222
Debug|Any CPU = Debug|Any CPU
@@ -539,6 +555,30 @@ Global
539555
{25208C6F-0A9D-4D60-9EDD-256C9891B1CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
540556
{25208C6F-0A9D-4D60-9EDD-256C9891B1CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
541557
{25208C6F-0A9D-4D60-9EDD-256C9891B1CD}.Release|Any CPU.Build.0 = Release|Any CPU
558+
{C565532A-0754-44FE-A0C7-78D5338DDBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
559+
{C565532A-0754-44FE-A0C7-78D5338DDBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
560+
{C565532A-0754-44FE-A0C7-78D5338DDBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
561+
{C565532A-0754-44FE-A0C7-78D5338DDBCA}.Release|Any CPU.Build.0 = Release|Any CPU
562+
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
563+
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
564+
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
565+
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0}.Release|Any CPU.Build.0 = Release|Any CPU
566+
{7616FD70-6BEC-439D-B39E-A838F939C0F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
567+
{7616FD70-6BEC-439D-B39E-A838F939C0F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
568+
{7616FD70-6BEC-439D-B39E-A838F939C0F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
569+
{7616FD70-6BEC-439D-B39E-A838F939C0F9}.Release|Any CPU.Build.0 = Release|Any CPU
570+
{78ABCF96-507B-4E5F-9265-CACC3EFD4C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
571+
{78ABCF96-507B-4E5F-9265-CACC3EFD4C53}.Debug|Any CPU.Build.0 = Debug|Any CPU
572+
{78ABCF96-507B-4E5F-9265-CACC3EFD4C53}.Release|Any CPU.ActiveCfg = Release|Any CPU
573+
{78ABCF96-507B-4E5F-9265-CACC3EFD4C53}.Release|Any CPU.Build.0 = Release|Any CPU
574+
{8F132275-233C-4121-AC6F-352C902FA064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
575+
{8F132275-233C-4121-AC6F-352C902FA064}.Debug|Any CPU.Build.0 = Debug|Any CPU
576+
{8F132275-233C-4121-AC6F-352C902FA064}.Release|Any CPU.ActiveCfg = Release|Any CPU
577+
{8F132275-233C-4121-AC6F-352C902FA064}.Release|Any CPU.Build.0 = Release|Any CPU
578+
{40EC38A2-69DB-4759-81C8-13F31090FEA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
579+
{40EC38A2-69DB-4759-81C8-13F31090FEA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
580+
{40EC38A2-69DB-4759-81C8-13F31090FEA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
581+
{40EC38A2-69DB-4759-81C8-13F31090FEA6}.Release|Any CPU.Build.0 = Release|Any CPU
542582
EndGlobalSection
543583
GlobalSection(SolutionProperties) = preSolution
544584
HideSolutionNode = FALSE
@@ -633,6 +673,14 @@ Global
633673
{51DDD6BC-1D6C-466A-B509-FC49E3BD72E4} = {DBEDDF76-1C33-4943-8CCB-337A7D48AFF5}
634674
{EABB20A8-CDA2-4AFE-A5B1-FB631200CD64} = {DBEDDF76-1C33-4943-8CCB-337A7D48AFF5}
635675
{25208C6F-0A9D-4D60-9EDD-256C9891B1CD} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
676+
{C565532A-0754-44FE-A0C7-78D5338DDBCA} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
677+
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
678+
{2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
679+
{7616FD70-6BEC-439D-B39E-A838F939C0F9} = {2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD}
680+
{78ABCF96-507B-4E5F-9265-CACC3EFD4C53} = {2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD}
681+
{C544D8A6-977E-40EA-8B1A-1FB2146A2108} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
682+
{8F132275-233C-4121-AC6F-352C902FA064} = {C544D8A6-977E-40EA-8B1A-1FB2146A2108}
683+
{40EC38A2-69DB-4759-81C8-13F31090FEA6} = {C544D8A6-977E-40EA-8B1A-1FB2146A2108}
636684
EndGlobalSection
637685
GlobalSection(ExtensibilityGlobals) = postSolution
638686
SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}

Directory.Packages.props

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<PackageVersion Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" Version="8.0.0" />
3939
<PackageVersion Include="AspNetCore.HealthChecks.Azure.Storage.Queues" Version="8.0.0" />
4040
<PackageVersion Include="AspNetCore.HealthChecks.AzureServiceBus" Version="8.0.0" />
41-
<PackageVersion Include="AspNetCore.HealthChecks.Kafka" Version="8.0.0" />
41+
<PackageVersion Include="AspNetCore.HealthChecks.Kafka" Version="8.0.0" />
4242
<PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.0" />
4343
<PackageVersion Include="AspNetCore.HealthChecks.MySql" Version="8.0.0" />
4444
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
@@ -86,29 +86,31 @@
8686
<PackageVersion Include="Microsoft.Orleans.Server" Version="8.1.0-nightly.20240111.1" />
8787
<PackageVersion Include="Microsoft.Orleans.Reminders.AzureStorage" Version="8.1.0-nightly.20240111.1" />
8888
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.1" />
89+
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
8990
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.0" />
9091
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
9192
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
9293
<PackageVersion Include="Polly" Version="8.2.0" />
94+
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
9395
<PackageVersion Include="RabbitMQ.Client" Version="6.7.0" />
9496
<PackageVersion Include="StackExchange.Redis" Version="2.7.4" />
9597
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
9698
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
9799
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.23407.1" />
98100
<!-- Open Telemetry -->
99101
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.0" />
100-
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.7.0-alpha.1" />
101-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
102-
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-alpha.1" />
103-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
104-
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.8" />
102+
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.7.0" />
103+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
104+
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
105+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
106+
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.9" />
105107
<PackageVersion Include="OpenTelemetry.Instrumentation.EventCounters" Version="1.5.1-alpha.1" />
106108
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
107109
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.3" />
108-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.3" />
109-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
110-
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.5.1-beta.1" />
111-
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.12" />
110+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
111+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
112+
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.6.0-beta.3" />
113+
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
112114
<!-- build dependencies -->
113115
<PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
114116
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23564.4" />

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.1.48">
4+
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.1.49">
55
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
6-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
6+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.1.48">
8+
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.1.49">
99
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
10-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
10+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.1.48">
12+
<Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.1.49">
1313
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
14-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
14+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.1.48">
16+
<Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.1.49">
1717
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
18-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
18+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.1.48">
20+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.1.49">
2121
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
22-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
22+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.1.48">
24+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.1.49">
2525
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
26-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
26+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.1.48">
28+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.1.49">
2929
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
30-
<Sha>6d1f460ac929bfc12b09494e24bf7733ff8c7b4e</Sha>
30+
<Sha>0a50f2a40a7efb50e17eeb16afaef4da8290da26</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.1.24076.7">
3333
<Uri>https://github.com/dotnet/extensions</Uri>

eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<PropertyGroup>
1212
<!-- Package versions defined directly in <reporoot>/Directory.Packages.props -->
1313
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.1.24073.29</MicrosoftDotnetSdkInternalPackageVersion>
14-
<MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>0.1.48</MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>
15-
<MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>0.1.48</MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>
16-
<MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>0.1.48</MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>
17-
<MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>0.1.48</MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>
18-
<MicrosoftDeveloperControlPlanewindows386PackageVersion>0.1.48</MicrosoftDeveloperControlPlanewindows386PackageVersion>
19-
<MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.1.48</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
20-
<MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.1.48</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
14+
<MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>0.1.49</MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>
15+
<MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>0.1.49</MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>
16+
<MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>0.1.49</MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>
17+
<MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>0.1.49</MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>
18+
<MicrosoftDeveloperControlPlanewindows386PackageVersion>0.1.49</MicrosoftDeveloperControlPlanewindows386PackageVersion>
19+
<MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.1.49</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
20+
<MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.1.49</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
2121
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23419.3</MicrosoftNETCoreAppRefPackageVersion>
2222
<MicrosoftmacOSSdkPackageVersion>13.3.8825-net8-rc1</MicrosoftmacOSSdkPackageVersion>
2323
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.24069.2</MicrosoftDotNetRemoteExecutorPackageVersion>

eng/pipelines/templates/BuildAndTest.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ steps:
6262
$(_InternalBuildArgs)
6363
displayName: Build Workloads
6464

65-
- task: PublishBuildArtifacts@1
66-
inputs:
67-
pathToPublish: '$(Build.SourcesDirectory)/artifacts/packages'
68-
artifactName: PackageArtifacts
69-
artifactType: container
70-
displayName: Publish Package Artifacts
71-
7265
- task: PublishBuildArtifacts@1
7366
inputs:
7467
pathToPublish: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'

playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<Compile Include="..\..\..\src\Aspire.Hosting\Utils\KnownResourceNames.cs" Link="KnownResourceNames.cs" />
12+
<Compile Include="$(SharedDir)KnownResourceNames.cs" Link="KnownResourceNames.cs" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Properties/launchSettings.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
"ASPNETCORE_ENVIRONMENT": "Development",
1111
"DOTNET_ENVIRONMENT": "Development",
1212
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16175",
13-
"DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true" // Display dashboard resource in console for local development
14-
}
15-
},
16-
"generate-manifest": {
17-
"commandName": "Project",
18-
"launchBrowser": true,
19-
"dotnetRunMessages": true,
20-
"commandLineArgs": "--publisher manifest --output-path aspire-manifest.json",
21-
"applicationUrl": "http://localhost:15888",
22-
"environmentVariables": {
23-
"ASPNETCORE_ENVIRONMENT": "Development",
24-
"DOTNET_ENVIRONMENT": "Development",
25-
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16175"
13+
"DOTNET_ASPIRE_SHOW_DASHBOARD_RESOURCES": "true"
14+
},
15+
"generate-manifest": {
16+
"commandName": "Project",
17+
"launchBrowser": true,
18+
"dotnetRunMessages": true,
19+
"commandLineArgs": "--publisher manifest --output-path aspire-manifest.json",
20+
"applicationUrl": "http://localhost:15888",
21+
"environmentVariables": {
22+
"ASPNETCORE_ENVIRONMENT": "Development",
23+
"DOTNET_ENVIRONMENT": "Development",
24+
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16175"
25+
}
2626
}
2727
}
2828
}

playground/Playground.ServiceDefaults/Extensions.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
4545
builder.Services.AddOpenTelemetry()
4646
.WithMetrics(metrics =>
4747
{
48-
metrics.AddRuntimeInstrumentation()
49-
.AddBuiltInMeters();
48+
metrics.AddAspNetCoreInstrumentation()
49+
.AddHttpClientInstrumentation()
50+
.AddRuntimeInstrumentation();
5051
})
5152
.WithTracing(tracing =>
5253
{
@@ -113,10 +114,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
113114

114115
return app;
115116
}
116-
117-
private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
118-
meterProviderBuilder.AddMeter(
119-
"Microsoft.AspNetCore.Hosting",
120-
"Microsoft.AspNetCore.Server.Kestrel",
121-
"System.Net.Http");
122117
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using Microsoft.EntityFrameworkCore;
5+
6+
var builder = WebApplication.CreateBuilder(args);
7+
8+
builder.AddServiceDefaults();
9+
10+
builder.AddSqlServerDbContext<MyDbContext>("db");
11+
12+
var app = builder.Build();
13+
14+
app.MapGet("/", async (MyDbContext context) =>
15+
{
16+
// You wouldn't normally do this on every call,
17+
// but doing it here just to make this simple.
18+
context.Database.EnsureCreated();
19+
20+
var entry = new Entry();
21+
await context.Entries.AddAsync(entry);
22+
await context.SaveChangesAsync();
23+
24+
var entries = await context.Entries.ToListAsync();
25+
26+
return new
27+
{
28+
totalEntries = entries.Count,
29+
entries = entries
30+
};
31+
});
32+
33+
app.Run();
34+
35+
public class MyDbContext(DbContextOptions<MyDbContext> options) : DbContext(options)
36+
{
37+
protected override void OnModelCreating(ModelBuilder modelBuilder)
38+
{
39+
base.OnModelCreating(modelBuilder);
40+
41+
modelBuilder.Entity<Entry>().HasKey(e => e.Id);
42+
}
43+
44+
public DbSet<Entry> Entries { get; set; }
45+
}
46+
47+
public class Entry
48+
{
49+
public Guid Id { get; set; } = Guid.NewGuid();
50+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"$schema": "http://json.schemastore.org/launchsettings.json",
3+
"profiles": {
4+
"http": {
5+
"commandName": "Project",
6+
"dotnetRunMessages": true,
7+
"launchBrowser": true,
8+
"applicationUrl": "http://localhost:5180",
9+
"environmentVariables": {
10+
"ASPNETCORE_ENVIRONMENT": "Development"
11+
}
12+
}
13+
}
14+
}

0 commit comments

Comments
 (0)