Skip to content

Commit cae0e45

Browse files
committed
Merge remote-tracking branch 'origin/main' into cli-prs-scripts
# Conflicts: # .github/workflows/build-cli-native-archives.yml # .github/workflows/tests.yml
2 parents 5f1eb80 + 4068463 commit cae0e45

36 files changed

+119
-138
lines changed

src/Aspire.Cli/Aspire.Cli.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
<!-- Set the nuget properties when building as a global tool. -->
2121
<PropertyGroup Condition="'$(IsCliToolProject)' == 'true'">
22-
<!-- This package needs to remain as preview. -->
23-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
2422
<IsPackable>true</IsPackable>
2523
<PackAsTool>true</PackAsTool>
2624
<ToolCommandName>aspire</ToolCommandName>

src/Aspire.Dashboard/Components/Pages/Resources.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
Virtualize="true"
128128
GenerateHeader="GenerateHeaderOption.Sticky"
129129
ItemSize="46"
130+
OverscanCount="100"
130131
ItemsProvider="@GetData"
131132
ResizableColumns="true"
132133
ResizeColumnOnAllRows="false"

src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
RowClass="@GetRowClass"
123123
GenerateHeader="GenerateHeaderOption.Sticky"
124124
ItemSize="46"
125+
OverscanCount="100"
125126
ResizableColumns="true"
126127
ResizeColumnOnAllRows="false"
127128
ItemsProvider="@GetData"

src/Aspire.Dashboard/Components/Pages/TraceDetail.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
RowClass="@GetRowClass"
110110
GridTemplateColumns="@_manager.GetGridTemplateColumns()"
111111
RowSize="DataGridRowSize.Small"
112+
OverscanCount="100"
112113
ShowHover="true"
113114
ItemKey="@(r => r.Span.SpanId)"
114115
OnRowClick="@(r => r.ExecuteOnDefault(d => OnShowPropertiesAsync(d, buttonId: null)))">

src/Aspire.Dashboard/Components/Pages/Traces.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
RowClass="@GetRowClass"
9393
GenerateHeader="GenerateHeaderOption.Sticky"
9494
ItemSize="46"
95+
OverscanCount="100"
9596
ResizableColumns="true"
9697
ResizeColumnOnAllRows="false"
9798
ItemsProvider="@GetData"

src/Aspire.Dashboard/Resources/xlf/ControlsStrings.cs.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Aspire.Dashboard/Resources/xlf/ControlsStrings.de.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Aspire.Dashboard/Resources/xlf/ControlsStrings.es.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Aspire.Dashboard/Resources/xlf/ControlsStrings.fr.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Aspire.Dashboard/Resources/xlf/ControlsStrings.it.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)