update project to .net core 2.1.5

got rid of "threadsafe" stats service in stats plugin

SharedLibraryCore/ScriptPlugin.cs

@@ -68,7 +68,6 @@ namespace SharedLibraryCore
 
             ScriptEngine.Execute(script);
             ScriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
-            ScriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient);
             dynamic pluginObject = ScriptEngine.GetValue("plugin").ToObject();
 
             this.Author = pluginObject.author;
@@ -87,6 +86,7 @@ namespace SharedLibraryCore
             {
                 ScriptEngine.SetValue("_gameEvent", E);
                 ScriptEngine.SetValue("_server", S);
+                ScriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(S));
                 return Task.FromResult(ScriptEngine.Execute("plugin.onEventAsync(_gameEvent, _server)").GetCompletionValue());
             }
         }

SharedLibraryCore/Server.cs

@@ -33,6 +33,7 @@ namespace SharedLibraryCore
             Port = config.Port;
             Manager = mgr;
             Logger = Manager.GetLogger(this.GetHashCode());
+            Logger.WriteInfo(this.ToString());
             ServerConfig = config;
             RemoteConnection = new RCon.Connection(IP, Port, Password, Logger);
 
@@ -263,7 +264,7 @@ namespace SharedLibraryCore
 
         public override string ToString()
         {
-            return $"{IP}_{Port}";
+            return $"{IP}-{Port}";
         }
 
         protected async Task<bool> ScriptLoaded()

SharedLibraryCore/Services/GenericRepository.cs

@@ -1,154 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore.Database;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace SharedLibraryCore.Services
-{
-    // https://stackoverflow.com/questions/43677906/crud-operations-with-entityframework-using-generic-type
-    public class GenericRepository<TEntity> where TEntity : class
-    {
-        private DatabaseContext _context;
-        private DbSet<TEntity> _dbSet;
-        private readonly bool ShouldTrack;
-
-        public GenericRepository(bool shouldTrack)
-        {
-            this.ShouldTrack = shouldTrack;
-        }
-
-        public GenericRepository() { }
-
-        protected DbContext Context
-        {
-            get
-            {
-                if (_context == null)
-                {
-                    _context = new DatabaseContext(!ShouldTrack);
-                }
-
-                return _context;
-            }
-        }
-
-        protected DbSet<TEntity> DBSet
-        {
-            get
-            {
-                if (_dbSet == null)
-                {
-                    _dbSet = this.Context.Set<TEntity>();
-                }
-
-                return _dbSet;
-            }
-        }
-
-        public virtual async Task<IList<TEntity>> FindAsync(Expression<Func<TEntity, bool>> predicate, Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderExpression = null)
-        {
-            return await this.GetQuery(predicate, orderExpression).ToListAsync();
-        }
-
-        public virtual IEnumerable<TEntity> Find(Expression<Func<TEntity, bool>> predicate, Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderExpression = null)
-        {
-            return this.GetQuery(predicate, orderExpression).AsEnumerable();
-        }
-
-        public virtual IQueryable<TEntity> GetQuery(Expression<Func<TEntity, bool>> predicate = null, Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderExpression = null)
-        {
-            IQueryable<TEntity> qry = this.DBSet;
-
-            foreach (var property in this.Context.Model.FindEntityType(typeof(TEntity)).GetNavigations())
-                qry = qry.Include(property.Name);
-
-
-            if (predicate != null)
-                qry = qry.Where(predicate);
-
-            if (orderExpression != null)
-                return orderExpression(qry);
-
-
-            return qry;
-        }
-
-        public virtual void Insert<T>(T entity) where T : class
-        {
-            DbSet<T> dbSet = this.Context.Set<T>();
-            dbSet.Add(entity);
-        }
-
-        public virtual TEntity Insert(TEntity entity)
-        {
-            return DBSet.Add(entity).Entity;
-        }
-
-        public virtual void Update<T>(T entity) where T : class
-        {
-            DbSet<T> dbSet = this.Context.Set<T>();
-            dbSet.Attach(entity);
-            this.Context.Entry(entity).State = EntityState.Modified;
-        }
-
-        public virtual void Update(TEntity entity)
-        {
-            this.Attach(entity);
-            this.Context.Entry(entity).State = EntityState.Modified;
-        }
-
-        public virtual void Delete<T>(T entity) where T : class
-        {
-            DbSet<T> dbSet = this.Context.Set<T>();
-
-            if (this.Context.Entry(entity).State == EntityState.Detached)
-                dbSet.Attach(entity);
-
-            dbSet.Remove(entity);
-        }
-
-        public virtual void Delete(TEntity entity)
-        {
-            if (this.Context.Entry(entity).State == EntityState.Detached)
-                this.Attach(entity);
-
-            this.DBSet.Remove(entity);
-
-        }
-
-        public virtual void Delete<T>(object[] id) where T : class
-        {
-            DbSet<T> dbSet = this.Context.Set<T>();
-            T entity = dbSet.Find(id);
-            dbSet.Attach(entity);
-            dbSet.Remove(entity);
-        }
-
-        public virtual void Delete(object id)
-        {
-            TEntity entity = this.DBSet.Find(id);
-            this.Delete(entity);
-        }
-
-
-        public virtual void Attach(TEntity entity)
-        {
-            if (this.Context.Entry(entity).State == EntityState.Detached)
-                this.DBSet.Attach(entity);
-        }
-
-        public virtual void SaveChanges()
-        {
-            this.Context.SaveChanges();
-        }
-
-        public virtual Task SaveChangesAsync()
-        {
-            return this.Context.SaveChangesAsync();
-        }
-
-    }
-}

SharedLibraryCore/SharedLibraryCore.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.SharedLibraryCore</PackageId>
@@ -12,15 +13,6 @@
     <Configurations>Debug;Release;Prerelease</Configurations>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Migrations\20180502195240_Update.cs" />
-    <Compile Remove="Migrations\20180923025324_FixForPostgreSQL.cs" />
-    <Compile Remove="Migrations\20180923025702_FixForPostgreSQL.cs" />
-    <Compile Remove="Migrations\20180923030248_FixForPostgreSQL.cs" />
-    <Compile Remove="Migrations\20180923030426_FixForPostgreSQL.cs" />
-    <Compile Remove="Migrations\20180923030528_FixForPostgreSQL.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Jint" Version="2.11.58" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.4" />
@@ -39,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" />
+    <PackageReference Update="Microsoft.NETCore.App" Version="2.1.5" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

SharedLibraryCore/Utilities.cs

@@ -27,7 +27,7 @@ namespace SharedLibraryCore
 #endif
         public static Encoding EncodingType;
         public static Localization.Layout CurrentLocalization = new Localization.Layout(new Dictionary<string, string>());
-        public static Player IW4MAdminClient = new Player() { ClientId = 1, Level = Player.Permission.Console };
+        public static Player IW4MAdminClient(Server server = null) => new Player() { ClientId = 1, Level = Player.Permission.Console, CurrentServer = server };
 
         public static string HttpRequest(string location, string header, string headerValue)
         {