Skip to content

Commit fd9309a

Browse files
ysmoradiysmoradi
authored
feat(templates): refactor aspire configuration in bit Boilerplate #11470 (#11471)
1 parent ae445ae commit fd9309a

File tree

20 files changed

+174
-175
lines changed

20 files changed

+174
-175
lines changed

‎src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
displayName: 'Test'
4646
inputs:
4747
targetType: 'inline'
48-
script: 'dotnet test src/Tests/Boilerplate.Tests.csproj --logger AzurePipelines'
48+
script: 'dotnet test --project src/Tests/Boilerplate.Tests.csproj'
4949

5050
- task: PublishPipelineArtifact@1
5151
displayName: 'Upload Tests Artifact'

‎src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"ms-dotnettools.csharp",
2121
"ms-dotnettools.csdevkit",
2222
"ms-azuretools.vscode-docker",
23-
"DominicVonk.vscode-resx-editor",
2423
"ms-vscode-remote.remote-containers",
2524
"ms-dotnettools.blazorwasm-companion",
2625
"ms-dotnettools.vscode-dotnet-runtime"

‎src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Test
4242
id: test
43-
run: dotnet test src/Tests/Boilerplate.Tests.csproj --logger GitHubActions
43+
run: dotnet test --project src/Tests/Boilerplate.Tests.csproj
4444

4545
- name: Upload Tests Artifact
4646
uses: actions/upload-artifact@v4.4.1

‎src/Templates/Boilerplate/Bit.Boilerplate/dotnet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[dotnet.test.runner]
2+
name = "Microsoft.Testing.Platform"

‎src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/ClientWebSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public override IEnumerable<ValidationResult> Validate(ValidationContext validat
3636
public class AdsPushVapidOptions
3737
{
3838
/// <summary>
39-
/// Web push's vapid. More info at https://tools.reactpwa.com/vapid
39+
/// Web push's vapid. More info at https://d3v.one/vapid-key-generator/
4040
/// </summary>
4141
[Required]
4242
public string PublicKey { get; set; } = default!;

‎src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//#if (notification == true)
33
"AdsPushVapid_Comment": "https://github.com/adessoTurkey-dotNET/AdsPush",
44
"AdsPushVapid": {
5-
"AdsPushVapid_Comment": "Web push's vapid. More info at https://tools.reactpwa.com/vapid",
5+
"AdsPushVapid_Comment": "Web push's vapid. More info at https://d3v.one/vapid-key-generator/",
66
"PublicKey": "BDSNUvuIISD8NQVByQANEtZ2foKaENIcIGUxsiQs9kDz11fQik8c9WeiMwUHs3iTgNNH4nvXioNQIEsn4OAjTKc"
77
},
88
//#endif

‎src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<ItemGroup>
33
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
4-
<PackageVersion Include="Aspire.Hosting.DevTunnels" Version="9.5.0-preview.1.25474.7" />
54
<PackageVersion Include="Bit.Butil" Version="10.0.0-pre-02" />
65
<PackageVersion Include="Bit.BlazorUI" Version="10.0.0-pre-02" />
76
<PackageVersion Include="Bit.BlazorES2019" Version="10.0.0-pre-02" />
@@ -14,7 +13,7 @@
1413
<PackageVersion Include="Fido2.AspNet" Version="4.0.0" />
1514
<PackageVersion Include="Fido2.Models" Version="4.0.0" />
1615
<PackageVersion Include="HtmlSanitizer" Version="9.0.886" />
17-
<PackageVersion Include="libphonenumber-csharp" Version="9.0.15" />
16+
<PackageVersion Include="libphonenumber-csharp" Version="9.0.16" />
1817
<PackageVersion Include="Meziantou.Framework.Win32.Jobs" Version="3.4.5" />
1918
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0-rc.1.25451.107" />
2019
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.1.25451.107" />
@@ -32,13 +31,13 @@
3231
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.0-rc.1.25452.6" />
3332
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.0-rc.1.25452.6" />
3433
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="10.0.0-rc.1.25452.6" />
35-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
34+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3537.50" />
3635
<PackageVersion Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
3736
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.12.0-beta.2" />
3837
<PackageVersion Include="OpenTelemetry.Instrumentation.Hangfire" Version="1.12.0-beta.1" />
3938
<PackageVersion Include="OpenTelemetry.Resources.Azure" Version="1.12.0-beta.1" />
4039
<PackageVersion Include="OpenTelemetry.Resources.Container" Version="1.12.0-beta.1" />
41-
<PackageVersion Include="OpenTelemetry.Resources.Host" Version="1.12.0-beta.1" />
40+
<PackageVersion Include="OpenTelemetry.Resources.Host" Version="1.13.0-beta.1" />
4241
<PackageVersion Include="OpenTelemetry.Resources.OperatingSystem" Version="1.12.0-beta.1" />
4342
<PackageVersion Include="OpenTelemetry.Resources.Process" Version="1.12.0-beta.1" />
4443
<PackageVersion Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.12.0-beta.1" />
@@ -51,25 +50,28 @@
5150
<PackageVersion Include="Microsoft.Extensions.Logging.EventLog" Version="10.0.0-rc.1.25451.107" />
5251
<PackageVersion Include="Microsoft.Extensions.Logging.EventSource" Version="10.0.0-rc.1.25451.107" />
5352
<!--/+:msbuild-conditional:noEmit -->
54-
<PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.AppHost" Version="9.5.0" />
55-
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Aspire.Hosting.SqlServer" Version="9.5.0" />
53+
<PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="CommunityToolkit.Aspire.Hosting.MailPit" Version="9.8.0" />
54+
<PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.DevTunnels" Version="9.5.1-preview.1.25502.11" />
55+
<PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.AppHost" Version="9.5.1" />
56+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'Sqlite' OR '$(database)' == '') " Include="CommunityToolkit.Aspire.Hosting.Sqlite" Version="9.8.0" />
57+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Aspire.Hosting.SqlServer" Version="9.5.1" />
5658
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="CommunityToolkit.Aspire.Hosting.SqlServer.Extensions" Version="9.8.0" />
57-
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'PostgreSQL' OR '$(database)' == '') " Include="Aspire.Hosting.PostgreSQL" Version="9.5.0" />
58-
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'MySql' OR '$(database)' == '') " Include="Aspire.Hosting.MySql" Version="9.5.0" />
59-
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(filesStorage)' == 'AzureBlobStorage' OR '$(filesStorage)' == '') " Include="Aspire.Hosting.Azure.Storage" Version="9.5.0" />
59+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'PostgreSQL' OR '$(database)' == '') " Include="Aspire.Hosting.PostgreSQL" Version="9.5.1" />
60+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'MySql' OR '$(database)' == '') " Include="Aspire.Hosting.MySql" Version="9.5.1" />
61+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(filesStorage)' == 'AzureBlobStorage' OR '$(filesStorage)' == '') " Include="Aspire.Hosting.Azure.Storage" Version="9.5.1" />
6062
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(filesStorage)' == 'S3' OR '$(filesStorage)' == '') " Include="CommunityToolkit.Aspire.Hosting.Minio" Version="9.8.0" />
6163
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
62-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0" />
63-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.0" />
64-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.0" />
64+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1" />
65+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
66+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
6567
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
6668
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
6769
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
6870
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.21" />
6971
<PackageVersion Include="Hangfire.EntityFrameworkCore" Version="0.7.0" />
70-
<PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="5.16.0" />
71-
<PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="5.16.0" />
72-
<PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="5.16.0" />
72+
<PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.AspNetCore" Version="6.0.0-preview.1-prerelease" />
73+
<PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Extensions.Logging" Version="6.0.0-preview.1-prerelease" />
74+
<PackageVersion Condition=" '$(sentry)' == 'true' OR '$(sentry)' == '' " Include="Sentry.Maui" Version="6.0.0-preview.1-prerelease" />
7375
<PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.Firebase.Messaging" Version="125.0.0.1" />
7476
<PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.SavedState" Version="1.3.2" />
7577
<PackageVersion Condition=" '$(notification)' == 'true' OR '$(notification)' == ''" Include="Xamarin.AndroidX.SavedState.SavedState.Ktx" Version="1.3.2" />
@@ -82,7 +84,7 @@
8284
<PackageVersion Condition=" ('$(signalR)' == 'true' OR '$(signalR)' == '') OR ('$(database)' == 'PostgreSQL' OR '$(database)' == '') OR ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
8385
<PackageVersion Condition=" ('$(signalR)' == 'true' OR '$(signalR)' == '') OR ('$(database)' == 'PostgreSQL' OR '$(database)' == '') OR ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.9.1-preview.1.25474.6" />
8486
<PackageVersion Condition=" ('$(signalR)' == 'true' OR '$(signalR)' == '') OR ('$(database)' == 'PostgreSQL' OR '$(database)' == '') OR ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="SmartComponents.LocalEmbeddings.SemanticKernel" Version="0.1.0-preview10148" />
85-
<PackageVersion Condition=" ('$(signalR)' == 'true' OR '$(signalR)' == '') OR ('$(database)' == 'PostgreSQL' OR '$(database)' == '') OR ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Microsoft.SemanticKernel.Core" Version="1.65.0" />
87+
<PackageVersion Condition=" ('$(signalR)' == 'true' OR '$(signalR)' == '') OR ('$(database)' == 'PostgreSQL' OR '$(database)' == '') OR ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Microsoft.SemanticKernel.Core" Version="1.66.0" />
8688
<PackageVersion Condition=" ('$(database)' == 'PostgreSQL' OR '$(database)' == '') " Include="Pgvector.EntityFrameworkCore" Version="0.2.2" />
8789
<PackageVersion Condition="'$(module)' == 'Admin' OR '$(module)' == ''" Include="Newtonsoft.Json" Version="13.0.4" />
8890
<PackageVersion Condition=" '$(appInsights)' == 'true' OR '$(appInsights)' == '' " Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.23.0" />
@@ -94,11 +96,9 @@
9496
<PackageVersion Condition=" '$(filesStorage)' == 'S3' OR '$(filesStorage)' == '' " Include="FluentStorage.AWS" Version="6.0.0" />
9597
<PackageVersion Condition=" '$(appInsights)' == 'true' OR '$(appInsights)' == '' " Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0" />
9698
<PackageVersion Condition=" '$(appInsights)' == 'true' OR '$(appInsights)' == '' " Include="Azure.Monitor.OpenTelemetry.Profiler" Version="1.0.0-beta6" />
97-
<PackageVersion Condition=" '$(pipeline)' == 'GitHub' OR '$(pipeline)' == '' " Include="GitHubActionsTestLogger" Version="2.4.1" />
98-
<PackageVersion Condition=" '$(pipeline)' == 'Azure' " Include="AzurePipelines.TestLogger" Version="1.2.3" />
9999
<!--/-:msbuild-conditional:noEmit -->
100100
<PackageVersion Include="Humanizer" Version="2.14.1" />
101-
<PackageVersion Include="QRCoder" Version="1.6.0" />
101+
<PackageVersion Include="QRCoder" Version="1.7.0" />
102102
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.8.2" />
103103
<PackageVersion Include="FluentEmail.Smtp" Version="3.0.2" />
104104
<PackageVersion Include="FluentStorage" Version="6.0.0" />
@@ -127,9 +127,6 @@
127127
<PackageVersion Include="System.Text.Json" Version="10.0.0-rc.1.25451.107" />
128128
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
129129
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
130-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
131-
<PackageVersion Include="Microsoft.Playwright.MSTest" Version="1.55.0" />
132-
<PackageVersion Include="MSTest.TestAdapter" Version="3.10.4" />
133-
<PackageVersion Include="MSTest.TestFramework" Version="3.10.4" />
130+
<PackageVersion Include="Microsoft.Playwright.MSTest.v4" Version="1.55.0" />
134131
</ItemGroup>
135132
</Project>

‎src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/IConfigurationExtensions.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace Microsoft.Extensions.Configuration;
2+
3+
public static class IConfigurationExtensions
4+
{
5+
public static string GetRequiredConnectionString(this IConfiguration configuration, string key)
6+
{
7+
var connectionString = configuration.GetConnectionString(key);
8+
if (string.IsNullOrEmpty(connectionString))
9+
throw new InvalidOperationException($"Connection string '{key}' is not found.");
10+
return connectionString;
11+
}
12+
}

0 commit comments

Comments
 (0)