Add XuidString and GuidString to EFClient to allow easier interfacing with mods

auto copy script plugins/localization for local builds

Application/BuildScripts/DownloadTranslations.ps1

@@ -0,0 +1,12 @@
+param (
+    [string]$OutputDir = $(throw "-OutputDir is required.")
+)
+
+$localizations = @("en-US", "ru-RU", "es-EC", "pt-BR", "de-DE")
+foreach($localization in $localizations)
+{
+    $url = "http://api.raidmax.org:5000/localization/{0}" -f $localization
+    $filePath = "{0}Localization\IW4MAdmin.{1}.json" -f $OutputDir, $localization
+    $response = Invoke-WebRequest $url
+    Out-File -FilePath $filePath -InputObject $response.Content -Encoding utf8
+}

Application/BuildScripts/PreBuild.bat

@@ -1,3 +1,6 @@
 set SolutionDir=%1
 set ProjectDir=%2
-set TargetDir=%3
+set TargetDir=%3
+
+echo D | xcopy "%SolutionDir%Plugins\ScriptPlugins\*.js" "%TargetDir%Plugins" /y
+powershell -File "%ProjectDir%BuildScripts\DownloadTranslations.ps1" %TargetDir%

Application/Main.cs

@@ -233,7 +233,7 @@ namespace IW4MAdmin.Application
             serviceCollection.AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
                 .AddSingleton(new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings") as IConfigurationHandler<ApplicationConfiguration>)
                 .AddSingleton(new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as IConfigurationHandler<CommandConfiguration>)
-                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration())
+                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration() ?? new ApplicationConfiguration())
                 .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>().Configuration() ?? new CommandConfiguration())
                 .AddSingleton<ILogger>(_serviceProvider => defaultLogger)
                 .AddSingleton<IPluginImporter, PluginImporter>()

IW4MAdmin.sln

@@ -8,8 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
 		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
-		azure-pipelines.yml = azure-pipelines.yml
 		PostPublish.ps1 = PostPublish.ps1
+		pre-release-pipeline.yml = pre-release-pipeline.yml
 		README.md = README.md
 		RunPublishPre.cmd = RunPublishPre.cmd
 		RunPublishRelease.cmd = RunPublishRelease.cmd

Plugins/ScriptPlugins/ParserTeknoMW3.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.6,
+    version: 0.7,
     name: 'Tekno MW3 Parser',
     isParser: true,
 
@@ -29,6 +29,7 @@ var plugin = {
         rconParser.Configuration.Dvar.Pattern = '^(.*)$';
 
         rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');
+        rconParser.Configuration.OverrideDvarNameMapping.Add('_website', 'sv_clanWebsite');
 
         rconParser.Version = 'IW5 MP 1.4 build 382 latest Thu Jan 19 2012 11:09:49AM win-x86';
         rconParser.GameName = 3; // IW5

SharedLibraryCore/Database/DatabaseContext.cs

@@ -26,7 +26,6 @@ namespace SharedLibraryCore.Database
 
         static string _ConnectionString;
         static string _provider;
-        private static readonly string _migrationPluginDirectory = @"X:\IW4MAdmin\BUILD\Plugins";
         private static readonly ILoggerFactory _loggerFactory = LoggerFactory.Create(builder =>
         {
             builder.AddConsole()
@@ -72,7 +71,7 @@ namespace SharedLibraryCore.Database
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             //optionsBuilder.UseLoggerFactory(_loggerFactory)
-             //  .EnableSensitiveDataLogging();
+            //  .EnableSensitiveDataLogging();
 
             if (string.IsNullOrEmpty(_ConnectionString))
             {
@@ -198,11 +197,14 @@ namespace SharedLibraryCore.Database
 
             // adapted from
             // https://aleemkhan.wordpress.com/2013/02/28/dynamically-adding-dbset-properties-in-dbcontext-for-entity-framework-code-first/
-#if DEBUG
+
-            string pluginDir = _migrationPluginDirectory;
-#else
             string pluginDir = Path.Join(Utilities.OperatingDirectory, "Plugins");
-#endif
+
+            if (Utilities.IsDevelopment)
+            {
+                pluginDir = Path.Join(Utilities.OperatingDirectory, "..", "..", "..", "..", "BUILD", "Plugins");
+            }
+
             IEnumerable<string> directoryFiles = Directory.GetFiles(pluginDir).Where(f => f.EndsWith(".dll"));
 
             foreach (string dllPath in directoryFiles)

SharedLibraryCore/PartialEntities/EFClient.cs

@@ -656,6 +656,10 @@ namespace SharedLibraryCore.Database.Models
         public int Score { get; set; }
         [NotMapped]
         public bool IsBot => NetworkId == Name.GenerateGuidFromString();
+        [NotMapped]
+        public string XuidString => (NetworkId + 0x110000100000000).ToString("x");
+        [NotMapped]
+        public string GuidString => NetworkId.ToString("x");
 
         [NotMapped]
         public ClientState State { get; set; }

WebfrontCore/Controllers/DynamicFileController.cs

@@ -24,11 +24,14 @@ namespace WebfrontCore.Controllers
         {
             if (fileName.EndsWith(".css"))
             {
-#if DEBUG
+                if (Utilities.IsDevelopment)
-                string cssData = await System.IO.File.ReadAllTextAsync($"X:\\IW4MAdmin\\WebfrontCore\\wwwroot\\css\\{fileName}");
+                {
-                cssData = await Manager.MiddlewareActionHandler.Execute(cssData, "custom_css_accent");
+                    var path = Path.Join(Utilities.OperatingDirectory, "..", "..", "..", "..", "WebfrontCore", "wwwroot", "css", fileName);
-                return Content(cssData, "text/css");
+                    string cssData = await System.IO.File.ReadAllTextAsync(path);
-#endif
+                    cssData = await Manager.MiddlewareActionHandler.Execute(cssData, "custom_css_accent");
+                    return Content(cssData, "text/css");
+                }
+
                 if (!_fileCache.ContainsKey(fileName))
                 {
 

pre-release-pipeline.yml

@@ -2,12 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-    - releases/*
+    - release/pre
-    - 2.4-pr
-  paths:
-    exclude:
-    - azure-pipelines.yml
-    - Master/*
 
 pr: none