Add GitBranch checking for the compiler

Author: austinv900

src/CSharpPluginLoader.cs

@@ -42,7 +42,7 @@ public CSharpPluginLoader(CSharpExtension extension)
         {
             Instance = this;
             CSharpPluginLoader.extension = extension;
-            compiler = new CompilerService();
+            compiler = new CompilerService(extension);
         }
 
         public void OnModLoaded()

src/CompilerService.cs

@@ -18,12 +18,13 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using Oxide.Core.Extensions;
 
 namespace Oxide.CSharp
 {
     internal class CompilerService
     {
-        private const string baseUrl = "https://downloads.oxidemod.com/artifacts/Oxide.Compiler/master/";
+        private const string baseUrl = "https://downloads.oxidemod.com/artifacts/Oxide.Compiler/{0}/";
         private Hash<int, Compilation> compilations;
         private Queue<CompilerMessage> messageQueue;
         private Process process;
@@ -37,36 +38,37 @@ internal class CompilerService
         private static Regex fileErrorRegex = new Regex(@"^\[(?'Severity'\S+)\]\[(?'Code'\S+)\]\[(?'File'\S+)\] (?'Message'.+)$", RegexOptions.Compiled);
         public bool Installed => File.Exists(filePath);
 
-        public CompilerService()
+        public CompilerService(Extension extension)
         {
             compilations = new Hash<int, Compilation>();
             messageQueue = new Queue<CompilerMessage>();
             string arc = IntPtr.Size == 8 ? "x64" : "x86";
             filePath = Path.Combine(Interface.Oxide.RootDirectory, $"Oxide.Compiler");
+            string downloadUrl = string.Format(baseUrl, extension.Branch);
             switch (Environment.OSVersion.Platform)
             {
                 case PlatformID.Win32NT:
                 case PlatformID.Win32S:
                 case PlatformID.Win32Windows:
                     filePath += ".exe";
-                    remoteName = baseUrl + $"win-{arc}.Compiler.exe";
+                    remoteName = downloadUrl + $"win-{arc}.Compiler.exe";
                     break;
 
                 case PlatformID.MacOSX:
-                    remoteName = baseUrl + "osx-x64.Compiler";
+                    remoteName = downloadUrl + "osx-x64.Compiler";
                     break;
 
                 case PlatformID.Unix:
-                    remoteName = baseUrl + "linux-x64.Compiler";
+                    remoteName = downloadUrl + "linux-x64.Compiler";
                     break;
             }
 
-            EnvironmentHelper.SetOxideEnvironmentalVariable("Path:Root", Interface.Oxide.RootDirectory);
-            EnvironmentHelper.SetOxideEnvironmentalVariable("Path:Logging", Interface.Oxide.LogDirectory);
-            EnvironmentHelper.SetOxideEnvironmentalVariable("Path:Plugins", Interface.Oxide.PluginDirectory);
-            EnvironmentHelper.SetOxideEnvironmentalVariable("Path:Configuration", Interface.Oxide.ConfigDirectory);
-            EnvironmentHelper.SetOxideEnvironmentalVariable("Path:Data", Interface.Oxide.DataDirectory);
-            EnvironmentHelper.SetOxideEnvironmentalVariable("Path:Libraries", Interface.Oxide.ExtensionDirectory);
+            EnvironmentHelper.SetVariable("Path:Root", Interface.Oxide.RootDirectory);
+            EnvironmentHelper.SetVariable("Path:Logging", Interface.Oxide.LogDirectory);
+            EnvironmentHelper.SetVariable("Path:Plugins", Interface.Oxide.PluginDirectory);
+            EnvironmentHelper.SetVariable("Path:Configuration", Interface.Oxide.ConfigDirectory);
+            EnvironmentHelper.SetVariable("Path:Data", Interface.Oxide.DataDirectory);
+            EnvironmentHelper.SetVariable("Path:Libraries", Interface.Oxide.ExtensionDirectory);
         }
 
         private void ExpireFileCache()
@@ -592,7 +594,7 @@ private static bool DownloadFile(string url, string path, int retries = 3)
                     {
                         fs.Write(data, 0, data.Length);
                     }
-                    
+
                     if (newerFound)
                     {
                         string checkVerb = md5 != null ? $"Remote MD5: {md5}" : "Newer found";

src/Oxide.CSharp.csproj

@@ -18,11 +18,23 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Oxide.Core" Version="2.0.*" />
+    <PackageReference Include="Oxide.Common" Version="2.0.*" />
     <PackageReference Include="Oxide.References" Version="2.0.*">
       <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
     </PackageReference>
     <None Include="..\resources\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
+  <Target Name="AddGitMetadaAssemblyAttributes" BeforeTargets="CoreGenerateAssemblyInfo">
+    <Exec Command="git name-rev --name-only HEAD" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMSBuild="True">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitBranch" />
+    </Exec>
+    <ItemGroup>
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="$(GitBranch) != ''">
+        <_Parameter1>GitBranch</_Parameter1>
+        <_Parameter2>$(GitBranch)</_Parameter2>
+      </AssemblyAttribute>
+    </ItemGroup>
+  </Target>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
     <ItemGroup>

src/Patching/Validation/HasEnvironmentalVariableAttribute.cs

@@ -12,6 +12,6 @@ public HasEnvironmentalVariableAttribute(string rule)
             VariableName = rule ?? throw new ArgumentNullException(nameof(rule));
         }
 
-        protected override bool IsValid(object item) => !string.IsNullOrEmpty(EnvironmentHelper.GetOxideEnvironmentalVariable(VariableName));
+        protected override bool IsValid(object item) => !string.IsNullOrEmpty(EnvironmentHelper.GetVariable(VariableName));
     }
 }

src/Utility.cs

@@ -83,58 +83,4 @@ public TValue this[TKey key]
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
-
-    internal static class EnvironmentHelper
-    {
-        public static void SetOxideEnvironmentalVariable(string name, string value, bool force = false)
-        {
-            if (string.IsNullOrEmpty(name))
-            {
-                return;
-            }
-
-            name = NormalizeKey(name);
-
-            if (force)
-            {
-                Environment.SetEnvironmentVariable(name, value);
-                Interface.Oxide.RootLogger.WriteDebug(Core.Logging.LogType.Info, null, "CSharp", $"Setting environmental variable: {name} => {value ?? "null"}");
-            }
-            else if (GetOxideEnvironmentalVariable(name) == null)
-            {
-                Environment.SetEnvironmentVariable(name, value);
-                Interface.Oxide.RootLogger.WriteDebug(Core.Logging.LogType.Info, null, "CSharp", $"Setting environmental variable: {name} => {value ?? "null"}");
-            }
-            else
-            {
-                Interface.Oxide.RootLogger.WriteDebug(Core.Logging.LogType.Warning, null, "CSharp", $"Failed to set environmental variable: {name} => {value ?? "null"} | Value is already set, please use force parameter to force it");
-            }
-        }
-
-        public static string GetOxideEnvironmentalVariable(string name)
-        {
-            if (string.IsNullOrEmpty(name))
-            {
-                return null;
-            }
-            name = NormalizeKey(name);
-            string value = Environment.GetEnvironmentVariable(name);
-            Interface.Oxide.RootLogger.WriteDebug(Core.Logging.LogType.Warning, null, "CSharp", $"Retrieving environmental variable: {name} => {value ?? "null"}");
-            return value;
-        }
-
-        private static string NormalizeKey(string key)
-        {
-            if (key.StartsWith("OXIDE:", StringComparison.InvariantCultureIgnoreCase))
-            {
-                key = key.Replace("oxide:", "OXIDE:");
-            }
-            else
-            {
-                key = "OXIDE:" + key;
-            }
-
-            return key;
-        }
-    }
 }