Add ZString & System.Text.Json and cleanup packing

Author: MrBlue

src/Oxide.References.csproj

@@ -13,13 +13,16 @@
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <TargetFrameworks>net48;netstandard2.0;netstandard2.1</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <NoWarn>NU1701;NU5128</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ILRepack" Version="2.0.18" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.6" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="WebSocketSharpFork" Version="1.0.4" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" PrivateAssets="all" />
+    <PackageReference Include="WebSocketSharpFork" Version="1.0.4" PrivateAssets="all" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" />
+    <PackageReference Include="ZString" Version="2.6.0" PrivateAssets="all" />
+    <PackageReference Include="System.Text.Json" Version="8.0.6" PrivateAssets="all" />
     <Content Include="Dependencies\net48\*.*" PackagePath="lib\any\net48" />
     <Content Include="Dependencies\netstandard2.0\*.*" PackagePath="lib\any\netstandard2.0" />
     <Content Include="Dependencies\netstandard2.1\*.*" PackagePath="lib\any\netstandard2.1" />
@@ -30,15 +33,12 @@
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <Target Name="AfterBuild">
+    <ItemGroup>
+      <NuGetMergeAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' and '%(NuGetPackageId)' != 'ILRepack'" />
+    </ItemGroup>
     <ItemGroup>
       <MergeAssemblies Include="$(TargetDir)\Oxide.References.dll" />
-      <MergeAssemblies Condition="$(TargetFramework.StartsWith('net4'))" Include="$(PkgMono_Cecil)\lib\net40\Mono.Cecil.dll" />
-      <MergeAssemblies Condition="$(TargetFramework.StartsWith('net4'))" Include="$(PkgMono_Cecil)\lib\net40\Mono.Cecil.Rocks.dll" />
-      <MergeAssemblies Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.dll" />
-      <MergeAssemblies Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Rocks.dll" />
-      <MergeAssemblies Condition="$(TargetFramework.StartsWith('net4')) AND $(TargetFramework) != 'net40'" Include="$(PkgNewtonsoft_Json)\lib\net45\Newtonsoft.Json.dll" />
-      <MergeAssemblies Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(PkgNewtonsoft_Json)\lib\netstandard2.0\Newtonsoft.Json.dll" />
-      <MergeAssemblies Include="$(PkgWebSocketSharpFork)\lib\net35\websocket-sharp.dll" />
+      <MergeAssemblies Include="@(NuGetMergeAssemblies)" />
       <MergeAssemblies Include="Dependencies\any\Mono.Posix.dll" />
       <MergeAssemblies Include="Dependencies\any\protobuf-net.dll" />
     </ItemGroup>