Skip to content

Commit 851a15a

Browse files
BoltonDevBoltonDev
authored
Merge pull request #3 from ExMod-Team/LabAPI
Update For LabAPI
2 parents 9e47cb3 + 39e86cf commit 851a15a

File tree

2 files changed

+16
-155
lines changed

2 files changed

+16
-155
lines changed

‎EXILED-DLL-Archiver/EXILED-DLL-Archiver.csproj‎

Lines changed: 0 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -65,165 +65,22 @@
6565
<SignManifests>false</SignManifests>
6666
</PropertyGroup>
6767
<ItemGroup>
68-
<Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
70-
</Reference>
71-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
72-
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
73-
</Reference>
74-
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
76-
<Private>True</Private>
77-
<Private>True</Private>
78-
</Reference>
7968
<Reference Include="System" />
80-
<Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81-
<HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
82-
<Private>True</Private>
83-
<Private>True</Private>
84-
</Reference>
8569
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
8670
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
8771
</Reference>
8872
<Reference Include="System.ComponentModel.Composition" />
89-
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90-
<HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
91-
<Private>True</Private>
92-
<Private>True</Private>
93-
</Reference>
9473
<Reference Include="System.Core" />
95-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
96-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
97-
</Reference>
98-
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
99-
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
100-
<Private>True</Private>
101-
<Private>True</Private>
102-
</Reference>
103-
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104-
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
105-
<Private>True</Private>
106-
<Private>True</Private>
107-
</Reference>
108-
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109-
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
110-
<Private>True</Private>
111-
<Private>True</Private>
112-
</Reference>
113-
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
114-
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
115-
<Private>True</Private>
116-
<Private>True</Private>
117-
</Reference>
11874
<Reference Include="System.IO.Compression.FileSystem" />
119-
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
120-
<HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
121-
<Private>True</Private>
122-
<Private>True</Private>
123-
</Reference>
124-
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125-
<HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
126-
<Private>True</Private>
127-
<Private>True</Private>
128-
</Reference>
129-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
131-
<Private>True</Private>
132-
<Private>True</Private>
133-
</Reference>
134-
<Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
135-
<HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
136-
<Private>True</Private>
137-
<Private>True</Private>
138-
</Reference>
139-
<Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
140-
<HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
141-
<Private>True</Private>
142-
<Private>True</Private>
143-
</Reference>
144-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
145-
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
146-
</Reference>
147-
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148-
<HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
149-
<Private>True</Private>
150-
<Private>True</Private>
151-
</Reference>
152-
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
153-
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
154-
<Private>True</Private>
155-
<Private>True</Private>
156-
</Reference>
15775
<Reference Include="System.Numerics" />
15876
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
15977
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
16078
</Reference>
161-
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
162-
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
163-
<Private>True</Private>
164-
<Private>True</Private>
165-
</Reference>
166-
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
167-
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
168-
<Private>True</Private>
169-
<Private>True</Private>
170-
</Reference>
171-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
172-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
173-
</Reference>
174-
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
175-
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
176-
<Private>True</Private>
177-
<Private>True</Private>
178-
</Reference>
179-
<Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
180-
<HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
181-
<Private>True</Private>
182-
<Private>True</Private>
183-
</Reference>
184-
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
185-
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
186-
<Private>True</Private>
187-
<Private>True</Private>
188-
</Reference>
189-
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
190-
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
191-
<Private>True</Private>
192-
<Private>True</Private>
193-
</Reference>
194-
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
195-
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
196-
<Private>True</Private>
197-
<Private>True</Private>
198-
</Reference>
199-
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
200-
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
201-
<Private>True</Private>
202-
<Private>True</Private>
203-
</Reference>
204-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
205-
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
206-
<Private>True</Private>
207-
<Private>True</Private>
208-
</Reference>
209-
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
210-
<HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
211-
<Private>True</Private>
212-
<Private>True</Private>
213-
</Reference>
214-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
215-
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
216-
</Reference>
21779
<Reference Include="System.Xml.Linq" />
21880
<Reference Include="System.Data.DataSetExtensions" />
21981
<Reference Include="Microsoft.CSharp" />
22082
<Reference Include="System.Data" />
22183
<Reference Include="System.Xml" />
222-
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
223-
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
224-
<Private>True</Private>
225-
<Private>True</Private>
226-
</Reference>
22784
</ItemGroup>
22885
<ItemGroup>
22986
<Compile Include="Program.cs" />

‎EXILED-DLL-Archiver/Program.cs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System;
44
using System.Collections.Generic;
55
using System.IO;
6-
using System.Reflection;
76

87
using ICSharpCode.SharpZipLib.GZip;
98
using ICSharpCode.SharpZipLib.Tar;
@@ -19,19 +18,27 @@ public static void Main(String[] args)
1918
string fileName = string.Empty;
2019
string destFile = string.Empty;
2120

22-
string exiled_plugins_path = Path.Combine(path, "EXILED", "Plugins");
21+
string exiled_path = Path.Combine(path, "EXILED");
22+
string exiled_plugins_path = Path.Combine(exiled_path, "Plugins");
2323
string exiled_plugins_deps_path = Path.Combine(exiled_plugins_path, "dependencies");
24-
string nw_plugin_path = Path.Combine(path, "SCP Secret Laboratory", "PluginAPI", "plugins", "global");
25-
string nw_plugin_deps_path = Path.Combine(nw_plugin_path, "dependencies");
24+
string scpsl_path = Path.Combine(path, "SCP Secret Laboratory");
25+
string labapi_path = Path.Combine(scpsl_path, "LabAPI");
26+
string labapi_plugin_path = Path.Combine(labapi_path, "plugins", "global");
27+
string labapi_dependencies_path = Path.Combine(labapi_path, "dependencies", "global");
2628

27-
List<string> plugins = new List<string> { "Exiled.CreditTags", "Exiled.CustomItems", "Exiled.CustomRoles", "Exiled.Events", "Exiled.Permissions" };
29+
List<string> plugins = new List<string> { "Exiled.CreditTags", "Exiled.CustomItems", "Exiled.CustomRoles", "Exiled.Events", "Exiled.Permissions", };
2830
List<string> pluginsDep = new List<string> { "0Harmony", "System.ComponentModel.DataAnnotations" };
2931
List<string> nwDep = new List<string> { "Exiled.API", "SemanticVersioning", "Mono.Posix" };
3032

3133
try
3234
{
35+
if (Directory.Exists(exiled_path))
36+
Directory.Delete(exiled_path, true);
37+
if (Directory.Exists(scpsl_path))
38+
Directory.Delete(scpsl_path, true);
3339
Directory.CreateDirectory(exiled_plugins_deps_path);
34-
Directory.CreateDirectory(nw_plugin_deps_path);
40+
Directory.CreateDirectory(labapi_plugin_path);
41+
Directory.CreateDirectory(labapi_dependencies_path);
3542

3643
try
3744
{
@@ -52,11 +59,11 @@ public static void Main(String[] args)
5259
foreach (string str in nwDep)
5360
{
5461
fileName = Path.Combine(path, str + ".dll");
55-
destFile = Path.Combine(nw_plugin_deps_path, str + ".dll");
62+
destFile = Path.Combine(labapi_dependencies_path, str + ".dll");
5663
File.Copy(fileName, destFile, true);
5764
}
5865

59-
File.Copy(Path.Combine(path, "Exiled.Loader.dll"), Path.Combine(nw_plugin_path, "Exiled.Loader.dll"), true);
66+
File.Copy(Path.Combine(path, "Exiled.Loader.dll"), Path.Combine(labapi_plugin_path, "Exiled.Loader.dll"), true);
6067
}
6168
catch (FileNotFoundException e)
6269
{
@@ -65,18 +72,15 @@ public static void Main(String[] args)
6572
Console.ReadLine();
6673
return;
6774
}
68-
6975
CreateTarGZ(Path.Combine(path, "Exiled.tar.gz"), path);
70-
}
76+
}
7177
catch (Exception ex)
7278
{
7379
Console.WriteLine(ex);
7480
Console.ReadLine();
7581
return;
7682
}
77-
7883
}
79-
8084
private static void CreateTarGZ(string tgzFilename, string sourceDirectory)
8185
{
8286
Stream outStream = File.Create(tgzFilename);

0 commit comments

Comments
 (0)