No commit message

boubiro · Jul 24, 2020 · 7737f46 · 7737f46
1 parent fd8a8e1
commit 7737f46
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 17 deletions.
diff --git a/OpenBullet.sln b/OpenBullet.sln
@@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenBulletCLI", "OpenBullet
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginFramework", "PluginFramework\PluginFramework.csproj", "{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{66066A26-3EA4-4AD7-A5E1-5375823FF775}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{81663078-D74D-43D3-9877-98BD827F8B47}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		ChangeLog.md = ChangeLog.md
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilverBulletUpdater", "SilverBulletUpdater\SilverBulletUpdater.csproj", "{7CD591FE-C004-44E4-929A-981140560EC4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{66066A26-3EA4-4AD7-A5E1-5375823FF775}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{81663078-D74D-43D3-9877-98BD827F8B47}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		ChangeLog.md = ChangeLog.md
@@ -28,7 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tesseract", "Tesseract\Tesseract\Tesseract.csproj", "{AB8F7CF1-E75B-4BD3-8853-2348ECDEA969}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{66066A26-3EA4-4AD7-A5E1-5375823FF775}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{81663078-D74D-43D3-9877-98BD827F8B47}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		ChangeLog.md = ChangeLog.md
@@ -37,6 +37,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilverBullet.ImageProcessor", "SilverBullet.ImageProcessor\SilverBullet.ImageProcessor.csproj", "{0A8B141B-E5F3-4F7F-BA88-183668361B42}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extreme.Net", "Extreme.Net\Extreme.Net.csproj", "{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilverBullet.Plugin", "SilverBullet.Plugin\SilverBullet.Plugin.csproj", "{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +53,10 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x64.Build.0 = Debug|Any CPU
-		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x86.Build.0 = Debug|Any CPU
+		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x64.ActiveCfg = Release|x64
+		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x64.Build.0 = Release|x64
+		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x86.ActiveCfg = Release|Any CPU
+		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Debug|x86.Build.0 = Release|Any CPU
 		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Release|Any CPU.Build.0 = Release|Any CPU
 		{99E40E7F-00A4-4FB1-9441-B05A56C47C08}.Release|x64.ActiveCfg = Release|Any CPU
@@ -131,6 +135,30 @@ Global
 		{0A8B141B-E5F3-4F7F-BA88-183668361B42}.Release|x64.Build.0 = Release|Any CPU
 		{0A8B141B-E5F3-4F7F-BA88-183668361B42}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A8B141B-E5F3-4F7F-BA88-183668361B42}.Release|x86.Build.0 = Release|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Release|x64.Build.0 = Release|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D25D06E-0D35-42EF-BBA2-D5DE6E06CD04}.Release|x86.Build.0 = Release|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Debug|x64.Build.0 = Debug|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Debug|x86.Build.0 = Debug|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Release|x64.ActiveCfg = Release|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Release|x64.Build.0 = Release|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8829F2B-FF97-4E5D-A1C4-5059787CD91B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RuriLib/RuriLib.csproj b/RuriLib/RuriLib.csproj
@@ -50,13 +50,8 @@
     <Reference Include="Esprima, Version=1.0.1258.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
       <HintPath>..\packages\Esprima.1.0.1258\lib\net45\Esprima.dll</HintPath>
     </Reference>
-    <Reference Include="Extreme.Net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Extreme.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Humanizer, Version=2.8.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
+    <Reference Include="Humanizer">
       <HintPath>..\packages\Humanizer.Core.2.8.26\lib\netstandard2.0\Humanizer.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
       <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
@@ -79,9 +74,6 @@
     <Reference Include="LiteDB, Version=4.1.4.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
       <HintPath>..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll</HintPath>
     </Reference>
-    <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.19.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\packages\Magick.NET-Q16-AnyCPU.7.19.0.1\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
-    </Reference>
     <Reference Include="Magick.NET.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
       <HintPath>..\packages\Magick.NET.Core.2.0.0\lib\net40\Magick.NET.Core.dll</HintPath>
     </Reference>
@@ -400,6 +392,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Extreme.Net\Extreme.Net.csproj">
+      <Project>{5d25d06e-0d35-42ef-bba2-d5de6e06cd04}</Project>
+      <Name>Extreme.Net</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SilverBullet.ImageProcessor\SilverBullet.ImageProcessor.csproj">
       <Project>{0a8b141b-e5f3-4f7f-ba88-183668361b42}</Project>
       <Name>SilverBullet.ImageProcessor</Name>

diff --git a/RuriLib/packages.config b/RuriLib/packages.config
@@ -56,7 +56,6 @@
   <package id="Jint" version="3.0.0-beta-1715" targetFramework="net472" />
   <package id="LiteDB" version="4.1.4" targetFramework="net461" />
   <package id="Magick.NET.Core" version="2.0.0" targetFramework="net472" />
-  <package id="Magick.NET-Q16-AnyCPU" version="7.19.0.1" targetFramework="net472" />
   <package id="Microsoft.IdentityModel.Logging" version="6.7.1" targetFramework="net472" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.7.1" targetFramework="net472" />
   <package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net472" />