#378 synchronize grid with @rbxinfra/rcc-core

.github/workflows/deploy.yml

@@ -47,7 +47,7 @@ jobs:
           component-search-directories: services
 
       - name: Components to Nomad Jobs
-        uses: mfdlabs/component-nomad-parser-action@v15
+        uses: mfdlabs/component-nomad-parser-action@v18
         id: components-to-nomad-jobs
         env:
           NOMAD_ENVIRONMENT: ${{ github.event.inputs.nomad_environment }}

.vscode/tasks.json

@@ -14,21 +14,6 @@
                 "/p:Platform=AnyCPU",
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "build-full",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/services/grid-bot/src/Grid.Bot.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary",
-                "/p:Configuration=Debug",
-                "/p:Platform=AnyCPU",
-                "/p:LocalBuild=true"
-            ],
-            "problemMatcher": "$msCompile"
         }
     ]
 }

lib/Directory.Build.props

@@ -39,8 +39,6 @@
     <DebugType>portable</DebugType>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-
-    <PackageId>mfdlabs.$(MSBuildProjectName)</PackageId>
   </PropertyGroup>
 
   <ItemGroup Label="TestReferences" Condition="'$(IsTestProject)' == 'true'">
@@ -60,13 +58,4 @@
   <ItemGroup>
     <None Include="$(RootDirectory)LICENSE" Pack="true" PackagePath="" />
   </ItemGroup>
-
-  <!-- Readme -->
-  <PropertyGroup>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="" />
-  </ItemGroup>
 </Project>

lib/grid/client/Factories/Lua.cs

@@ -84,9 +84,10 @@ public static string ToString(IEnumerable<LuaValue> result)
     /// <param name="index">The index to set.</param>
     /// <param name="value">The value.</param>
     /// <exception cref="ArgumentException">Unsupported Lua argument type.</exception>
-    public static void SetArg(LuaValue[] args, int index, object value)
+    public static void SetArg(this LuaValue[] args, int index, object value)
     {
         var luaValue = new LuaValue();
+
         switch (value)
         {
             case int _:
@@ -138,13 +139,13 @@ public static void SetArg(LuaValue[] args, int index, object value)
     /// </summary>
     /// <param name="luaValue">The <see cref="LuaValue"/></param>
     /// <returns>The actual value of the <see cref="LuaValue"/></returns>
-    public static object ConvertLua(LuaValue luaValue) 
+    public static object ConvertLua(this LuaValue luaValue) 
         => luaValue.type switch
         {
             LuaType.LUA_TBOOLEAN => Convert.ToBoolean(luaValue.value),
             LuaType.LUA_TNUMBER => Convert.ToDouble(luaValue.value),
             LuaType.LUA_TSTRING => luaValue.value,
-            LuaType.LUA_TTABLE => GetValues(luaValue.table),
+            LuaType.LUA_TTABLE => luaValue.table.GetValues(),
             _ => null,
         };
 
@@ -157,8 +158,8 @@ public static LuaValue[] NewArgs(params object[] args)
     {
         var luaValues = new LuaValue[args.Length];
 
-        for (int i = 0; i < args.Length; i++) 
-            SetArg(luaValues, i, args[i]);
+        for (int i = 0; i < args.Length; i++)
+            luaValues.SetArg(i, args[i]);
 
         return luaValues;
     }
@@ -168,10 +169,12 @@ public static LuaValue[] NewArgs(params object[] args)
     /// </summary>
     /// <param name="args">The <see cref="LuaValue"/> arguments.</param>
     /// <returns>The  raw values.</returns>
-    public static object[] GetValues(LuaValue[] args)
+    public static object[] GetValues(this LuaValue[] args)
     {
         var values = new object[args.Length];
-        for (var i = 0; i < args.Length; i++) values[i] = ConvertLua(args[i]);
+
+        for (var i = 0; i < args.Length; i++) values[i] = args[i].ConvertLua();
+
         return values;
     }
 }

lib/grid/diagnostics/Grid.Diagnostics.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Helper methods for discovering diagnostics information about servers</Description>
+
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="NativeMethods.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="NativeMethods.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../logging/logging/Logging.csproj" />
+  </ItemGroup>
+
+</Project>