Skip to content

Commit 0a0b241

Browse files
authored
feat(infra): delete Link and Script components across projects #11324 (#11325)
1 parent ba9e13a commit 0a0b241

File tree

18 files changed

+20
-222
lines changed

18 files changed

+20
-222
lines changed

src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Extensions/IServiceCollectionExtensions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public static void AddBlazor(this IServiceCollection services, IConfiguration co
2727
.AddInteractiveServerComponents()
2828
.AddInteractiveWebAssemblyComponents();
2929

30-
services.AddMvc();
31-
3230
services.AddClientWebServices();
3331
}
3432

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,16 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
2525
request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(CultureInfo.CurrentUICulture.Name));
2626
}
2727

28-
request.Headers.Add("X-App-Version", telemetryContext.AppVersion);
29-
request.Headers.Add("X-App-Platform", AppPlatform.Type.ToString());
28+
var isInternalRequest = request.HasExternalApiAttribute() is false;
29+
if (isInternalRequest)
30+
{
31+
request.Headers.Add("X-App-Version", telemetryContext.AppVersion);
32+
request.Headers.Add("X-App-Platform", AppPlatform.Type.ToString());
33+
}
34+
else
35+
{
36+
request.Headers.Remove("X-Origin"); // It gets added by default in Program.Services.cs of Client projects and it might be rejected by some external APIs due to CORS limitations.
37+
}
3038

3139
return await base.SendAsync(request, cancellationToken);
3240
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<PackageVersion Include="Bit.Bswup" Version="9.11.4-pre-02" />
1111
<PackageVersion Include="Bit.CodeAnalyzers" Version="9.11.4-pre-02" />
1212
<PackageVersion Include="Bit.SourceGenerators" Version="9.11.4-pre-02" />
13-
<PackageVersion Include="Fido2.AspNet" Version="4.0.0-beta.17" />
14-
<PackageVersion Include="Fido2.Models" Version="4.0.0-beta.17" />
13+
<PackageVersion Include="Fido2.AspNet" Version="4.0.0" />
14+
<PackageVersion Include="Fido2.Models" Version="4.0.0" />
1515
<PackageVersion Include="HtmlSanitizer" Version="9.0.886" />
16-
<PackageVersion Include="libphonenumber-csharp" Version="9.0.12" />
16+
<PackageVersion Include="libphonenumber-csharp" Version="9.0.13" />
1717
<PackageVersion Include="Meziantou.Framework.Win32.Jobs" Version="3.4.3" />
1818
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.8" />
1919
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
@@ -52,11 +52,11 @@
5252
<!--/+:msbuild-conditional:noEmit -->
5353
<PackageVersion Condition=" '$(aspire)' == 'true' OR '$(aspire)' == '' " Include="Aspire.Hosting.AppHost" Version="9.4.1" />
5454
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="Aspire.Hosting.SqlServer" Version="9.4.1" />
55-
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="CommunityToolkit.Aspire.Hosting.SqlServer.Extensions" Version="9.7.1" />
55+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'SqlServer' OR '$(database)' == '') " Include="CommunityToolkit.Aspire.Hosting.SqlServer.Extensions" Version="9.7.2" />
5656
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'PostgreSQL' OR '$(database)' == '') " Include="Aspire.Hosting.PostgreSQL" Version="9.4.1" />
5757
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(database)' == 'MySql' OR '$(database)' == '') " Include="Aspire.Hosting.MySql" Version="9.4.1" />
5858
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(filesStorage)' == 'AzureBlobStorage' OR '$(filesStorage)' == '') " Include="Aspire.Hosting.Azure.Storage" Version="9.4.1" />
59-
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(filesStorage)' == 'S3' OR '$(filesStorage)' == '') " Include="CommunityToolkit.Aspire.Hosting.Minio" Version="9.7.1" />
59+
<PackageVersion Condition=" ('$(aspire)' == 'true' OR '$(aspire)' == '') AND ('$(filesStorage)' == 'S3' OR '$(filesStorage)' == '') " Include="CommunityToolkit.Aspire.Hosting.Minio" Version="9.7.2" />
6060
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0" />
6161
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.1" />
6262
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
@@ -96,7 +96,7 @@
9696
<!--/-:msbuild-conditional:noEmit -->
9797
<PackageVersion Include="Humanizer" Version="2.14.1" />
9898
<PackageVersion Include="QRCoder" Version="1.6.0" />
99-
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.8.1" />
99+
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.8.2" />
100100
<PackageVersion Include="FluentEmail.Smtp" Version="3.0.2" />
101101
<PackageVersion Include="FluentStorage" Version="5.6.0" />
102102
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.8" />
@@ -107,14 +107,14 @@
107107
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8" />
108108
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8" />
109109
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.4" />
110-
<PackageVersion Include="Microsoft.Identity.Web" Version="3.13.2" />
110+
<PackageVersion Include="Microsoft.Identity.Web" Version="3.14.0" />
111111
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.8" />
112112
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.8" />
113113
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.8" />
114114
<PackageVersion Include="AspNet.Security.OAuth.Apple" Version="9.4.0" />
115115
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="9.4.0" />
116116
<PackageVersion Include="Riok.Mapperly" Version="4.2.1" />
117-
<PackageVersion Include="Twilio" Version="7.12.1" />
117+
<PackageVersion Include="Twilio" Version="7.12.2" />
118118
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
119119
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.8" />
120120
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ string GetValue(string connectionString, string key, string? defaultValue = null
178178
policy.SetIsOriginAllowed(origin => Uri.TryCreate(origin, UriKind.Absolute, out var uri) && settings.IsTrustedOrigin(uri))
179179
.AllowAnyHeader()
180180
.AllowAnyMethod()
181-
.WithExposedHeaders(HeaderNames.RequestId, "Age", "App-Cache-Response");
181+
.WithExposedHeaders(HeaderNames.RequestId,
182+
HeaderNames.Age, "App-Cache-Response", "X-App-Platform", "X-App-Version", "X-Origin");
182183
});
183184
});
184185

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/Link.razor

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/Link.razor.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/Script.razor

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/Script.razor.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,5 @@ private static void AddBlazor(WebApplicationBuilder builder)
139139
services.AddRazorComponents()
140140
.AddInteractiveServerComponents()
141141
.AddInteractiveWebAssemblyComponents();
142-
143-
services.AddMvc();
144142
}
145143
}

src/Websites/Careers/src/Bit.Websites.Careers.Server/Components/Link.razor

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)