Skip to content

Commit 158ce26

Browse files
alxnikalxnik
authored
Merge pull request #68 from tileworkdev/develop
Updated automapper to 15.1.1
2 parents 0f647aa + 5318e3b commit 158ce26

File tree

10 files changed

+46
-25
lines changed

10 files changed

+46
-25
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Version>0.6.2</Version>
4+
</PropertyGroup>
5+
</Project>

‎tilework.core/ServiceCollectionExtensions.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ public static IServiceCollection AddLoadBalancing(this IServiceCollection servic
8282
{
8383
services.Configure<LoadBalancerConfiguration>(configuration);
8484

85-
services.AddAutoMapper(typeof(HAProxyConfigurationProfile));
86-
services.AddAutoMapper(typeof(HAProxyMonitoringProfile));
85+
services.AddAutoMapper(_ => { },
86+
typeof(HAProxyConfigurationProfile),
87+
typeof(HAProxyMonitoringProfile),
88+
typeof(LoadBalancingMappingProfile));
8789

8890
services.AddScoped<ILoadBalancerService, LoadBalancerService>();
8991
services.AddScoped<HAProxyConfigurator>();
9092

9193
services.AddHostedService<LoadBalancingInitializer>();
9294

93-
services.AddAutoMapper(typeof(LoadBalancingMappingProfile));
94-
9595
services.AddTransient<LoadBalancerCertificateListener>();
9696

9797
return services;
@@ -110,7 +110,7 @@ public static IServiceCollection AddCertificateManagement(this IServiceCollectio
110110

111111
services.AddHostedService<CertificateManagementInitializer>();
112112

113-
services.AddAutoMapper(typeof(CertificateManagementMappingProfile));
113+
services.AddAutoMapper(_ => { }, typeof(CertificateManagementMappingProfile));
114114

115115
services.AddTransient<CertificateRenewalJob>();
116116

‎tilework.core/tilework.core.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="AutoMapper" Version="14.0.0" />
10+
<PackageReference Include="AutoMapper" Version="15.1.1" />
1111
<PackageReference Include="ACMESharpCore" Version="2.2.0.148" />
1212
<PackageReference Include="Coravel" Version="6.0.2" />
1313
<PackageReference Include="CsvHelper" Version="33.1.0" />

‎tilework.ui/Components/Layout/NavMenu.razor‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
@namespace Tilework.Ui.Components.Layout
2+
@using System.Reflection
23

3-
<MudNavMenu>
4-
<MudNavGroup Title="Load balancing" Expanded="false">
5-
<MudNavLink Href="/lb/loadbalancers" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AltRoute">Load balancers</MudNavLink>
6-
<MudNavLink Href="/lb/targetgroups" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Storage">Target groups</MudNavLink>
7-
</MudNavGroup>
8-
<MudNavGroup Title="Certificates" Expanded="false">
9-
<MudNavLink Href="/cm/authorities" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AccountBalance">Certificate authorities</MudNavLink>
10-
<MudNavLink Href="/cm/certificates" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.VerifiedUser">Certificates</MudNavLink>
11-
</MudNavGroup>
12-
<MudNavGroup Title="Identity" Expanded="false">
13-
@* <MudNavLink Href="/im/providers" Match="NavLinkMatch.Prefix">Identity providers</MudNavLink> *@
14-
<MudNavLink Href="/im/users" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Person">Users</MudNavLink>
15-
</MudNavGroup>
16-
</MudNavMenu>
4+
<MudStack Class="d-flex flex-grow-1" StretchItems="StretchItems.Start">
5+
<MudNavMenu>
6+
<MudNavGroup Title="Load balancing" Expanded="false">
7+
<MudNavLink Href="/lb/loadbalancers" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AltRoute">Load balancers</MudNavLink>
8+
<MudNavLink Href="/lb/targetgroups" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Storage">Target groups</MudNavLink>
9+
</MudNavGroup>
10+
<MudNavGroup Title="Certificates" Expanded="false">
11+
<MudNavLink Href="/cm/authorities" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AccountBalance">Certificate authorities</MudNavLink>
12+
<MudNavLink Href="/cm/certificates" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.VerifiedUser">Certificates</MudNavLink>
13+
</MudNavGroup>
14+
<MudNavGroup Title="Identity" Expanded="false">
15+
@* <MudNavLink Href="/im/providers" Match="NavLinkMatch.Prefix">Identity providers</MudNavLink> *@
16+
<MudNavLink Href="/im/users" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Person">Users</MudNavLink>
17+
</MudNavGroup>
18+
</MudNavMenu>
19+
<MudStack StretchItems="StretchItems.End" Spacing="0">
20+
<MudDivider />
21+
<MudText Align="Align.Center" Typo="Typo.caption" Class="pa-2 mud-text-secondary text-center"><strong>@AppVersion</strong></MudText>
22+
</MudStack>
23+
</MudStack>
24+
25+
@code {
26+
private static readonly string AppVersion =
27+
"v" + Assembly.GetExecutingAssembly()
28+
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
29+
?.InformationalVersion?
30+
.Split('+')[0] ?? "0.0.0";
31+
}

‎tilework.ui/ServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public static class ServiceCollectionExtensions
77
{
88
public static IServiceCollection AddUserInterface(this IServiceCollection services)
99
{
10-
services.AddAutoMapper(typeof(FormMappingProfile));
10+
services.AddAutoMapper(_ => { }, typeof(FormMappingProfile));
1111
services.AddScoped<IBrowserTimeZoneProvider, BrowserTimeZoneProvider>();
1212
services.AddScoped<DownloadService>();
1313

‎tilework.ui/appsettings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"LogLevel": {
44
"Default": "Information",
55
"Microsoft.AspNetCore": "Warning",
6-
"Microsoft.EntityFrameworkCore": "Warning"
6+
"Microsoft.EntityFrameworkCore": "Warning",
7+
"LuckyPennySoftware.AutoMapper.License": "None"
78
}
89
},
910
"LoadBalancing": {

‎tilework.ui/tilework.ui.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
<ItemGroup>
12-
<PackageReference Include="AutoMapper" Version="14.0.0" />
12+
<PackageReference Include="AutoMapper" Version="15.1.1" />
1313
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎tilework.ui/wwwroot/css/fonts.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@font-face {
22
font-family: 'Inter';
3-
src: url('/fonts/inter/Inter-VariableFont_opsz,wght.ttf') format('truetype');
3+
src: url('/fonts/inter/Inter-VariableFont_opsz_wght.ttf') format('truetype');
44
font-weight: 100 900;
55
font-style: normal;
66
}
77

88
@font-face {
99
font-family: 'Inter';
10-
src: url('/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf') format('truetype');
10+
src: url('/fonts/inter/Inter-Italic-VariableFont_opsz_wght.ttf') format('truetype');
1111
font-weight: 100 900;
1212
font-style: italic;
1313
}

tilework.ui/wwwroot/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf renamed to tilework.ui/wwwroot/fonts/inter/Inter-Italic-VariableFont_opsz_wght.ttf

File renamed without changes.

tilework.ui/wwwroot/fonts/inter/Inter-VariableFont_opsz,wght.ttf renamed to tilework.ui/wwwroot/fonts/inter/Inter-VariableFont_opsz_wght.ttf

File renamed without changes.

0 commit comments

Comments
 (0)