Updated API to 3.2.0

ServerMod · Dec 21, 2018 · e877f30 · e877f30
1 parent c64173b
commit e877f30
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/SCPDiscordPlugin/Properties/Settings.Designer.cs b/SCPDiscordPlugin/Properties/Settings.Designer.cs
diff --git a/SCPDiscordPlugin/SCPDiscord.cs b/SCPDiscordPlugin/SCPDiscord.cs
@@ -24,10 +24,10 @@ namespace SCPDiscord
         name = "SCPDiscord",
         description = "SCP:SL - Discord bridge.",
         id = "karlofduty.scpdiscord",
-        version = "1.0.0",
+        version = "1.0.0-B",
         SmodMajor = 3,
-        SmodMinor = 1,
-        SmodRevision = 22
+        SmodMinor = 2,
+        SmodRevision = 0
     )]
     public class SCPDiscord : Plugin
     {

diff --git a/SCPDiscordPlugin/SCPDiscordPlugin.csproj b/SCPDiscordPlugin/SCPDiscordPlugin.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SCPDiscord</RootNamespace>
     <AssemblyName>SCPDiscord</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -40,22 +40,23 @@
   <ItemGroup>
     <Reference Include="Assembly-CSharp, Version=11.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\Smod2\Assembly-CSharp.dll</HintPath>
+      <HintPath>lib\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Smod2">
-      <HintPath>E:\SteamLibrary\steamapps\common\SCP Secret Laboratory2\SCPSL_Data\Managed\Smod2.dll</HintPath>
+    <Reference Include="Smod2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\Smod2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="YamlDotNet, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.5.0.1\lib\net35\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.5.3.0\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -99,23 +100,22 @@
     <None Include="Languages\french.yml" />
     <None Include="Languages\frenchemote.yml" />
     <None Include="Languages\russian.yml" />
-    <None Include="lib\Smod2\Smod2.dll" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="lib\Smod2\Assembly-CSharp.dll" />
+    <Content Include="lib\Assembly-CSharp.dll" />
+    <Content Include="lib\Smod2.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>taskkill /F /IM SCPSL.exe /T 2&gt;nul &amp;set errorlevel=0
 cd $(ProjectDir)
 copy /y bin\SCPDiscord.dll ..\..\..\scpserver\sm_plugins\
 mkdir ..\..\..\scpserver\sm_plugins\dependencies
-copy /y bin\Newtonsoft.Json.dll ..\..\..\scpserver\sm_plugins\dependencies\
 copy /y bin\YamlDotNet.dll ..\..\..\scpserver\sm_plugins\dependencies\</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/SCPDiscordPlugin/lib/Assembly-CSharp.dll b/SCPDiscordPlugin/lib/Assembly-CSharp.dll
diff --git a/SCPDiscordPlugin/lib/Smod2.dll b/SCPDiscordPlugin/lib/Smod2.dll
diff --git a/SCPDiscordPlugin/lib/Smod2/Assembly-CSharp.dll b/SCPDiscordPlugin/lib/Smod2/Assembly-CSharp.dll
diff --git a/SCPDiscordPlugin/lib/Smod2/Smod2.dll b/SCPDiscordPlugin/lib/Smod2/Smod2.dll
diff --git a/SCPDiscordPlugin/packages.config b/SCPDiscordPlugin/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
-  <package id="YamlDotNet" version="5.0.1" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net471" />
+  <package id="YamlDotNet" version="5.3.0" targetFramework="net471" />
 </packages>