Welcome to 2018

LexTheGreat · May 5, 2018 · c83c4c4 · c83c4c4
1 parent 8289407
commit c83c4c4
Show file tree

Hide file tree

Showing 11 changed files with 138 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ src/Plugins/*/bin/*
 src/Plugins/*/obj/*
 src/Proxy/bin/*
 src/Proxy/obj/*
+src/.vs/*
+src/devenv.sln
diff --git a/src/MBCon.sln b/src/MBCon.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBCon", "MBCon\MBCon.csproj", "{A4D85603-E6B2-4E76-9119-0035D6F2CF52}"
 EndProject
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{F298
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEFilterMonitor", "Plugins\BEFilterMonitor\BEFilterMonitor.csproj", "{432917B3-329E-4737-99FA-009F6CFCC7F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CCG", "Plugins\CCG\CCG.csproj", "{B6D93635-68EB-4C86-8B0A-733D71FFB07A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "Plugins\Console\Console.csproj", "{D028F62E-60EE-4407-833E-58C2D7C18F58}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logger", "Plugins\Logger\Logger.csproj", "{C31579DC-515E-4486-A821-33C6D930CA0B}"
@@ -89,16 +87,6 @@ Global
 		{432917B3-329E-4737-99FA-009F6CFCC7F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{432917B3-329E-4737-99FA-009F6CFCC7F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{432917B3-329E-4737-99FA-009F6CFCC7F0}.Release|Win32.ActiveCfg = Release|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A}.Release|Win32.ActiveCfg = Release|Any CPU
 		{D028F62E-60EE-4407-833E-58C2D7C18F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D028F62E-60EE-4407-833E-58C2D7C18F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D028F62E-60EE-4407-833E-58C2D7C18F58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -195,7 +183,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{432917B3-329E-4737-99FA-009F6CFCC7F0} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
-		{B6D93635-68EB-4C86-8B0A-733D71FFB07A} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
 		{D028F62E-60EE-4407-833E-58C2D7C18F58} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
 		{C31579DC-515E-4486-A821-33C6D930CA0B} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
 		{DDBC3780-361D-4C7A-AE27-69E8F2062561} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
@@ -206,4 +193,7 @@ Global
 		{44205B98-A214-45D9-B796-9F70E9E117A5} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
 		{49ACB892-4384-4849-AFFA-39329EA2B30E} = {F2985CE6-B8D7-4C31-9DC8-F5A56E69DF33}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {38F652C8-063B-4AA4-B4A4-C5AC0E68B503}
+	EndGlobalSection
 EndGlobal
diff --git a/src/MBCon/App.config b/src/MBCon/App.config
@@ -3,10 +3,10 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
-  <system.data>
+
+<system.data>
     <DbProviderFactories>
       <remove invariant="MySql.Data.MySqlClient" />
       <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
-  </system.data>
-</configuration>
+  </system.data></configuration>
diff --git a/src/MBCon/MBCon.csproj b/src/MBCon/MBCon.csproj
@@ -11,7 +11,8 @@
     <AssemblyName>MBCon</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>fe1469f0</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -36,10 +37,10 @@
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentCommandLineParser">
-      <HintPath>..\packages\FluentCommandLineParser.1.4.1\lib\net35\FluentCommandLineParser.dll</HintPath>
+    <Reference Include="FluentCommandLineParser, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentCommandLineParser.1.4.3\lib\net35\FluentCommandLineParser.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data">
+    <Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -65,10 +66,10 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
     <None Include="config.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BattleNET\BattleNET.csproj">
@@ -89,13 +90,6 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\Fody.1.27.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.27.1\build\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.27.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.27.1\build\Fody.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -106,4 +100,13 @@
   <Target AfterTargets="AfterBuild;NonWinFodyTarget" Name="CleanReferenceCopyLocalPaths">
     <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
+  <Import Project="..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" />
+  </Target>
+  <Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" />
 </Project>
diff --git a/src/MBCon/packages.config b/src/MBCon/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
-  <package id="FluentCommandLineParser" version="1.4.1" targetFramework="net45" />
-  <package id="Fody" version="1.27.1" targetFramework="net45" developmentDependency="true" />
+  <package id="Costura.Fody" version="2.0.0" targetFramework="net45" developmentDependency="true" />
+  <package id="FluentCommandLineParser" version="1.4.3" targetFramework="net45" />
+  <package id="Fody" version="3.0.3" targetFramework="net45" developmentDependency="true" />
   <package id="MySql.Data" version="6.9.5" targetFramework="net45" />
 </packages>
diff --git a/src/Plugins/RestartMessages/RestartMessages.csproj b/src/Plugins/RestartMessages/RestartMessages.csproj
@@ -11,7 +11,8 @@
     <AssemblyName>RestartMessages</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>6fc646dc</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,8 +34,8 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Humanizer">
-      <HintPath>..\..\packages\Humanizer.1.34.0\lib\portable-win+net40+sl50+wp8+wpa81\Humanizer.dll</HintPath>
+    <Reference Include="Humanizer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -66,23 +67,23 @@
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.26.1\build\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Fody.1.26.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.26.1\build\Fody.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Target 
-    AfterTargets="AfterBuild;NonWinFodyTarget"
-    Name="CleanReferenceCopyLocalPaths" >
-     <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
-</Target>
+  <Target AfterTargets="AfterBuild;NonWinFodyTarget" Name="CleanReferenceCopyLocalPaths">
+    <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
+  </Target>
+  <Import Project="..\..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.3.0.3\build\Fody.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\..\packages\Fody.3.0.3\build\Fody.targets')" />
 </Project>
diff --git a/src/Plugins/RestartMessages/packages.config b/src/Plugins/RestartMessages/packages.config
@@ -1,6 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Fody" version="1.26.1" targetFramework="net45" developmentDependency="true" />
-  <package id="Humanizer" version="1.34.0" targetFramework="net45" />
+  <package id="Costura.Fody" version="2.0.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Fody" version="3.0.3" targetFramework="net45" developmentDependency="true" />
+  <package id="Humanizer" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.af" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.ar" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.bg" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.bn-BD" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.cs" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.da" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.de" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.el" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.es" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.fa" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.fi-FI" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.fr" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.fr-BE" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.he" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.hr" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.hu" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.id" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.it" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.ja" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.lv" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.nb" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.nb-NO" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.nl" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.pl" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.pt" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.ro" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.ru" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.sk" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.sl" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.sr" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.sr-Latn" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.sv" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.tr" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.uk" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.uz-Cyrl-UZ" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.uz-Latn-UZ" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.vi" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.zh-CN" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.zh-Hans" version="2.2.0" targetFramework="net45" />
+  <package id="Humanizer.Core.zh-Hant" version="2.2.0" targetFramework="net45" />
 </packages>
diff --git a/src/Plugins/ScheduledTasks/ScheduledTasks.csproj b/src/Plugins/ScheduledTasks/ScheduledTasks.csproj
@@ -33,11 +33,11 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Humanizer">
-      <HintPath>..\..\packages\Humanizer.1.34.0\lib\portable-win+net40+sl50+wp8+wpa81\Humanizer.dll</HintPath>
+    <Reference Include="Humanizer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.7.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />