diff --git a/.gitignore b/.gitignore index 9c3b54d1d..7298735a3 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ ModelManifest.xml /*.rb /*.bat /tools/XmlGenerator/*.sqlite +/tools/XmlGenerator/sqlite-latest.sqlite.bz2 diff --git a/src/EVEMon.Common/App.config b/src/EVEMon.Common/App.config index 5e08ce20e..9e8186fad 100644 --- a/src/EVEMon.Common/App.config +++ b/src/EVEMon.Common/App.config @@ -1,35 +1,247 @@ - + -
-
-
+
+
+
-
-
-
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - + diff --git a/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceResources.Designer.cs b/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceResources.Designer.cs index 20e8df552..20e00debe 100644 --- a/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceResources.Designer.cs +++ b/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceResources.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Common.CloudStorageServices { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class CloudStorageServiceResources { diff --git a/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceSettings.Designer.cs b/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceSettings.Designer.cs index f5adcfffe..dbd4e5e0a 100644 --- a/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceSettings.Designer.cs +++ b/src/EVEMon.Common/CloudStorageServices/CloudStorageServiceSettings.Designer.cs @@ -12,7 +12,7 @@ namespace EVEMon.Common.CloudStorageServices { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] public sealed partial class CloudStorageServiceSettings : global::System.Configuration.ApplicationSettingsBase { private static CloudStorageServiceSettings defaultInstance = ((CloudStorageServiceSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new CloudStorageServiceSettings()))); diff --git a/src/EVEMon.Common/CloudStorageServices/Dropbox/DropboxCloudStorageServiceSettings.Designer.cs b/src/EVEMon.Common/CloudStorageServices/Dropbox/DropboxCloudStorageServiceSettings.Designer.cs index 81495d49d..f286d3dfa 100644 --- a/src/EVEMon.Common/CloudStorageServices/Dropbox/DropboxCloudStorageServiceSettings.Designer.cs +++ b/src/EVEMon.Common/CloudStorageServices/Dropbox/DropboxCloudStorageServiceSettings.Designer.cs @@ -12,7 +12,7 @@ namespace EVEMon.Common.CloudStorageServices.Dropbox { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] internal sealed partial class DropboxCloudStorageServiceSettings : global::System.Configuration.ApplicationSettingsBase { private static DropboxCloudStorageServiceSettings defaultInstance = ((DropboxCloudStorageServiceSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new DropboxCloudStorageServiceSettings()))); diff --git a/src/EVEMon.Common/CloudStorageServices/GoogleDrive/GoogleDriveCloudStorageServiceSettings.Designer.cs b/src/EVEMon.Common/CloudStorageServices/GoogleDrive/GoogleDriveCloudStorageServiceSettings.Designer.cs index 1a631098d..728491c16 100644 --- a/src/EVEMon.Common/CloudStorageServices/GoogleDrive/GoogleDriveCloudStorageServiceSettings.Designer.cs +++ b/src/EVEMon.Common/CloudStorageServices/GoogleDrive/GoogleDriveCloudStorageServiceSettings.Designer.cs @@ -12,7 +12,7 @@ namespace EVEMon.Common.CloudStorageServices.GoogleDrive { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] internal sealed partial class GoogleDriveCloudStorageServiceSettings : global::System.Configuration.ApplicationSettingsBase { private static GoogleDriveCloudStorageServiceSettings defaultInstance = ((GoogleDriveCloudStorageServiceSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new GoogleDriveCloudStorageServiceSettings()))); diff --git a/src/EVEMon.Common/CloudStorageServices/OneDrive/OneDriveCloudStorageServiceSettings.Designer.cs b/src/EVEMon.Common/CloudStorageServices/OneDrive/OneDriveCloudStorageServiceSettings.Designer.cs index f1182d713..5a3bed1d7 100644 --- a/src/EVEMon.Common/CloudStorageServices/OneDrive/OneDriveCloudStorageServiceSettings.Designer.cs +++ b/src/EVEMon.Common/CloudStorageServices/OneDrive/OneDriveCloudStorageServiceSettings.Designer.cs @@ -12,7 +12,7 @@ namespace EVEMon.Common.CloudStorageServices.OneDrive { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] internal sealed partial class OneDriveCloudStorageServiceSettings : global::System.Configuration.ApplicationSettingsBase { private static OneDriveCloudStorageServiceSettings defaultInstance = ((OneDriveCloudStorageServiceSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OneDriveCloudStorageServiceSettings()))); diff --git a/src/EVEMon.Common/Constants/NetworkConstants1.Designer.cs b/src/EVEMon.Common/Constants/NetworkConstants1.Designer.cs index d1ac4b21f..ccac968a7 100644 --- a/src/EVEMon.Common/Constants/NetworkConstants1.Designer.cs +++ b/src/EVEMon.Common/Constants/NetworkConstants1.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Common.Constants { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class NetworkConstants { diff --git a/src/EVEMon.Common/EVEMon.Common.csproj b/src/EVEMon.Common/EVEMon.Common.csproj index c71048152..cde9d7cbe 100644 --- a/src/EVEMon.Common/EVEMon.Common.csproj +++ b/src/EVEMon.Common/EVEMon.Common.csproj @@ -9,7 +9,7 @@ Properties EVEMon.Common EVEMon.Common - v4.6.1 + v4.8 512 ..\..\ true @@ -58,90 +58,8 @@ false - - ..\..\packages\Dropbox.Api.4.9.4\lib\net45\Dropbox.Api.dll - - - ..\..\packages\Google.Apis.1.42.0\lib\net45\Google.Apis.dll - - - ..\..\packages\Google.Apis.Auth.1.42.0\lib\net45\Google.Apis.Auth.dll - - - ..\..\packages\Google.Apis.Auth.1.42.0\lib\net45\Google.Apis.Auth.PlatformServices.dll - - - ..\..\packages\Google.Apis.Calendar.v3.1.42.0.1795\lib\net45\Google.Apis.Calendar.v3.dll - - - ..\..\packages\Google.Apis.Core.1.42.0\lib\net45\Google.Apis.Core.dll - - - ..\..\packages\Google.Apis.Drive.v3.1.42.0.1778\lib\net45\Google.Apis.Drive.v3.dll - - - ..\..\packages\Google.Apis.1.42.0\lib\net45\Google.Apis.PlatformServices.dll - - - ..\..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - - - ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.6.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll - - - ..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - ..\..\packages\Nancy.2.0.0\lib\net452\Nancy.dll - - - ..\..\packages\NetOffice.Core.Net40.1.7.4.4\lib\net40\NetOffice.dll - False - - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NetOffice.Core.Net40.1.7.4.4\lib\net40\OfficeApi.dll - False - - - ..\..\packages\Microsoft.OneDriveSDK.1.1.29\lib\net451\OneDriveSdk.dll - True - - - ..\..\packages\Microsoft.OneDriveSDK.1.1.29\lib\net451\OneDriveSdk.WindowsForms.dll - True - - - ..\..\packages\NetOffice.Outlook.Net40.1.7.4.4\lib\net40\OutlookApi.dll - False - - - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.6.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll - - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - @@ -152,18 +70,7 @@ - - ..\..\packages\NetOffice.Core.Net40.1.7.4.4\lib\net40\VBIDEApi.dll - False - - - ..\..\packages\YamlDotNet.8.0.0\lib\net45\YamlDotNet.dll - - - ..\..\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll - True - @@ -844,7 +751,6 @@ SettingsSingleFileGenerator OneDriveCloudStorageServiceSettings.Designer.cs - @@ -1311,7 +1217,50 @@ Always - + + + 6.19.0 + + + 1.55.0.2500 + + + 1.55.0.2502 + + + 1.0.168 + + + 1.0.21 + + + 2.2.29 + + + 1.1.29 + + + 2.0.0 + + + 1.7.4.11 + + + 13.0.1 + + + 1.3.3 + + + 6.14.1 + + + 11.2.1 + + + 1.11.0 + + @@ -1332,11 +1281,4 @@ - - - - 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}. - - - \ No newline at end of file diff --git a/src/EVEMon.Common/Net/ExceptionMessages.Designer.cs b/src/EVEMon.Common/Net/ExceptionMessages.Designer.cs index 8e97dadb5..7cb844a5e 100644 --- a/src/EVEMon.Common/Net/ExceptionMessages.Designer.cs +++ b/src/EVEMon.Common/Net/ExceptionMessages.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Common.Net { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ExceptionMessages { diff --git a/src/EVEMon.Common/Properties/Resources.Designer.cs b/src/EVEMon.Common/Properties/Resources.Designer.cs index 628d4428f..1c03eadd7 100644 --- a/src/EVEMon.Common/Properties/Resources.Designer.cs +++ b/src/EVEMon.Common/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Common.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/src/EVEMon.Common/Resources/MD5Sums.txt b/src/EVEMon.Common/Resources/MD5Sums.txt index 196b247f4..24a73ee9d 100644 --- a/src/EVEMon.Common/Resources/MD5Sums.txt +++ b/src/EVEMon.Common/Resources/MD5Sums.txt @@ -1,8 +1,8 @@ -df91ac86ac9954dfaff13ab77681a1cc *eve-blueprints-en-US.xml.gzip +8b36cd05b77d53ac9306c847dcf3c2ff *eve-blueprints-en-US.xml.gzip 540000f7c111354769a54fa31e57d411 *eve-certificates-en-US.xml.gzip -3077e700023d84a267b744a6ee44acc7 *eve-geography-en-US.xml.gzip -4c9cb667e22421fad8ca08777be7fd8a *eve-items-en-US.xml.gzip +e4075d02fc59996779c3892ef88e74ab *eve-geography-en-US.xml.gzip +3c5918aa1550583193697e6289c7aa50 *eve-items-en-US.xml.gzip 3668b50996fc40a0c0853fec427b5712 *eve-masteries-en-US.xml.gzip -1f6ae9f613fd26b08d5ec206d0958d79 *eve-properties-en-US.xml.gzip -adb83f4fc55f61a58548dcb924a91cfe *eve-reprocessing-en-US.xml.gzip -727a781211b138cf331afed346692962 *eve-skills-en-US.xml.gzip +fc04c1431cd200d3a7fc7f4f0c50ac3f *eve-properties-en-US.xml.gzip +617e104b832b9206f251482943fe77ba *eve-reprocessing-en-US.xml.gzip +e527bbfbb4b2fbeab7c86770f7ed1a19 *eve-skills-en-US.xml.gzip diff --git a/src/EVEMon.Common/Resources/Skill_Select/IconSettings.Designer.cs b/src/EVEMon.Common/Resources/Skill_Select/IconSettings.Designer.cs index cf91481ca..6d8b2c9f9 100644 --- a/src/EVEMon.Common/Resources/Skill_Select/IconSettings.Designer.cs +++ b/src/EVEMon.Common/Resources/Skill_Select/IconSettings.Designer.cs @@ -12,7 +12,7 @@ namespace EVEMon.Common.Resources.Skill_Select { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] public sealed partial class IconSettings : global::System.Configuration.ApplicationSettingsBase { private static IconSettings defaultInstance = ((IconSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new IconSettings()))); diff --git a/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip index c7d5fe310..b0f5e3610 100644 Binary files a/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-blueprints-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip index 3346341ec..26105e6fa 100644 Binary files a/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-geography-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip index 31715da1b..208b18d4b 100644 Binary files a/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-items-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip index 9d1537ccb..5b236832e 100644 Binary files a/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-properties-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip index 3fceec093..016db327c 100644 Binary files a/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-reprocessing-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip index 29d68f7e7..39908aa0a 100644 Binary files a/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip differ diff --git a/src/EVEMon.Common/Serialization/Datafiles/DatafileConstants.Designer.cs b/src/EVEMon.Common/Serialization/Datafiles/DatafileConstants.Designer.cs index a077b79f7..1bd4d309f 100644 --- a/src/EVEMon.Common/Serialization/Datafiles/DatafileConstants.Designer.cs +++ b/src/EVEMon.Common/Serialization/Datafiles/DatafileConstants.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Common.Serialization.Datafiles { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class DatafileConstants { diff --git a/src/EVEMon.Common/packages.config b/src/EVEMon.Common/packages.config deleted file mode 100644 index 2ed997e1a..000000000 --- a/src/EVEMon.Common/packages.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/EVEMon.LogitechG15/EVEMon.LogitechG15.csproj b/src/EVEMon.LogitechG15/EVEMon.LogitechG15.csproj index 8ca77dca4..2472c7a3c 100644 --- a/src/EVEMon.LogitechG15/EVEMon.LogitechG15.csproj +++ b/src/EVEMon.LogitechG15/EVEMon.LogitechG15.csproj @@ -9,7 +9,7 @@ Properties EVEMon.LogitechG15 EVEMon.LogitechG15 - v4.6.1 + v4.8 512 diff --git a/src/EVEMon.LogitechG15/Properties/Resources.Designer.cs b/src/EVEMon.LogitechG15/Properties/Resources.Designer.cs index 1fcd37cc7..01cde6049 100644 --- a/src/EVEMon.LogitechG15/Properties/Resources.Designer.cs +++ b/src/EVEMon.LogitechG15/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.LogitechG15.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/EVEMon.LogitechG15/app.config b/src/EVEMon.LogitechG15/app.config index 467d30b0e..9762dca39 100644 --- a/src/EVEMon.LogitechG15/app.config +++ b/src/EVEMon.LogitechG15/app.config @@ -1,23 +1,23 @@ - + - - + + - - + + - - + + - - + + - + diff --git a/src/EVEMon.PieChart/EVEMon.PieChart.csproj b/src/EVEMon.PieChart/EVEMon.PieChart.csproj index 4e347a4f8..d9f64dd8a 100644 --- a/src/EVEMon.PieChart/EVEMon.PieChart.csproj +++ b/src/EVEMon.PieChart/EVEMon.PieChart.csproj @@ -9,7 +9,7 @@ Properties EVEMon.PieChart EVEMon.PieChart - v4.6.1 + v4.8 512 diff --git a/src/EVEMon.PieChart/app.config b/src/EVEMon.PieChart/app.config index 467d30b0e..9762dca39 100644 --- a/src/EVEMon.PieChart/app.config +++ b/src/EVEMon.PieChart/app.config @@ -1,23 +1,23 @@ - + - - + + - - + + - - + + - - + + - + diff --git a/src/EVEMon.Watchdog/EVEMon.Watchdog.csproj b/src/EVEMon.Watchdog/EVEMon.Watchdog.csproj index e677b66c1..ae9e97676 100644 --- a/src/EVEMon.Watchdog/EVEMon.Watchdog.csproj +++ b/src/EVEMon.Watchdog/EVEMon.Watchdog.csproj @@ -9,7 +9,7 @@ Properties EVEMon.Watchdog EVEMon.Watchdog - v4.6.1 + v4.8 512 diff --git a/src/EVEMon.Watchdog/Properties/Resources.Designer.cs b/src/EVEMon.Watchdog/Properties/Resources.Designer.cs index 725dde1d8..50068e582 100644 --- a/src/EVEMon.Watchdog/Properties/Resources.Designer.cs +++ b/src/EVEMon.Watchdog/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Watchdog.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/EVEMon.Watchdog/app.config b/src/EVEMon.Watchdog/app.config index 3dbff35f4..3e0e37cfc 100644 --- a/src/EVEMon.Watchdog/app.config +++ b/src/EVEMon.Watchdog/app.config @@ -1,3 +1,3 @@ - + diff --git a/src/EVEMon.WindowsApi/EVEMon.WindowsApi.csproj b/src/EVEMon.WindowsApi/EVEMon.WindowsApi.csproj index c32da6062..76e1f9ed0 100644 --- a/src/EVEMon.WindowsApi/EVEMon.WindowsApi.csproj +++ b/src/EVEMon.WindowsApi/EVEMon.WindowsApi.csproj @@ -9,7 +9,7 @@ Properties EVEMon.WindowsApi EVEMon.WindowsApi - v4.6.1 + v4.8 512 diff --git a/src/EVEMon/App.config b/src/EVEMon/App.config index 5ea1dc9b8..ac4580c13 100644 --- a/src/EVEMon/App.config +++ b/src/EVEMon/App.config @@ -1,47 +1,47 @@ - + -
+
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -52,4 +52,4 @@ - + diff --git a/src/EVEMon/EVEMon.csproj b/src/EVEMon/EVEMon.csproj index 63177e99a..1740a21f8 100644 --- a/src/EVEMon/EVEMon.csproj +++ b/src/EVEMon/EVEMon.csproj @@ -9,7 +9,7 @@ Properties EVEMon EVEMon - v4.6.1 + v4.8 512 true @@ -62,7 +62,6 @@ - diff --git a/src/EVEMon/Properties/Resources.Designer.cs b/src/EVEMon/Properties/Resources.Designer.cs index 0d4bc38e8..843fe92a7 100644 --- a/src/EVEMon/Properties/Resources.Designer.cs +++ b/src/EVEMon/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace EVEMon.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/EVEMon/Properties/Settings.Designer.cs b/src/EVEMon/Properties/Settings.Designer.cs index a184cf28e..a3a5aca09 100644 --- a/src/EVEMon/Properties/Settings.Designer.cs +++ b/src/EVEMon/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace EVEMon.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/tests/Tests.EVEMon.Common/Tests.EVEMon.Common.csproj b/tests/Tests.EVEMon.Common/Tests.EVEMon.Common.csproj index 14ddbed27..a0d953eef 100644 --- a/tests/Tests.EVEMon.Common/Tests.EVEMon.Common.csproj +++ b/tests/Tests.EVEMon.Common/Tests.EVEMon.Common.csproj @@ -1,6 +1,5 @@  - Debug AnyCPU @@ -9,7 +8,7 @@ Properties Tests.EVEMon.Common Tests.EVEMon.Common - v4.6.1 + v4.8 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -58,30 +57,10 @@ false - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - 3.5 - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -112,7 +91,19 @@ - + + + + 4.16.1 + + + 2.4.1 + + + 2.4.3 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + @@ -141,12 +132,6 @@ del "$(TargetDir)"*outlook* del "$(TargetDir)"YamlDotNet* if exist "$(TargetDir)"stdole.dll del "$(TargetDir)"stdole.dll - - - 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}. - - - +
+ - + - - + + + + + + + + + + - + - - + + + - - + + - - + + - - + + - - + + - - - - - - - \ No newline at end of file + + diff --git a/tools/XmlGenerator/XmlGenerator.csproj b/tools/XmlGenerator/XmlGenerator.csproj index 599b4740c..be949fa6d 100644 --- a/tools/XmlGenerator/XmlGenerator.csproj +++ b/tools/XmlGenerator/XmlGenerator.csproj @@ -9,7 +9,7 @@ Properties EVEMon.XmlGenerator EVEMonXmlGenerator - v4.6.1 + v4.8 512 ..\..\ true @@ -57,33 +57,10 @@ false - - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\System.Data.SQLite.Core.1.0.108.0\lib\net46\System.Data.SQLite.dll - True - - - ..\..\packages\System.Data.SQLite.EF6.1.0.108.0\lib\net46\System.Data.SQLite.EF6.dll - True - - - ..\..\packages\System.Data.SQLite.Linq.1.0.108.0\lib\net46\System.Data.SQLite.Linq.dll - True - @@ -253,30 +230,34 @@ - + + + 6.4.4 + + + 13.0.1 + + + 1.3.3 + + + 1.0.115.5 + + rd /s /q "$(TargetDir)"Resources del "$(TargetDir)"Google* del "$(TargetDir)"*office* del "$(TargetDir)"*outlook* -del "$(TargetDir)"*SharpZipLib* del "$(TargetDir)"YamlDotNet* del "$(TargetDir)"Dropbox* del "$(TargetDir)"OneDrive* del "$(TargetDir)"Microsoft* -del "$(TargetDir)"Zlib* if exist "$(TargetDir)"stdole.dll del "$(TargetDir)"stdole.dll - - - - 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}. - - -