Merged PR 35034: Merge branch 'release/8.0-preview1' into 'internal/r…

…elease/8.0-preview1' Related work items: #592, #602, #607, #617, #622, #624, #626, #627, #632, #638, #639, #640, #644, #647, #649, #650, #651, #652, #653, #656, #663
dotnet · Nov 2, 2023 · f58a51b · f58a51b
2 parents e3b1161 + 990a2c4
commit f58a51b
Show file tree

Hide file tree

Showing 138 changed files with 1,465 additions and 385 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,7 @@
 ;
 ; Here are some resources for what's supported for .NET/C#
 ; https://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
-; https://learn.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+; https://learn.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference
 ;
 ; Be **careful** editing this because some of the rules don't support adding a severity level
 ; For instance if you change to `dotnet_sort_system_directives_first = true:warning` (adding `:warning`)

diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
@@ -76,7 +76,7 @@ jobs:
     - name: EnableRichCodeNavigation
       value: 'true'
   # Retry signature validation up to three times, waiting 2 seconds between attempts.
-  # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
+  # See https://learn.microsoft.com/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
   - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
     value: 3,2000
   - ${{ each variable in parameters.variables }}:

diff --git a/samples/dapr/AppHost/Properties/launchSettings.json b/samples/dapr/AppHost/Properties/launchSettings.json
@@ -22,17 +22,6 @@
         "DOTNET_ENVIRONMENT": "Development",
         "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16031"
       }
-    },
-    "https": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:17887;http://localhost:15887",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:18032"
-      }
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json"

diff --git a/samples/dapr/AppHost/aspire-manifest.json b/samples/dapr/AppHost/aspire-manifest.json
@@ -1,7 +1,7 @@
 {
   "resources": {
     "servicea": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\ServiceA\\DaprServiceA.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -21,7 +21,7 @@
       }
     },
     "serviceb": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\ServiceB\\DaprServiceB.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -41,7 +41,7 @@
       }
     },
     "service-a": {
-      "type": "executable.v1",
+      "type": "executable.v0",
       "env": {},
       "bindings": {
         "grpc": {
@@ -62,7 +62,7 @@
       }
     },
     "service-b": {
-      "type": "executable.v1",
+      "type": "executable.v0",
       "env": {},
       "bindings": {
         "grpc": {

diff --git a/samples/eShopLite/AppHost/Properties/launchSettings.json b/samples/eShopLite/AppHost/Properties/launchSettings.json
@@ -22,17 +22,6 @@
         "DOTNET_ENVIRONMENT": "Development",
         "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16031"
       }
-    },
-    "https": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:17888;http://localhost:15888",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:18031"
-      }
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json"

diff --git a/samples/eShopLite/AppHost/aspire-manifest.json b/samples/eShopLite/AppHost/aspire-manifest.json
@@ -1,17 +1,17 @@
 {
   "resources": {
     "postgres": {
-      "type": "postgres.server.v1"
+      "type": "postgres.server.v0"
     },
     "catalogdb": {
-      "type": "postgres.database.v1",
+      "type": "postgres.database.v0",
       "parent": "postgres"
     },
     "basketcache": {
-      "type": "redis.v1"
+      "type": "redis.v0"
     },
     "catalogservice": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\CatalogService\\CatalogService.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -32,13 +32,10 @@
       }
     },
     "messaging": {
-      "type": "azure.servicebus.v1",
-      "queues": [
-        "orders"
-      ]
+      "type": "rabbitmq.server.v0"
     },
     "basketservice": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\BasketService\\BasketService.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -60,7 +57,7 @@
       }
     },
     "frontend": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\MyFrontend\\MyFrontend.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -83,7 +80,7 @@
       }
     },
     "orderprocessor": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\OrderProcessor\\OrderProcessor.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -104,7 +101,7 @@
       }
     },
     "apigateway": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\ApiGateway\\ApiGateway.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -128,7 +125,7 @@
       }
     },
     "catalogdbapp": {
-      "type": "project.v1",
+      "type": "project.v0",
       "path": "..\\CatalogDb\\CatalogDb.csproj",
       "env": {
         "OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
@@ -149,4 +146,4 @@
       }
     }
   }
-}
+}
diff --git a/samples/eShopLite/BasketService/Protos/basket.proto b/samples/eShopLite/BasketService/Protos/basket.proto
@@ -47,7 +47,7 @@ message DeleteCustomerBasketRequest {
 message DeleteCustomerBasketResponse {
 }
 
-// See: https://learn.microsoft.com/en-us/dotnet/architecture/grpc-for-wcf-developers/protobuf-data-types#decimals
+// See: https://learn.microsoft.com/dotnet/architecture/grpc-for-wcf-developers/protobuf-data-types#decimals
 // Example: 12345.6789 -> { units = 12345, nanos = 678900000 }
 message DecimalValue {
 

diff --git a/src/Aspire.Dashboard/Components/Controls/ChartContainer.razor b/src/Aspire.Dashboard/Components/Controls/ChartContainer.razor
@@ -4,38 +4,45 @@
 @using Aspire.Dashboard.Otlp.Model
 @using Aspire.Dashboard.Otlp.Model.MetricValues
 
-<div class="metrics-chart" style="max-width: 1100px;">
-    <div class="metrics-chart-header" style="grid-column-end: span 2;">
-        <h3>@_instrument.Name</h3>
-        <p>@_instrument.Description</p>
-    </div>
-    <div class="metrics-chart-container">
-        <PlotlyChart InstrumentViewModel="_instrumentViewModel" Duration="Duration" />
-    </div>
-    @if (_viewModel.DimensionFilters.Count > 0)
-    {
-        <div class="metrics-filters-container">
-            <div style="margin-left: 10px">
-                <h5>Filters</h5>
-                <table style="width:100%">
-                    @foreach (var item in _viewModel.DimensionFilters)
-                    {
-                        <tr>
-                            <td class="dimension-name" title="@item.Name">@item.Name</td>
-                            <td class="dimension-values" title="@string.Join(", ", item.SelectedValues.Select(v => v.Name))">
-                                <FluentAutocomplete TOption="DimensionValueViewModel"
-                                                    Width="250px"
-                                                    Placeholder="Select filters"
-                                                    AriaLabel="Select filters"
-                                                    OnOptionsSearch="item.OnSearchAsync"
-                                                    OptionText="@(item => item.Name)"
-                                                    @bind-SelectedOptions="item.SelectedValues"
-                                                    @bind-SelectedOptions:after="async () => await DimensionValuesChangedAsync(item)" />
-                            </td>
-                        </tr>
-                    }
-                </table>
-            </div>
+@if (_instrument == null)
+{
+    <div>Unable to display chart.</div>
+}
+else
+{
+    <div class="metrics-chart" style="max-width: 1100px;">
+        <div class="metrics-chart-header" style="grid-column-end: span 2;">
+            <h3>@_instrument.Name</h3>
+            <p>@_instrument.Description</p>
+        </div>
+        <div class="metrics-chart-container">
+            <PlotlyChart InstrumentViewModel="_instrumentViewModel" Duration="Duration" />
         </div>
-    }
-</div>
+        @if (_viewModel.DimensionFilters.Count > 0)
+        {
+            <div class="metrics-filters-container">
+                <div style="margin-left: 10px">
+                    <h5>Filters</h5>
+                    <table style="width:100%">
+                        @foreach (var item in _viewModel.DimensionFilters)
+                        {
+                            <tr>
+                                <td class="dimension-name" title="@item.Name">@item.Name</td>
+                                <td class="dimension-values" title="@string.Join(", ", item.SelectedValues.Select(v => v.Name))">
+                                    <FluentAutocomplete TOption="DimensionValueViewModel"
+                                                        Width="250px"
+                                                        Placeholder="Select filters"
+                                                        AriaLabel="Select filters"
+                                                        OnOptionsSearch="item.OnSearchAsync"
+                                                        OptionText="@(item => item.Name)"
+                                                        @bind-SelectedOptions="item.SelectedValues"
+                                                        @bind-SelectedOptions:after="async () => await DimensionValuesChangedAsync(item)" />
+                                </td>
+                            </tr>
+                        }
+                    </table>
+                </div>
+            </div>
+        }
+    </div>    
+}