Fix Carbon Compile

dassjosh · Mar 26, 2024 · 110423c · 110423c
1 parent f80761f
commit 110423c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/Rust.UIFramework/Colors/UiColor.cs b/src/Rust.UIFramework/Colors/UiColor.cs
@@ -124,7 +124,7 @@ public static UiColor ParseHexColor(string hexColor)
             ReadOnlySpan<char> span = hexColor.AsSpan();
             if (span[0] == '#')
             {
-                span = span[1..];
+                span = span.Slice(1);
             }
 
             byte red = byte.Parse(span.Slice(0, 2), NumberStyles.HexNumber);

diff --git a/src/Rust.UIFramework/Extensions/TypeExt.cs b/src/Rust.UIFramework/Extensions/TypeExt.cs
@@ -49,7 +49,7 @@ public static string GetRealTypeName(this Type t)
             }
 
             StringBuilder sb = StringBuilderPool.Instance.Get();
-            sb.Append(t.Name.AsSpan()[..t.Name.IndexOf('`')]);
+            sb.Append(t.Name.AsSpan().Slice(0, t.Name.IndexOf('`')));
             sb.Append('<');
             Type[] args = t.GetGenericArguments();
             for (int index = 0; index < args.Length; index++)

diff --git a/src/Rust.UIFramework/Rust.UIFramework.csproj b/src/Rust.UIFramework/Rust.UIFramework.csproj
@@ -37,12 +37,12 @@
       <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\References\Assembly-CSharp-firstpass.dll</HintPath>
       </Reference>
-<!--      <Reference Include="Carbon.Common" Condition=" '$(Platform)' == 'Carbon'">-->
-<!--        <HintPath>..\References\Carbon.Common.dll</HintPath>-->
-<!--      </Reference>-->
-<!--      <Reference Include="Carbon.SDK" Condition=" '$(Platform)' == 'Carbon'">-->
-<!--        <HintPath>..\References\Carbon.SDK.dll</HintPath>-->
-<!--      </Reference>-->
+      <Reference Include="Carbon.Common" Condition=" '$(Platform)' == 'Carbon'">
+        <HintPath>..\References\Carbon.Common.dll</HintPath>
+      </Reference>
+      <Reference Include="Carbon.SDK" Condition=" '$(Platform)' == 'Carbon'">
+        <HintPath>..\References\Carbon.SDK.dll</HintPath>
+      </Reference>
       <Reference Include="Facepunch.Console">
         <HintPath>..\References\Facepunch.Console.dll</HintPath>
       </Reference>
@@ -58,25 +58,25 @@
       <Reference Include="mscorlib">
         <HintPath>..\References\mscorlib.dll</HintPath>
       </Reference>
-<!--      <Reference Include="Newtonsoft.Json" Condition=" '$(Platform)' == 'Carbon'">-->
-<!--        <HintPath>..\References\Newtonsoft.Json.dll</HintPath>-->
-<!--      </Reference>-->
-      <Reference Include="Oxide.Core">
+      <Reference Include="Newtonsoft.Json" Condition=" '$(Platform)' == 'Carbon'">
+        <HintPath>..\References\Newtonsoft.Json.dll</HintPath>
+      </Reference>
+      <Reference Include="Oxide.Core" Condition=" '$(Platform)' == 'Oxide'">
         <HintPath>..\References\Oxide.Core.dll</HintPath>
       </Reference>
-      <Reference Include="Oxide.CSharp">
+      <Reference Include="Oxide.CSharp" Condition=" '$(Platform)' == 'Oxide'">
         <HintPath>..\References\Oxide.CSharp.dll</HintPath>
       </Reference>
-      <Reference Include="Oxide.References">
+      <Reference Include="Oxide.References" Condition=" '$(Platform)' == 'Oxide'">
         <HintPath>..\References\Oxide.References.dll</HintPath>
       </Reference>
-      <Reference Include="Oxide.Rust">
+      <Reference Include="Oxide.Rust" Condition=" '$(Platform)' == 'Oxide'">
         <HintPath>..\References\Oxide.Rust.dll</HintPath>
       </Reference>
-      <Reference Include="Oxide.SQLite">
+      <Reference Include="Oxide.SQLite" Condition=" '$(Platform)' == 'Oxide'">
         <HintPath>..\References\Oxide.SQLite.dll</HintPath>
       </Reference>
-      <Reference Include="Oxide.Unity">
+      <Reference Include="Oxide.Unity" Condition=" '$(Platform)' == 'Oxide'">
         <HintPath>..\References\Oxide.Unity.dll</HintPath>
       </Reference>
       <Reference Include="Rust.Data, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">