Skip to content

Commit db2a133

Browse files
codebytescodebytes
committed
chore: Update package references and improve chat component styling
1 parent 3523b31 commit db2a133

10 files changed

Lines changed: 75 additions & 52 deletions

File tree

‎global.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"sdk": {
33
"version": "9.0.0",
4-
"rollForward": "latestMajor"
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": false
56
}
67
}

‎src/BuildWithAspire.Abstractions/BuildWithAspire.Abstractions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
9+
w <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9" />
1010
</ItemGroup>
1111
</Project>

‎src/BuildWithAspire.ApiService/BuildWithAspire.ApiService.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Aspire.Azure.AI.OpenAI" Version="9.4.2-preview.1.25428.12" />
12-
<PackageReference Include="Aspire.Azure.AI.Inference" Version="9.4.2-preview.1.25428.12" />
13-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.2" />
14-
<PackageReference Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.8.0-beta.389" />
11+
<PackageReference Include="Aspire.Azure.AI.OpenAI" Version="9.5.0-preview.1.25474.7" />
12+
<PackageReference Include="Aspire.Azure.AI.Inference" Version="9.5.0-preview.1.25474.7" />
13+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.5.0" />
14+
<PackageReference Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.8.0" />
1515
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
1616
<PackageReference Include="Azure.Identity" Version="1.16.0" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
2121
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.9" />
22-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
22+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.1" />
2323
<PackageReference Include="Microsoft.Extensions.AI.Ollama" Version="9.7.0-preview.1.25356.2" />
24-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
25-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.0-preview.1.25458.4" />
26-
<PackageReference Include="Microsoft.AI.Foundry.Local" Version="0.2.0" />
27-
<PackageReference Include="Scalar.AspNetCore" Version="2.8.5" />
24+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.1" />
25+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
26+
<PackageReference Include="Microsoft.AI.Foundry.Local" Version="0.3.0" />
27+
<PackageReference Include="Scalar.AspNetCore" Version="2.8.8" />
2828
<PackageReference Include="System.Text.Json" Version="9.0.9" />
2929
<PackageReference Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.65.0" />
3030
</ItemGroup>

‎src/BuildWithAspire.AppHost/BuildWithAspire.AppHost.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.4.2" />
2+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net9.0</TargetFramework>
@@ -10,15 +10,15 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2" />
14-
<PackageReference Include="Aspire.Hosting.Azure" Version="9.4.2" />
15-
<PackageReference Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.4.2" />
16-
<PackageReference Include="Aspire.Hosting.Azure.AIFoundry" Version="9.4.2-preview.1.25428.12" />
17-
<PackageReference Include="Aspire.Hosting.Azure.PostgreSQL" Version="9.4.2" />
18-
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.4.2" />
19-
<PackageReference Include="Aspire.Hosting.GitHub.Models" Version="9.4.2-preview.1.25428.12" />
13+
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.0" />
14+
<PackageReference Include="Aspire.Hosting.Azure" Version="9.5.0" />
15+
<PackageReference Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.5.0" />
16+
<PackageReference Include="Aspire.Hosting.Azure.AIFoundry" Version="9.5.0-preview.1.25474.7" />
17+
<PackageReference Include="Aspire.Hosting.Azure.PostgreSQL" Version="9.5.0" />
18+
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.5.0" />
19+
<PackageReference Include="Aspire.Hosting.GitHub.Models" Version="9.5.0-preview.1.25474.7" />
2020
<PackageReference Include="Azure.Provisioning.AppConfiguration" Version="1.1.0" />
21-
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.8.0-beta.389" />
21+
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.8.0" />
2222
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
2323
<PackageReference Include="System.Text.Json" Version="9.0.9" />
2424
</ItemGroup>

‎src/BuildWithAspire.ServiceDefaults/BuildWithAspire.ServiceDefaults.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

1313
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.2" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
1717
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />

‎src/BuildWithAspire.Web/BuildWithAspire.Web.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="Aspire.Azure.AI.OpenAI" Version="9.4.2-preview.1.25428.12" />
10+
<PackageReference Include="Aspire.Azure.AI.OpenAI" Version="9.5.0-preview.1.25474.7" />
1111
<PackageReference Include="Markdig" Version="0.42.0" />
1212
<PackageReference Include="Microsoft.Extensions.AI.Ollama" Version="9.7.0-preview.1.25356.2" />
1313
<PackageReference Include="System.Text.Json" Version="9.0.9" />

‎src/BuildWithAspire.Web/Components/Pages/Chat.razor‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,34 +75,38 @@
7575
{
7676
@foreach (var item in _messages?.ToList() ?? new List<BuildWithAspire.Web.Models.Message>())
7777
{
78-
<div class="@GetMessageCss(item.Role)">
79-
<div class="user">@item.Role</div>
80-
<div class="msg">
81-
@if (item.Role == "assistant")
82-
{
83-
@((MarkupString)Markdown.ToHtml(item.Content))
84-
}
85-
else
86-
{
87-
@item.Content
88-
}
78+
<div class="message-container">
79+
<div class="@GetMessageCss(item.Role)">
80+
<div class="user">@item.Role</div>
81+
<div class="msg">
82+
@if (item.Role == "assistant")
83+
{
84+
@((MarkupString)Markdown.ToHtml(item.Content))
85+
}
86+
else
87+
{
88+
@item.Content
89+
}
90+
</div>
91+
<div class="timestamp">@item.CreatedAt.ToLocalTime().ToString("HH:mm")</div>
8992
</div>
90-
<div class="timestamp">@item.CreatedAt.ToLocalTime().ToString("HH:mm")</div>
9193
</div>
9294
}
9395
}
9496

9597
@if (_isLoading)
9698
{
97-
<div class="received">
98-
<div class="user">assistant</div>
99-
<div class="msg">Thinking...</div>
99+
<div class="message-container">
100+
<div class="received">
101+
<div class="user">assistant</div>
102+
<div class="msg">Thinking...</div>
103+
</div>
100104
</div>
101105
}
102106
</div>
103107

104108
<div class="chat-input">
105-
<input @ref="_inputRef" class="input-lg" placeholder="Type your message..." @bind="_newMessage" @onkeydown="OnKeyDown" @onkeydown:preventDefault="false" disabled="@_isLoading" />
109+
<input @ref="_inputRef" class="input-lg" placeholder="Type your message..." @bind="_newMessage" @onkeyup="OnKeyUp" disabled="@_isLoading" />
106110
<button type="button" class="btn btn-default btn-primary" @onclick="OnSendClick" @onclick:preventDefault="true" disabled="@(_isLoading || string.IsNullOrWhiteSpace(_newMessage))">
107111
@if (_isLoading)
108112
{
@@ -235,7 +239,7 @@
235239
}
236240
}
237241

238-
private async Task OnKeyDown(KeyboardEventArgs e)
242+
private async Task OnKeyUp(KeyboardEventArgs e)
239243
{
240244
if (e.Key == "Enter" && !e.ShiftKey && !_isLoading && !string.IsNullOrWhiteSpace(_newMessage))
241245
{
@@ -476,29 +480,39 @@
476480
flex: 1;
477481
}
478482
479-
.sent, .received {
483+
.message-container {
484+
width: 100%;
480485
margin-bottom: 1rem;
486+
display: block;
487+
clear: both;
488+
}
489+
490+
.sent, .received {
491+
display: block;
481492
padding: 0.75rem;
482493
border-radius: 8px;
494+
margin-bottom: 0;
495+
max-width: 70%;
496+
word-wrap: break-word;
497+
width: fit-content;
483498
position: relative;
484-
clear: both;
485499
}
486500
487501
.sent {
488502
background-color: #0d6efd;
489503
color: white;
490-
margin-left: 25%;
491-
margin-right: 1rem;
492-
float: right;
504+
margin-left: auto;
505+
margin-right: 0;
506+
text-align: left;
493507
}
494508
495509
.received {
496510
background-color: white;
497511
color: black;
498-
margin-right: 25%;
499-
margin-left: 1rem;
500512
border: 1px solid #dee2e6;
501-
float: left;
513+
margin-left: 0;
514+
margin-right: auto;
515+
text-align: left;
502516
}
503517
504518
.user {
@@ -555,4 +569,12 @@
555569
element.scrollTop = element.scrollHeight;
556570
}
557571
};
572+
573+
window.handleEnterKey = (event) => {
574+
if (event.key === 'Enter' && !event.shiftKey) {
575+
event.preventDefault();
576+
return false;
577+
}
578+
return true;
579+
};
558580
</script>

‎tests/BuildWithAspire.ApiService.UnitTests/BuildWithAspire.ApiService.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1414
<PackageReference Include="xunit" Version="2.9.3" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
15+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
@@ -23,7 +23,7 @@
2323
<PackageReference Include="NSubstitute" Version="5.3.0" />
2424
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.9" />
2525
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
26-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
26+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.1" />
2727
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
2828
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.9" />
2929
</ItemGroup>

‎tests/BuildWithAspire.AppHost.UnitTests/BuildWithAspire.AppHost.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Aspire.Hosting.Testing" Version="9.4.2" />
13+
<PackageReference Include="Aspire.Hosting.Testing" Version="9.5.0" />
1414
<PackageReference Include="coverlet.collector" Version="6.0.4">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1919
<PackageReference Include="xunit" Version="2.9.3" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
20+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

‎tests/BuildWithAspire.Web.UnitTests/BuildWithAspire.Web.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1414
<PackageReference Include="xunit" Version="2.9.3" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
15+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>

0 commit comments

Comments
 (0)