Skip to content

Commit 7cc6247

Browse files
authored
fix(infra): fix several small issues regarding latest dependencies update #11629 (#11630)
1 parent bb3b0a4 commit 7cc6247

File tree

8 files changed

+25
-7
lines changed

8 files changed

+25
-7
lines changed

.github/workflows/bit.full.ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ jobs:
6262
dotnet build
6363
pwsh bin/Debug/net10.0/playwright.ps1 install --with-deps
6464
dotnet test
65+
cd ../../../
66+
rm -r "TestPostgreSQL"
6567
6668
- name: Upload Tests Artifact
6769
uses: actions/upload-artifact@v5
@@ -84,6 +86,8 @@ jobs:
8486
dotnet build
8587
pwsh bin/Debug/net10.0/playwright.ps1 install --with-deps
8688
dotnet test
89+
cd ../../../
90+
rm -r "SimpleTest"
8791
8892
- name: Upload Tests Artifact
8993
uses: actions/upload-artifact@v5

src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/App.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
55
xmlns:android="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;assembly=Microsoft.Maui.Controls"
66
xmlns:app="clr-namespace:Bit.BlazorUI.Demo.Client.Maui"
7-
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
87
android:Application.WindowSoftInputModeAdjust="Resize">
98
<Application.Resources>
109
<ResourceDictionary>
1110
<Style ApplyToDerivedTypes="True" TargetType="ContentPage">
1211
<Setter Property="NavigationPage.HasNavigationBar" Value="False" />
13-
<Setter Property="ios:Page.UseSafeArea" Value="False" />
12+
<Setter Property="SafeAreaEdges" Value="Default" />
1413
</Style>
1514
</ResourceDictionary>
1615
</Application.Resources>

src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,8 @@
584584
{
585585
"condition": "(database != PostgreSQL)",
586586
"exclude": [
587-
"src/Server/Boilerplate.Server.Api/Data/Configurations/PostgresDateTimeOffsetConverter.cs"
587+
"src/Server/Boilerplate.Server.Api/Data/Configurations/PostgresDateTimeOffsetConverter.cs",
588+
"src/Server/Boilerplate.Server.AppHost/Extensions/IResourceBuilderExtensions.cs"
588589
]
589590
},
590591
{

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegatingHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
1212
request.SetBrowserRequestCredentials(BrowserRequestCredentials.Omit);
1313
request.SetBrowserResponseStreamingEnabled(true);
1414

15-
request.Version = HttpVersion.Version20;
15+
request.Version = HttpVersion.Version30;
1616
request.VersionPolicy = HttpVersionPolicy.RequestVersionOrLower;
1717

1818
if (request.Headers.UserAgent.Any() is false)

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/AppDbContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private void ConfigureConcurrencyStamp(ModelBuilder modelBuilder)
271271
// In order to enable embedding, the `pgvector` extension must be installed in your PostgreSQL.
272272
//#if (aspire == false)
273273
// The following command runs the postgreSQL container with the `pgvector` extension:
274-
// docker run -d --name postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=BoilerplateDb -p 5432:5432 -v pgdata:/var/lib/postgresql/data --restart unless-stopped pgvector/pgvector:pg17
274+
// docker run -d --name postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=BoilerplateDb -p 5432:5432 -v pgdata:/var/lib/postgresql --restart unless-stopped pgvector/pgvector:pg18
275275
//#endif
276276
//#elif (database == "SqlServer")
277277
// This requires SQL Server 2025+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace Aspire.Hosting.ApplicationModel;
2+
3+
public static class IResourceBuilderExtensions
4+
{
5+
/// <summary>
6+
/// https://github.com/dotnet/aspire/issues/11710
7+
/// </summary>
8+
public static IResourceBuilder<PostgresServerResource> WithV18DataVolume(
9+
this IResourceBuilder<PostgresServerResource> builder, string? name = null, bool isReadOnly = false)
10+
{
11+
return builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"),
12+
"/var/lib/postgresql/18/docker", isReadOnly);
13+
}
14+
}

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.AppHost/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//#elif (database == "PostgreSql")
1616
var postgresDatabase = builder.AddPostgres("postgresserver")
1717
.WithPgAdmin(config => config.WithVolume("/var/lib/pgadmin/Boilerplate/data"))
18-
.WithDataVolume()
18+
.WithV18DataVolume()
1919
.WithImage("pgvector/pgvector", "pg18") // pgvector supports embedded vector search.
2020
.AddDatabase("postgresdb");
2121

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Shared/Extensions/WebApplicationBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder)
8484
{
8585
http.ConfigureHttpClient(httpClient =>
8686
{
87-
httpClient.DefaultRequestVersion = HttpVersion.Version20;
87+
httpClient.DefaultRequestVersion = HttpVersion.Version30;
8888
httpClient.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
8989
});
9090

0 commit comments

Comments
 (0)