migrating Stats to .Net Core 2

moved buildscripts to application
added publish profile

Application/Application.csproj

@@ -18,8 +18,32 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SharedLibraryCore\SharedLibraryCore.csproj" />
-    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj" />
+    <None Remove="IW4MAdminSettings.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="IW4MAdminSettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SharedLibraryCore\SharedLibraryCore.csproj">
+      <Private>true</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj">
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="call $(ProjectDir)BuildScripts\PreBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
+  </Target>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="call  $(ProjectDir)BuildScripts\PostBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)&#xD;&#xA;&#xD;&#xA;if $(ProjectDir) == &quot;*Undefined*&quot; (&#xD;&#xA;call BuildScripts\PostPublish.bat $(SolutionDir)&#xD;&#xA;)&#xD;&#xA;" />
+  </Target>
+
 </Project>

Application/BuildScripts/PostBuild.bat

@@ -0,0 +1,15 @@
+set SolutionDir=%1
+set ProjectDir=%2
+set TargetDir=%3
+set OutDir=%4
+
+echo "Copying dependency configs"
+copy "%SolutionDir%WebfrontCore\%OutDir%*.deps.json" "%TargetDir%"
+copy "%SolutionDir%SharedLibaryCore\%OutDir%*.deps.json" "%TargetDir%"
+
+if not exist "%TargetDir%Plugins" (
+	echo "Making plugin dir"
+	md "%TargetDir%Plugins"
+)
+
+xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"

Application/BuildScripts/PostPublish.bat

@@ -0,0 +1,5 @@
+set SolutionDir=%1
+
+;echo "Copying files for publish"
+;xcopy /Y "%SolutionDir%WebfrontCore\Views" "%SolutionDir%Publish\Windows\Views\"
+;xcopy /Y "%SolutionDir%WebfrontCore\wwwroot" "%SolutionDir%Publish\Windows\wwwroot\"

Application/BuildScripts/PreBuild.bat

@@ -0,0 +1,3 @@
+set SolutionDir=%1
+set ProjectDir=%2
+set TargetDir=%3

Application/IW4MAdminSettings.json

@@ -0,0 +1,239 @@
+{
+  "AutoMessagePeriod": 60,
+  "AutoMessages": [
+    "This server uses ^5IW4M Admin v{{VERSION}} ^7get it at ^5raidmax.org/IW4MAdmin",
+    "^5IW4M Admin ^7sees ^5YOU!",
+    "This server has seen a total of ^5{{TOTALPLAYERS}} ^7players!",
+    "Cheaters are ^1unwelcome ^7 on this server",
+    "Did you know 8/10 people agree with unverified statistics?"
+  ],
+  "GlobalRules": [
+    "Cheating/Exploiting is not allowed",
+    "Respect other players",
+    "Administrators have the final say",
+    "No racism or excessive trolling",
+    "Keep grenade launcher use to a minimum",
+    "Balance teams at ALL times"
+  ],
+  "Maps": [
+    {
+      "Game": "IW4",
+      "Maps": [
+        {
+          "Alias": "Rust",
+          "Name": "mp_rust"
+        },
+
+        {
+          "Alias": "Highrise",
+          "Name": "mp_highrise"
+        },
+
+        {
+          "Alias": "Terminal",
+          "Name": "mp_terminal"
+        },
+
+        {
+          "Alias": "Crash",
+          "Name": "mp_crash"
+        },
+
+        {
+          "Alias": "Skidrow",
+          "Name": "mp_nightshift"
+        },
+
+        {
+          "Alias": "Quarry",
+          "Name": "mp_quarry"
+        },
+
+        {
+          "Alias": "Afghan",
+          "Name": "mp_afghan"
+        },
+
+        {
+          "Alias": "Derail",
+          "Name": "mp_derail"
+        },
+
+        {
+          "Alias": "Estate",
+          "Name": "mp_estate"
+        },
+
+        {
+          "Alias": "Favela",
+          "Name": "mp_favela"
+        },
+
+        {
+          "Alias": "Highrise",
+          "Name": "mp_highrise"
+        },
+
+        {
+          "Alias": "Invasion",
+          "Name": "mp_invasion"
+        },
+
+        {
+          "Alias": "Karachi",
+          "Name": "mp_checkpoint"
+        },
+
+        {
+          "Alias": "Quarry",
+          "Name": "mp_quarry"
+        },
+
+        {
+          "Alias": "Rundown",
+          "Name": "mp_rundown"
+        },
+
+        {
+          "Alias": "Scrapyard",
+          "Name": "mp_boneyard"
+        },
+
+        {
+          "Alias": "Skidrow",
+          "Name": "mp_nightshift"
+        },
+
+        {
+          "Alias": "Sub Base",
+          "Name": "mp_subbase"
+        },
+
+        {
+          "Alias": "Underpass",
+          "Name": "mp_underpass"
+        },
+
+        {
+          "Alias": "Wasteland",
+          "Name": "mp_brecourt"
+        },
+
+        {
+          "Alias": "Overgrown",
+          "Name": "mp_overgrown"
+        },
+
+        {
+          "Alias": "Strike",
+          "Name": "mp_strike"
+        },
+
+        {
+          "Alias": "Vacant",
+          "Name": "mp_vacant"
+        },
+
+        {
+          "Alias": "Carnival",
+          "Name": "mp_abandon"
+        },
+
+        {
+          "Alias": "Trailer Park",
+          "Name": "mp_trailerpark"
+        },
+
+        {
+          "Alias": "Fuel",
+          "Name": "mp_fuel2"
+        },
+
+        {
+          "Alias": "Storm",
+          "Name": "mp_storm"
+        },
+
+        {
+          "Alias": "Bailout",
+          "Name": "mp_complex"
+        },
+
+        {
+          "Alias": "Salvage",
+          "Name": "mp_compact"
+        },
+
+        {
+          "Alias": "Nuketown",
+          "Name": "mp_nuked"
+        },
+
+        {
+          "Alias": "IW4 Credits",
+          "Name": "iw4_credits"
+        },
+
+        {
+          "Alias": "Killhouse",
+          "Name": "mp_killhouse"
+        },
+
+        {
+          "Alias": "Bog",
+          "Name": "mp_bog_sh"
+        },
+
+        {
+          "Alias": "Freighter",
+          "Name": "mp_cargoship_sh"
+        },
+
+        {
+          "Alias": "Shipment",
+          "Name": "mp_shipment"
+        },
+
+        {
+          "Alias": "Shipment - Long",
+          "Name": "mp_shipment_long"
+        },
+
+        {
+          "Alias": "Rust - Long",
+          "Name": "mp_rust_long"
+        },
+
+        {
+          "Alias": "Firing Range",
+          "Name": "mp_firingrange"
+        },
+
+        {
+          "Alias": "Chemical Plant",
+          "Name": "mp_storm_spring"
+        },
+
+        {
+          "Alias": "Favela - Tropical",
+          "Name": "mp_fav_tropical"
+        },
+
+        {
+          "Alias": "Estate - Tropical",
+          "Name": "mp_estate_tropical"
+        },
+
+        {
+          "Alias": "Crash - Tropical",
+          "Name": "mp_crash_tropical"
+        },
+
+        {
+          "Alias": "Forgotten City",
+          "Name": "mp_bloc_sh"
+        }
+      ]
+    }
+  ]
+}

Application/Main.cs

@@ -19,7 +19,7 @@ namespace IW4MAdmin.Application
             AppDomain.CurrentDomain.SetData("DataDirectory", OperatingDirectory);
             System.Diagnostics.Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.BelowNormal;
 
-            Version = 1.6;
+            Version = Assembly.GetExecutingAssembly().GetName().Version.Major + Assembly.GetExecutingAssembly().GetName().Version.Minor / 10.0f;
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4M ADMIN");

Application/Manager.cs

@@ -318,5 +318,7 @@ namespace IW4MAdmin.Application
         public IDictionary<int, Player> GetPrivilegedClients() => PrivilegedClients;
 
         public IEventApi GetEventApi() => Api;
+
+        public bool ShutdownRequested() => !Running;
     }
 }

Application/Server.cs

@@ -540,6 +540,7 @@ namespace IW4MAdmin
                 }
                 oldLines = lines;
                 l_size = LogFile.Length();
+                if (Manager.ShutdownRequested())
                 {
                     foreach (var plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
                         await plugin.OnUnloadAsync();