From e9b6283e5e0ca0aede39960f303353c5f78d5c17 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Sat, 20 Nov 2021 23:06:43 +1000
Subject: [PATCH] Added config files

---
 .../Controllers/ServerController.cs           |  6 ++--
 .../ServerManager.WebApplication.csproj       | 15 +++++++++-
 .../appsettings.Development.json              | 12 +++++++-
 .../appsettings.Production.json               | 27 ++++++++++++++++++
 .../appsettings.json                          | 28 +------------------
 .../web.Development.config                    | 12 ++++++++
 .../web.Production.config                     | 12 ++++++++
 src/ServerManager.WebApplication/web.config   |  3 ++
 8 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 src/ServerManager.WebApplication/appsettings.Production.json
 create mode 100644 src/ServerManager.WebApplication/web.Development.config
 create mode 100644 src/ServerManager.WebApplication/web.Production.config
 create mode 100644 src/ServerManager.WebApplication/web.config

diff --git a/src/ServerManager.WebApplication/Controllers/ServerController.cs b/src/ServerManager.WebApplication/Controllers/ServerController.cs
index c41916fc..35f2ad74 100644
--- a/src/ServerManager.WebApplication/Controllers/ServerController.cs
+++ b/src/ServerManager.WebApplication/Controllers/ServerController.cs
@@ -35,7 +35,7 @@ namespace ServerManager.WebApplication.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         [ProducesResponseType(StatusCodes.Status503ServiceUnavailable)]
-        public ActionResult GetServerStatus_V1([FromRoute] string ipString, [FromRoute] int port)
+        public ActionResult<ServerStatusResponse> GetServerStatus_V1([FromRoute] string ipString, [FromRoute] int port)
         {
             // check for valid service
             if (_serverQueryService == null)
@@ -70,7 +70,7 @@ namespace ServerManager.WebApplication.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         [ProducesResponseType(StatusCodes.Status503ServiceUnavailable)]
-        public ActionResult GetServerStatus_V2([FromRoute] string managerCode, [FromRoute] string ipString, [FromRoute] int port)
+        public ActionResult<ServerStatusResponse> GetServerStatus_V2([FromRoute] string managerCode, [FromRoute] string ipString, [FromRoute] int port)
         {
             // check for valid service
             if (_serverQueryService == null)
@@ -105,7 +105,7 @@ namespace ServerManager.WebApplication.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         [ProducesResponseType(StatusCodes.Status503ServiceUnavailable)]
-        public ActionResult GetServerStatus_V3([FromRoute] string managerCode, [FromRoute] string managerVersion, [FromRoute] string ipString, [FromRoute] int port)
+        public ActionResult<ServerStatusResponse> GetServerStatus_V3([FromRoute] string managerCode, [FromRoute] string managerVersion, [FromRoute] string ipString, [FromRoute] int port)
         {
             // check for valid service
             if (_serverQueryService == null)
diff --git a/src/ServerManager.WebApplication/ServerManager.WebApplication.csproj b/src/ServerManager.WebApplication/ServerManager.WebApplication.csproj
index 0204e11b..e7cc4e50 100644
--- a/src/ServerManager.WebApplication/ServerManager.WebApplication.csproj
+++ b/src/ServerManager.WebApplication/ServerManager.WebApplication.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <EnvironmentName>Development</EnvironmentName>
     <Configurations>Debug;Release;Debug - Beta</Configurations>
     <ApplicationIcon>Art\favicon.ico</ApplicationIcon>
   </PropertyGroup>
@@ -28,4 +29,16 @@
     <ProjectReference Include="..\QueryMaster\QueryMaster.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="web.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="web.Development.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="web.Production.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>
diff --git a/src/ServerManager.WebApplication/appsettings.Development.json b/src/ServerManager.WebApplication/appsettings.Development.json
index 8983e0fc..7d88afa5 100644
--- a/src/ServerManager.WebApplication/appsettings.Development.json
+++ b/src/ServerManager.WebApplication/appsettings.Development.json
@@ -5,5 +5,15 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
-  }
+  },
+
+  "EnableSwagger": true,
+  "SwaggerRoutePrefix": "",
+
+  "ManagerCodes": [
+    {
+      "Name": "Unknown",
+      "Code": "00000000-0000-0000-0000-000000000000"
+    }
+  ]
 }
diff --git a/src/ServerManager.WebApplication/appsettings.Production.json b/src/ServerManager.WebApplication/appsettings.Production.json
new file mode 100644
index 00000000..3af7e862
--- /dev/null
+++ b/src/ServerManager.WebApplication/appsettings.Production.json
@@ -0,0 +1,27 @@
+{
+  "EnableSwagger": true,
+  "SwaggerRoutePrefix": "",
+
+  "ManagerCodes": [
+    {
+      "Name": "Unknown",
+      "Code": "00000000-0000-0000-0000-000000000000"
+    },
+    {
+      "Name": "Ark",
+      "Code": "ED89B8FA-0E0B-46CC-A90B-595E69AE9A7E"
+    },
+    {
+      "Name": "Conan",
+      "Code": "F2653C3D-BC83-440A-AD99-FD9D9466DE04"
+    },
+    {
+      "Name": "Dark and Light",
+      "Code": "D80E19F9-33D2-4466-9177-A11506998E48"
+    },
+    {
+      "Name": "Pantropy",
+      "Code": "BE852556-BFC7-4AF2-82F3-F8A1CAF5C241"
+    }
+  ]
+}
diff --git a/src/ServerManager.WebApplication/appsettings.json b/src/ServerManager.WebApplication/appsettings.json
index c82953df..d9d9a9bf 100644
--- a/src/ServerManager.WebApplication/appsettings.json
+++ b/src/ServerManager.WebApplication/appsettings.json
@@ -6,31 +6,5 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*",
-
-  "EnableSwagger": true,
-  "SwaggerRoutePrefix": "",
-
-  "ManagerCodes": [
-    {
-      "Name": "Unknown",
-      "Code": "00000000-0000-0000-0000-000000000000"
-    },
-    {
-      "Name": "Ark",
-      "Code": "ED89B8FA-0E0B-46CC-A90B-595E69AE9A7E"
-    },
-    {
-      "Name": "Conan",
-      "Code": "F2653C3D-BC83-440A-AD99-FD9D9466DE04"
-    },
-    {
-      "Name": "Dark and Light",
-      "Code": "D80E19F9-33D2-4466-9177-A11506998E48"
-    },
-    {
-      "Name": "Pantropy",
-      "Code": "BE852556-BFC7-4AF2-82F3-F8A1CAF5C241"
-    }
-  ]
+  "AllowedHosts": "*"
 }
diff --git a/src/ServerManager.WebApplication/web.Development.config b/src/ServerManager.WebApplication/web.Development.config
new file mode 100644
index 00000000..958c4784
--- /dev/null
+++ b/src/ServerManager.WebApplication/web.Development.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- For more information on using transformations
+     see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <system.webServer>
+    <aspNetCore>
+      <environmentVariables>
+        <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
+      </environmentVariables>
+    </aspNetCore>
+  </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/src/ServerManager.WebApplication/web.Production.config b/src/ServerManager.WebApplication/web.Production.config
new file mode 100644
index 00000000..7c2042f8
--- /dev/null
+++ b/src/ServerManager.WebApplication/web.Production.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- For more information on using transformations
+     see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <system.webServer>
+    <aspNetCore>
+      <environmentVariables>
+        <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Production" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
+      </environmentVariables>
+    </aspNetCore>
+  </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/src/ServerManager.WebApplication/web.config b/src/ServerManager.WebApplication/web.config
new file mode 100644
index 00000000..49cc43e1
--- /dev/null
+++ b/src/ServerManager.WebApplication/web.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
\ No newline at end of file