update to .NET Core 2.1

fix bower repo deprecation

.gitignore

@@ -220,9 +220,9 @@ Thumbs.db
 DEPLOY
 global.min.css
 global.min.js
-bootstrap-custom.css
 bootstrap-custom.min.css
 **/Master/static
 **/Master/dev_env
 /WebfrontCore/Views/Plugins/Stats
-/WebfrontCore/wwwroot/images/icons
+/WebfrontCore/wwwroot/**/dds
+

Application/Application.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
     <Version>2.1.1</Version>
@@ -75,7 +75,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App"/>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

Application/Manager.cs

@@ -94,7 +94,7 @@ namespace IW4MAdmin.Application
                     .ToList();
 
                 // this is to prevent the log reader from starting before the initial
-               // query of players on the server
+                // query of players on the server
                 if (serverTasksToRemove.Count > 0)
                 {
                     IsInitialized = true;
@@ -142,7 +142,7 @@ namespace IW4MAdmin.Application
         {
             Running = true;
 
-#region DATABASE
+            #region DATABASE
             var ipList = (await ClientSvc.Find(c => c.Level > Player.Permission.Trusted))
                 .Select(c => new
                 {
@@ -172,9 +172,9 @@ namespace IW4MAdmin.Application
                     continue;
                 }
             }
-#endregion
+            #endregion
 
-#region CONFIG
+            #region CONFIG
             var config = ConfigHandler.Configuration();
 
             // copy over default config if it doesn't exist
@@ -225,8 +225,8 @@ namespace IW4MAdmin.Application
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(config.CustomParserEncoding) ? config.CustomParserEncoding : "windows-1252");
 
-#endregion
+            #endregion
-#region PLUGINS
+            #region PLUGINS
             SharedLibraryCore.Plugins.PluginImporter.Load(this);
 
             foreach (var Plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
@@ -243,9 +243,9 @@ namespace IW4MAdmin.Application
                     Logger.WriteDebug($"Stack Trace: {e.StackTrace}");
                 }
             }
-#endregion
+            #endregion
 
-#region COMMANDS
+            #region COMMANDS
             if (ClientSvc.GetOwners().Result.Count == 0)
                 Commands.Add(new COwner());
 
@@ -289,9 +289,9 @@ namespace IW4MAdmin.Application
 
             foreach (Command C in SharedLibraryCore.Plugins.PluginImporter.ActiveCommands)
                 Commands.Add(C);
-#endregion
+            #endregion
 
-#region INIT
+            #region INIT
             async Task Init(ServerConfiguration Conf)
             {
                 // setup the event handler after the class is initialized
@@ -327,7 +327,7 @@ namespace IW4MAdmin.Application
             }
 
             await Task.WhenAll(config.Servers.Select(c => Init(c)).ToArray());
-#endregion
+            #endregion
         }
 
         private async Task SendHeartbeat(object state)
@@ -445,7 +445,7 @@ namespace IW4MAdmin.Application
             {
                 // wait for new event to be added
                 OnEvent.Wait();
-                while((queuedEvent = Handler.GetNextEvent()) != null)
+                while ((queuedEvent = Handler.GetNextEvent()) != null)
                 {
                     if (GameEvent.ShouldOriginEventBeDelayed(queuedEvent))
                     {
@@ -462,7 +462,17 @@ namespace IW4MAdmin.Application
                         queuedEvent.Target.DelayedEvents.Enqueue(queuedEvent);
                         continue;
                     }
-                    await processEvent(queuedEvent);
+
+                    if (queuedEvent.Type == GameEvent.EventType.Connect)
+                    {
+                        // we don't want to block here to due to needing event completion in the addplayer method
+                        processEvent(queuedEvent);
+                    }
+
+                    else
+                    {
+                        await processEvent(queuedEvent);
+                    }
                 }
 
                 // signal that all events have been processed

Application/Server.cs

@@ -174,19 +174,13 @@ namespace IW4MAdmin
                         await Manager.GetClientService().Update(client);
                     }
 
-                    else if (existingAlias.Name == polledPlayer.Name ||
+                    else
-                        // fixme: why would this be null?
-                        client.CurrentAlias == null)
                     {
                         client.CurrentAlias = existingAlias;
                         client.CurrentAliasId = existingAlias.AliasId;
-                        // we need to update their new ip and name to the virtual property
+                        client.Name = existingAlias.Name;
-                        client.Name = polledPlayer.Name;
+                        client.IPAddress = existingAlias.IPAddress;
-                        client.IPAddress = polledPlayer.IPAddress;
-
-                        client = await Manager.GetClientService().Update(client);
                     }
-
                     player = client.AsPlayer();
                 }
 
@@ -198,7 +192,6 @@ namespace IW4MAdmin
                 player.Score = polledPlayer.Score;
                 player.IsAuthenticated = true;
                 player.CurrentServer = this;
-                player.State = Player.ClientState.Connected;
                 Players[player.ClientNumber] = player;
 
                 var activePenalties = await Manager.GetPenaltyService().GetActivePenaltiesAsync(player.AliasLinkId, player.IPAddress);
@@ -251,8 +244,13 @@ namespace IW4MAdmin
                     Origin = player,
                     Owner = this
                 };
+
                 Manager.GetEventHandler().AddEvent(e);
 
+                // let all the plugins get the event 
+                // this is only beause the connect event executes 
+                e.OnProcessed.Wait();
+
                 // add the delayed event to the queue 
                 while (delayedEventQueue?.Count > 0)
                 {
@@ -262,7 +260,8 @@ namespace IW4MAdmin
                     if (e.Target != null)
                     {
                         // update the target incase they left or have newer info
-                        e.Target = GetPlayersAsList().FirstOrDefault(p => p.NetworkId == e.Target.NetworkId);
+                        e.Target = GetPlayersAsList()
+                            .FirstOrDefault(p => p.NetworkId == e.Target.NetworkId);
                         // we have to throw out the event because they left
                         if (e.Target == null)
                         {
@@ -293,7 +292,7 @@ namespace IW4MAdmin
                 Player Leaving = Players[cNum];
                 Logger.WriteInfo($"Client {Leaving} disconnecting...");
 
-                if (!Leaving.IsAuthenticated)
+                if (!Leaving.IsAuthenticated || Leaving.State != Player.ClientState.Connected)
                 {
                     Players[cNum] = null;
                 }

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App"/>
   </ItemGroup>
 
 </Project>

Plugins/Login/Login.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Login</PackageId>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App"/>
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App"/>
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Stats/Cheat/Detection.cs

@@ -140,7 +140,8 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             }
 
             // flag
-            if (currentStrain > Thresholds.MaxStrainFlag)
+            if (currentStrain > Thresholds.MaxStrainFlag
+                && HitCount >= 10)
             {
                 result = new DetectionPenaltyResult()
                 {
@@ -153,7 +154,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 
             // ban
             if (currentStrain > Thresholds.MaxStrainBan &&
-                HitCount > 15)
+                HitCount >= 15)
             {
                 result = new DetectionPenaltyResult()
                 {

Plugins/Stats/Stats.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId>
@@ -14,10 +14,6 @@
     <Configurations>Debug;Release;Prerelease</Configurations>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Web\Views\_MessageContext.cshtml" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="Web\Views\Stats\_MessageContext.cshtml">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
@@ -30,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Tests/Tests.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App"/>
   </ItemGroup>
 
 </Project>

Plugins/Welcome/Welcome.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Welcome</PackageId>
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

SharedLibraryCore/SharedLibraryCore.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.SharedLibraryCore</PackageId>
@@ -17,19 +17,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.0.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.1" />
     <PackageReference Include="SimpleCrypto.NetCore" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
+    <PackageReference Update="Microsoft.NETCore.App"/>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

WebfrontCore/.bowerrc

@@ -1,3 +1,4 @@
 {
-  "directory": "wwwroot/lib"
+  "directory": "wwwroot/lib",
+  "registry": "https://registry.bower.io"
 }

WebfrontCore/Startup.cs

@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Razor;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -63,7 +62,6 @@ namespace WebfrontCore
             {
                 loggerFactory.AddDebug();
                 app.UseDeveloperExceptionPage();
-                app.UseBrowserLink();
             }
             else
             {

WebfrontCore/WebfrontCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <TypeScriptToolsVersion>2.6</TypeScriptToolsVersion>
@@ -51,9 +51,20 @@
 
   <ItemGroup>
     <PackageReference Include="Bower" Version="1.3.11" />
-    <PackageReference Include="BuildBundlerMinifier" Version="2.6.375" />
+    <PackageReference Include="BuildBundlerMinifier" Version="2.8.391" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
+    <PackageReference Update="Microsoft.NETCore.App" />
+    <PackageReference Update="Microsoft.AspNetCore" Version="2.1.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -62,9 +73,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.0.7" />
-  </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>