Merge 2 runtimelibs folders into one

openmod · Oct 30, 2023 · 1690704 · 1690704
1 parent 884efd0
commit 1690704
Show file tree

Hide file tree

Showing 70 changed files with 2 additions and 2 deletions.
diff --git a/unturned/OpenMod.Unturned.Module.Dev/OpenMod.Unturned.Module.Dev.csproj b/unturned/OpenMod.Unturned.Module.Dev/OpenMod.Unturned.Module.Dev.csproj
@@ -32,7 +32,7 @@
 
   <Target Name="CopyRuntimeLibraries" AfterTargets="AfterBuild">
     <ItemGroup>
-      <DependencyFiles Include="$(MSBuildThisFileDirectory)runtimelibs\*.dll" />
+      <DependencyFiles Include="$(MSBuildThisFileDirectory)\..\runtimelibs\*.dll" />
     </ItemGroup>
 
     <Copy SourceFiles="@(DependencyFiles)" DestinationFolder="$(OutDir)" Condition="@(DependencyFiles-&gt;Count()) != 0" />

diff --git a/unturned/OpenMod.Unturned.Module/OpenMod.Unturned.Module.csproj b/unturned/OpenMod.Unturned.Module/OpenMod.Unturned.Module.csproj
@@ -34,7 +34,7 @@
 
   <Target Name="CopyRuntimeLibraries" AfterTargets="AfterBuild">
     <ItemGroup>
-      <DependencyFiles Include="$(MSBuildThisFileDirectory)runtimelibs\*.dll" />
+      <DependencyFiles Include="$(MSBuildThisFileDirectory)\..\runtimelibs\*.dll" />
     </ItemGroup>
 
     <Copy SourceFiles="@(DependencyFiles)" DestinationFolder="$(OutDir)" Condition="@(DependencyFiles-&gt;Count()) != 0" />

diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Buffers.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Buffers.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Collections.Immutable.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Collections.Immutable.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.ComponentModel.Annotations.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.ComponentModel.Annotations.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.ComponentModel.Composition.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.ComponentModel.Composition.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.ComponentModel.DataAnnotations.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.ComponentModel.DataAnnotations.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Data.Common.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Data.Common.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Data.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Data.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Diagnostics.Debug.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Diagnostics.Debug.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Diagnostics.Tracing.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Diagnostics.Tracing.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.IO.Compression.FileSystem.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.IO.Compression.FileSystem.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.IO.Compression.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.IO.Compression.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Management.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Management.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Memory.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Memory.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Net.Http.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Net.Http.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Net.Primitives.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Net.Primitives.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Numerics.Vectors.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Numerics.Vectors.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Reflection.Emit.ILGeneration.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Reflection.Emit.ILGeneration.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Reflection.Emit.Lightweight.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Reflection.Emit.Lightweight.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Resources.ResourceManager.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Resources.ResourceManager.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.CompilerServices.Unsafe.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.Extensions.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.Extensions.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.InteropServices.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.InteropServices.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.Serialization.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.Serialization.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Runtime.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Cryptography.Cng.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Cryptography.Cng.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Cryptography.Pkcs.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Cryptography.Pkcs.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Cryptography.ProtectedData.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Cryptography.ProtectedData.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Principal.Windows.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Security.Principal.Windows.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Threading.Tasks.Extensions.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Threading.Tasks.Extensions.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Threading.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Threading.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.ValueTuple.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.ValueTuple.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Web.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Web.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/System.Xml.Linq.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/System.Xml.Linq.dll
diff --git a/unturned/OpenMod.Unturned.Module/runtimelibs/netstandard.dll b/unturned/OpenMod.Unturned.Module/runtimelibs/netstandard.dll
diff --git a/...Module.Dev/runtimelibs/System.Buffers.dll → unturned/runtimelibs/System.Buffers.dll b/...Module.Dev/runtimelibs/System.Buffers.dll → unturned/runtimelibs/System.Buffers.dll
diff --git a/...timelibs/System.Collections.Immutable.dll → ...timelibs/System.Collections.Immutable.dll b/...timelibs/System.Collections.Immutable.dll → ...timelibs/System.Collections.Immutable.dll
diff --git a/...ibs/System.ComponentModel.Annotations.dll → ...ibs/System.ComponentModel.Annotations.dll b/...ibs/System.ComponentModel.Annotations.dll → ...ibs/System.ComponentModel.Annotations.dll
diff --git a/...ibs/System.ComponentModel.Composition.dll → ...ibs/System.ComponentModel.Composition.dll b/...ibs/System.ComponentModel.Composition.dll → ...ibs/System.ComponentModel.Composition.dll
diff --git a/...System.ComponentModel.DataAnnotations.dll → ...System.ComponentModel.DataAnnotations.dll b/...System.ComponentModel.DataAnnotations.dll → ...System.ComponentModel.DataAnnotations.dll
diff --git a/...le.Dev/runtimelibs/System.Data.Common.dll → unturned/runtimelibs/System.Data.Common.dll b/...le.Dev/runtimelibs/System.Data.Common.dll → unturned/runtimelibs/System.Data.Common.dll
diff --git a/...ed.Module.Dev/runtimelibs/System.Data.dll → unturned/runtimelibs/System.Data.dll b/...ed.Module.Dev/runtimelibs/System.Data.dll → unturned/runtimelibs/System.Data.dll
diff --git a/.../runtimelibs/System.Diagnostics.Debug.dll → .../runtimelibs/System.Diagnostics.Debug.dll b/.../runtimelibs/System.Diagnostics.Debug.dll → .../runtimelibs/System.Diagnostics.Debug.dll
diff --git a/...untimelibs/System.Diagnostics.Tracing.dll → ...untimelibs/System.Diagnostics.Tracing.dll b/...untimelibs/System.Diagnostics.Tracing.dll → ...untimelibs/System.Diagnostics.Tracing.dll
diff --git a/...libs/System.IO.Compression.FileSystem.dll → ...libs/System.IO.Compression.FileSystem.dll b/...libs/System.IO.Compression.FileSystem.dll → ...libs/System.IO.Compression.FileSystem.dll
diff --git a/...Dev/runtimelibs/System.IO.Compression.dll → ...ned/runtimelibs/System.IO.Compression.dll b/...Dev/runtimelibs/System.IO.Compression.dll → ...ned/runtimelibs/System.IO.Compression.dll
diff --git a/...ule.Dev/runtimelibs/System.Management.dll → unturned/runtimelibs/System.Management.dll b/...ule.Dev/runtimelibs/System.Management.dll → unturned/runtimelibs/System.Management.dll
diff --git a/....Module.Dev/runtimelibs/System.Memory.dll → unturned/runtimelibs/System.Memory.dll b/....Module.Dev/runtimelibs/System.Memory.dll → unturned/runtimelibs/System.Memory.dll
diff --git a/...odule.Dev/runtimelibs/System.Net.Http.dll → unturned/runtimelibs/System.Net.Http.dll b/...odule.Dev/runtimelibs/System.Net.Http.dll → unturned/runtimelibs/System.Net.Http.dll
diff --git a/...Dev/runtimelibs/System.Net.Primitives.dll → ...ned/runtimelibs/System.Net.Primitives.dll b/...Dev/runtimelibs/System.Net.Primitives.dll → ...ned/runtimelibs/System.Net.Primitives.dll
diff --git a/...v/runtimelibs/System.Numerics.Vectors.dll → ...d/runtimelibs/System.Numerics.Vectors.dll b/...v/runtimelibs/System.Numerics.Vectors.dll → ...d/runtimelibs/System.Numerics.Vectors.dll
diff --git a/...s/System.Reflection.Emit.ILGeneration.dll → ...s/System.Reflection.Emit.ILGeneration.dll b/...s/System.Reflection.Emit.ILGeneration.dll → ...s/System.Reflection.Emit.ILGeneration.dll
diff --git a/...bs/System.Reflection.Emit.Lightweight.dll → ...bs/System.Reflection.Emit.Lightweight.dll b/...bs/System.Reflection.Emit.Lightweight.dll → ...bs/System.Reflection.Emit.Lightweight.dll
diff --git a/...libs/System.Resources.ResourceManager.dll → ...libs/System.Resources.ResourceManager.dll b/...libs/System.Resources.ResourceManager.dll → ...libs/System.Resources.ResourceManager.dll
diff --git a/...ystem.Runtime.CompilerServices.Unsafe.dll → ...ystem.Runtime.CompilerServices.Unsafe.dll b/...ystem.Runtime.CompilerServices.Unsafe.dll → ...ystem.Runtime.CompilerServices.Unsafe.dll
diff --git a/...runtimelibs/System.Runtime.Extensions.dll → ...runtimelibs/System.Runtime.Extensions.dll b/...runtimelibs/System.Runtime.Extensions.dll → ...runtimelibs/System.Runtime.Extensions.dll
diff --git a/...melibs/System.Runtime.InteropServices.dll → ...melibs/System.Runtime.InteropServices.dll b/...melibs/System.Runtime.InteropServices.dll → ...melibs/System.Runtime.InteropServices.dll
diff --git a/...timelibs/System.Runtime.Serialization.dll → ...timelibs/System.Runtime.Serialization.dll b/...timelibs/System.Runtime.Serialization.dll → ...timelibs/System.Runtime.Serialization.dll
diff --git a/...Module.Dev/runtimelibs/System.Runtime.dll → unturned/runtimelibs/System.Runtime.dll b/...Module.Dev/runtimelibs/System.Runtime.dll → unturned/runtimelibs/System.Runtime.dll
diff --git a/...libs/System.Security.Cryptography.Cng.dll → ...libs/System.Security.Cryptography.Cng.dll b/...libs/System.Security.Cryptography.Cng.dll → ...libs/System.Security.Cryptography.Cng.dll
diff --git a/...ibs/System.Security.Cryptography.Pkcs.dll → ...ibs/System.Security.Cryptography.Pkcs.dll b/...ibs/System.Security.Cryptography.Pkcs.dll → ...ibs/System.Security.Cryptography.Pkcs.dll
diff --git a/...m.Security.Cryptography.ProtectedData.dll → ...m.Security.Cryptography.ProtectedData.dll b/...m.Security.Cryptography.ProtectedData.dll → ...m.Security.Cryptography.ProtectedData.dll
diff --git a/...ibs/System.Security.Principal.Windows.dll → ...ibs/System.Security.Principal.Windows.dll b/...ibs/System.Security.Principal.Windows.dll → ...ibs/System.Security.Principal.Windows.dll
diff --git a/...ibs/System.Threading.Tasks.Extensions.dll → ...ibs/System.Threading.Tasks.Extensions.dll b/...ibs/System.Threading.Tasks.Extensions.dll → ...ibs/System.Threading.Tasks.Extensions.dll
diff --git a/...dule.Dev/runtimelibs/System.Threading.dll → unturned/runtimelibs/System.Threading.dll b/...dule.Dev/runtimelibs/System.Threading.dll → unturned/runtimelibs/System.Threading.dll
diff --git a/...ule.Dev/runtimelibs/System.ValueTuple.dll → unturned/runtimelibs/System.ValueTuple.dll b/...ule.Dev/runtimelibs/System.ValueTuple.dll → unturned/runtimelibs/System.ValueTuple.dll
diff --git a/...ned.Module.Dev/runtimelibs/System.Web.dll → unturned/runtimelibs/System.Web.dll b/...ned.Module.Dev/runtimelibs/System.Web.dll → unturned/runtimelibs/System.Web.dll
diff --git a/...odule.Dev/runtimelibs/System.Xml.Linq.dll → unturned/runtimelibs/System.Xml.Linq.dll b/...odule.Dev/runtimelibs/System.Xml.Linq.dll → unturned/runtimelibs/System.Xml.Linq.dll
diff --git a/...ed.Module.Dev/runtimelibs/netstandard.dll → unturned/runtimelibs/netstandard.dll b/...ed.Module.Dev/runtimelibs/netstandard.dll → unturned/runtimelibs/netstandard.dll