Skip to content

Commit 534a01a

Browse files
lukespragglukespragg
committed
A little bit of cleanup and formatting
1 parent f2191f1 commit 534a01a

24 files changed

Lines changed: 868 additions & 358 deletions

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,8 @@ _ReSharper*/
6363
*.DotSettings.user
6464
## TeamCity add-in
6565
_TeamCity*
66+
67+
# Other files
68+
.deploy
69+
70+
src/Debug.cs

LICENSE.md renamed to LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2018 Oxide Team and Contributors
3+
Copyright (c) 2013-2020 Oxide and Contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Oxide.CSharp.sln‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27004.2008
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29613.14
44
MinimumVisualStudioVersion = 15.0
5-
Project("{73BB4989-CA7F-4148-8687-18760A25BC5E}") = "Oxide.CSharp", "src\Oxide.CSharp.csproj", "{9103D682-D1AA-4A95-A499-896F551AAA62}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oxide.CSharp", "src\Oxide.CSharp.csproj", "{9103D682-D1AA-4A95-A499-896F551AAA62}"
66
EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,4 +15,10 @@ Global
1515
{9103D682-D1AA-4A95-A499-896F551AAA62}.Release|Any CPU.ActiveCfg = Release|Any CPU
1616
{9103D682-D1AA-4A95-A499-896F551AAA62}.Release|Any CPU.Build.0 = Release|Any CPU
1717
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
GlobalSection(ExtensibilityGlobals) = postSolution
22+
SolutionGuid = {9C9C46E6-F364-4D0B-8A9E-184ACD86D0BB}
23+
EndGlobalSection
1824
EndGlobal

‎netfx.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<!-- Check and set if a .NET SDK 2.0 project targeting .NET 3.5 or .NET 4.x on Mono using 'dotnet build' -->
4+
<TargetIsMono Condition="('$(TargetFramework)' == 'net35' OR $(TargetFramework.StartsWith('net4'))) AND '$(OS)' == 'Unix'">True</TargetIsMono>
5+
6+
<!-- Look in the standard install locations -->
7+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'True' AND Exists('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
8+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'True' AND Exists('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
9+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'True' AND Exists('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
10+
11+
<!-- If we found Mono reference assemblies, then use them -->
12+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net35'">$(BaseFrameworkPathOverrideForMono)/2.0-api</FrameworkPathOverride>
13+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net40'">$(BaseFrameworkPathOverrideForMono)/4.0-api</FrameworkPathOverride>
14+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
15+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
16+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
17+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
18+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
19+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
20+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
21+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
22+
<EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">True</EnableFrameworkPathOverride>
23+
24+
<!-- Workaround for targeting .NET 3.5 with dotnet CLI https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
25+
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' AND '$(OS)' == 'Windows_NT'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
26+
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' AND '$(OS)' == 'OSX'">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/2.0-api</FrameworkPathOverride>
27+
28+
<!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
29+
<AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
30+
</PropertyGroup>
31+
</Project>

‎nuget.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@
1212
</activePackageSource>
1313
<packageSources>
1414
<add key="Oxide" value="https://www.myget.org/f/oxide" />
15-
<add key="Local" value="%USERPROFILE%\.nuget\packages" />
1615
</packageSources>
1716
</configuration>

‎resources/icon.png‎

392 Bytes
Loading

‎src/CSharpExtension.cs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,12 @@ public CSharpExtension(ExtensionManager manager) : base(manager)
7878
Cleanup.Add(oldCompiler);
7979
}
8080

81-
var extDir = Interface.Oxide.ExtensionDirectory;
82-
var configPath = Path.Combine(extDir, "Oxide.References.dll.config");
83-
if (File.Exists(configPath) && !(new[] { "target=\"x64", "target=\"./x64" }.Any(File.ReadAllText(configPath).Contains))) return;
81+
string extDir = Interface.Oxide.ExtensionDirectory;
82+
string configPath = Path.Combine(extDir, "Oxide.References.dll.config");
83+
if (File.Exists(configPath) && !(new[] { "target=\"x64", "target=\"./x64" }.Any(File.ReadAllText(configPath).Contains)))
84+
{
85+
return;
86+
}
8487

8588
File.WriteAllText(configPath, $"<configuration>\n<dllmap dll=\"MonoPosixHelper\" target=\"{extDir}/x86/libMonoPosixHelper.so\" os=\"!windows,osx\" wordsize=\"32\" />\n" +
8689
$"<dllmap dll=\"MonoPosixHelper\" target=\"{extDir}/x64/libMonoPosixHelper.so\" os=\"!windows,osx\" wordsize=\"64\" />\n</configuration>");
@@ -140,11 +143,14 @@ public override void OnShutdown()
140143
/// </summary>
141144
private void OnFrame(float delta)
142145
{
143-
var args = new object[] { delta };
144-
foreach (var kv in loader.LoadedPlugins)
146+
object[] args = new object[] { delta };
147+
foreach (System.Collections.Generic.KeyValuePair<string, Core.Plugins.Plugin> kv in loader.LoadedPlugins)
145148
{
146-
var plugin = kv.Value as CSharpPlugin;
147-
if (plugin != null && plugin.HookedOnFrame) plugin.CallHook("OnFrame", args);
149+
CSharpPlugin plugin = kv.Value as CSharpPlugin;
150+
if (plugin != null && plugin.HookedOnFrame)
151+
{
152+
plugin.CallHook("OnFrame", args);
153+
}
148154
}
149155
}
150156
}

0 commit comments

Comments
 (0)