Skip to content

Commit b7452fb

Browse files
committed
TD-5930 Properties Environment is redundant as in top level appsettings
1 parent 91078fe commit b7452fb

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

LearningHub.Nhs.WebUI.BlazorClient/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
return new TELBlazorBaseComponentConfiguration
6464
{
6565
JSEnabled = true, //if we are inject the client then it is true
66-
HostType = $"{builder.Configuration["Properties:Environment"]} {builder.Configuration["Properties:Application"]}"
66+
HostType = $"{builder.Configuration["Environment"]} {builder.Configuration["Properties:Application"]}"
6767
};
6868
});
6969

LearningHub.Nhs.WebUI.BlazorClient/wwwroot/appsettings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"Environment": "",
23
"Settings": {
34
"BuildNumber": "Production",
45
"https": null,
@@ -49,7 +50,6 @@
4950
}
5051
},
5152
"Properties": {
52-
"Application": "LearningHub Nhs WebUI Blazor Client",
53-
"Environment": "Production"
53+
"Application": "LearningHub Nhs WebUI Blazor Client"
5454
}
5555
}

LearningHub.Nhs.WebUI.sln

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 17.4.33213.308
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearningHub.Nhs.WebUI", "LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj", "{16BBF937-C1E9-4240-B56E-20E3E5FA2005}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{9F1B0470-E809-49FE-A6E8-152C7EBD012E} = {9F1B0470-E809-49FE-A6E8-152C7EBD012E}
9-
EndProjectSection
107
EndProject
118
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B5D48B6A-D4A7-494E-89C0-64428232D242}"
129
ProjectSection(SolutionItems) = preProject
13-
.editorconfig = .editorconfig
14-
global.json = global.json
10+
Directory.Build.props = Directory.Build.props
11+
Directory.Packages.props = Directory.Packages.props
1512
nuget.config = nuget.config
16-
nuget.config.cicd = nuget.config.cicd
17-
nuget.config.template = nuget.config.template
1813
StyleCop.ruleset = StyleCop.ruleset
1914
EndProjectSection
2015
EndProject
@@ -23,9 +18,6 @@ EndProject
2318
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MigrationTool", "MigrationTool", "{94676CCE-A38B-4FAF-905E-CE85CE95845E}"
2419
EndProject
2520
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearningHub.Nhs.Api", "WebAPI\LearningHub.Nhs.API\LearningHub.Nhs.Api.csproj", "{21F15E96-314F-4F39-822F-C2568CDC4A5A}"
26-
ProjectSection(ProjectDependencies) = postProject
27-
{9F1B0470-E809-49FE-A6E8-152C7EBD012E} = {9F1B0470-E809-49FE-A6E8-152C7EBD012E}
28-
EndProjectSection
2921
EndProject
3022
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearningHub.Nhs.Api.Shared", "WebAPI\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj", "{719833B9-EC79-48F2-9123-C4DF111AE9AA}"
3123
EndProject
@@ -60,9 +52,6 @@ EndProject
6052
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdminUI", "AdminUI", "{9642BC19-BAE7-45A9-B4F2-8D7529786CDC}"
6153
EndProject
6254
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearningHub.Nhs.AdminUI", "AdminUI\LearningHub.Nhs.AdminUI\LearningHub.Nhs.AdminUI.csproj", "{1C97A3C2-73E8-4AFF-92EF-F65B4899FADB}"
63-
ProjectSection(ProjectDependencies) = postProject
64-
{9F1B0470-E809-49FE-A6E8-152C7EBD012E} = {9F1B0470-E809-49FE-A6E8-152C7EBD012E}
65-
EndProjectSection
6655
EndProject
6756
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenAPI", "OpenAPI", "{66ED23A2-F15A-4ECB-A84D-736C95BEFC61}"
6857
EndProject

LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
164164
return new TELBlazorBaseComponentConfiguration
165165
{
166166
JSEnabled = jsEnabled,
167-
HostType = $"{configuration["Properties:Environment"]} {configuration["Properties:Application"]}",
167+
HostType = $"{configuration["Environment"]} {configuration["Properties:Application"]}",
168168
};
169169
});
170170

0 commit comments

Comments
 (0)