diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index 311ff810b..2aded370b 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -57,13 +57,7 @@ - - - - - - - + @@ -1799,16 +1793,7 @@ - - - - - - - - - - + diff --git a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj index 2aa6ee925..3073f1f87 100644 --- a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj +++ b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj @@ -81,7 +81,7 @@ - + diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj index 208b894c1..843448014 100644 --- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj @@ -107,7 +107,7 @@ - + diff --git a/DiscImageChef.Compression/DiscImageChef.Compression.csproj b/DiscImageChef.Compression/DiscImageChef.Compression.csproj index b67d76268..21ebb801f 100644 --- a/DiscImageChef.Compression/DiscImageChef.Compression.csproj +++ b/DiscImageChef.Compression/DiscImageChef.Compression.csproj @@ -236,7 +236,7 @@ - + - - - - - /Library/Frameworks/Mono.framework/Versions/Current/lib/mono - /usr/lib/mono - /usr/local/lib/mono - - $(BaseFrameworkPathOverrideForMono)/4.0-api - $(BaseFrameworkPathOverrideForMono)/4.5-api - $(BaseFrameworkPathOverrideForMono)/4.5.1-api - $(BaseFrameworkPathOverrideForMono)/4.5.2-api - $(BaseFrameworkPathOverrideForMono)/4.6-api - $(BaseFrameworkPathOverrideForMono)/4.6.1-api - $(BaseFrameworkPathOverrideForMono)/4.6.2-api - $(BaseFrameworkPathOverrideForMono)/4.7-api - $(BaseFrameworkPathOverrideForMono)/4.7.1-api - true - - $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) - - + + + + + /Library/Frameworks/Mono.framework/Versions/Current/lib/mono + /usr/lib/mono + /usr/local/lib/mono + + $(BaseFrameworkPathOverrideForMono)/4.0-api + $(BaseFrameworkPathOverrideForMono)/4.5-api + $(BaseFrameworkPathOverrideForMono)/4.5.1-api + $(BaseFrameworkPathOverrideForMono)/4.5.2-api + $(BaseFrameworkPathOverrideForMono)/4.6-api + $(BaseFrameworkPathOverrideForMono)/4.6.1-api + $(BaseFrameworkPathOverrideForMono)/4.6.2-api + $(BaseFrameworkPathOverrideForMono)/4.7-api + $(BaseFrameworkPathOverrideForMono)/4.7.1-api + true + + $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) + + \ No newline at end of file diff --git a/DiscImageChef.Server/DiscImageChef.Server.csproj b/DiscImageChef.Server/DiscImageChef.Server.csproj index 72dd52bd1..d78afa00f 100644 --- a/DiscImageChef.Server/DiscImageChef.Server.csproj +++ b/DiscImageChef.Server/DiscImageChef.Server.csproj @@ -77,20 +77,20 @@ ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll True - - ..\packages\Google.Protobuf.3.7.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.9.1\lib\net45\Google.Protobuf.dll True - - ..\packages\Highsoft.Highcharts.7.0.3.11\lib\net40\Highcharts.Web.Mvc.dll + + ..\packages\Highsoft.Highcharts.7.1.3.1\lib\netstandard2.0\Highcharts.dll True - - ..\packages\MailKit.2.1.4\lib\net45\MailKit.dll + + ..\packages\MailKit.2.3.1.6\lib\net46\MailKit.dll True - - ..\packages\Markdig.0.16.0\lib\net40\Markdig.dll + + ..\packages\Markdig.0.17.1\lib\net40\Markdig.dll True @@ -101,27 +101,36 @@ ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\packages\MimeKit.2.1.4\lib\net45\MimeKit.dll + + ..\packages\MimeKit.2.3.1\lib\net46\MimeKit.dll True - - ..\packages\MySql.Data.8.0.15\lib\net452\MySql.Data.dll + + ..\packages\MySql.Data.8.0.17\lib\net452\MySql.Data.dll True - - ..\packages\MySql.Data.EntityFramework.8.0.15\lib\net452\MySql.Data.EntityFramework.dll + + ..\packages\MySql.Data.EntityFramework.8.0.17\lib\net452\MySql.Data.EntityFramework.dll True ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll True + + ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll + True + + + ..\packages\System.Configuration.ConfigurationManager.4.5.0\lib\net461\System.Configuration.ConfigurationManager.dll + True + + ..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll True @@ -129,11 +138,25 @@ + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll True + + ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll + True + + + ..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll + True + + + ..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll + True + + @@ -484,25 +507,25 @@ --> - - - - - /Library/Frameworks/Mono.framework/Versions/Current/lib/mono - /usr/lib/mono - /usr/local/lib/mono - - $(BaseFrameworkPathOverrideForMono)/4.0-api - $(BaseFrameworkPathOverrideForMono)/4.5-api - $(BaseFrameworkPathOverrideForMono)/4.5.1-api - $(BaseFrameworkPathOverrideForMono)/4.5.2-api - $(BaseFrameworkPathOverrideForMono)/4.6-api - $(BaseFrameworkPathOverrideForMono)/4.6.1-api - $(BaseFrameworkPathOverrideForMono)/4.6.2-api - $(BaseFrameworkPathOverrideForMono)/4.7-api - $(BaseFrameworkPathOverrideForMono)/4.7.1-api - true - - $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) - - + + + + + /Library/Frameworks/Mono.framework/Versions/Current/lib/mono + /usr/lib/mono + /usr/local/lib/mono + + $(BaseFrameworkPathOverrideForMono)/4.0-api + $(BaseFrameworkPathOverrideForMono)/4.5-api + $(BaseFrameworkPathOverrideForMono)/4.5.1-api + $(BaseFrameworkPathOverrideForMono)/4.5.2-api + $(BaseFrameworkPathOverrideForMono)/4.6-api + $(BaseFrameworkPathOverrideForMono)/4.6.1-api + $(BaseFrameworkPathOverrideForMono)/4.6.2-api + $(BaseFrameworkPathOverrideForMono)/4.7-api + $(BaseFrameworkPathOverrideForMono)/4.7.1-api + true + + $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) + + \ No newline at end of file diff --git a/DiscImageChef.Server/packages.config b/DiscImageChef.Server/packages.config index bae9fe421..e678a9766 100644 --- a/DiscImageChef.Server/packages.config +++ b/DiscImageChef.Server/packages.config @@ -4,10 +4,10 @@ - - - - + + + + @@ -20,11 +20,16 @@ - - - + + + + + + + + \ No newline at end of file diff --git a/DiscImageChef.Settings/DiscImageChef.Settings.csproj b/DiscImageChef.Settings/DiscImageChef.Settings.csproj index 6d9a74caf..b2fb01f20 100644 --- a/DiscImageChef.Settings/DiscImageChef.Settings.csproj +++ b/DiscImageChef.Settings/DiscImageChef.Settings.csproj @@ -61,7 +61,7 @@ - + diff --git a/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj b/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj index f51ed09e3..560df307b 100644 --- a/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj +++ b/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj @@ -105,7 +105,7 @@ - + diff --git a/DiscImageChef.Tests/DiscImageChef.Tests.csproj b/DiscImageChef.Tests/DiscImageChef.Tests.csproj index e91be4a90..7be75e5a6 100644 --- a/DiscImageChef.Tests/DiscImageChef.Tests.csproj +++ b/DiscImageChef.Tests/DiscImageChef.Tests.csproj @@ -185,9 +185,9 @@ - - - + + + diff --git a/DiscImageChef.Wpf.sln b/DiscImageChef.Wpf.sln index 6875128a8..69b704360 100644 --- a/DiscImageChef.Wpf.sln +++ b/DiscImageChef.Wpf.sln @@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Gui", "DiscIm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.EntityFramework", "DiscImageChef.EntityFramework\DiscImageChef.EntityFramework.csproj", "{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server", "DiscImageChef.Server\DiscImageChef.Server.csproj", "{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server.Task", "DiscImageChef.Server.Task\DiscImageChef.Server.Task.csproj", "{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Dto", "DiscImageChef.Dto\DiscImageChef.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}" EndProject Global @@ -217,22 +213,6 @@ Global {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.Build.0 = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.ActiveCfg = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.Build.0 = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.Build.0 = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|x86.ActiveCfg = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|x86.Build.0 = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.ActiveCfg = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.Build.0 = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|x86.ActiveCfg = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|x86.Build.0 = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|x86.ActiveCfg = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|x86.Build.0 = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.Build.0 = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|x86.ActiveCfg = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|x86.Build.0 = Release|Any CPU {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/DiscImageChef.Wpf/DiscImageChef.Wpf.csproj b/DiscImageChef.Wpf/DiscImageChef.Wpf.csproj index 9599fd2db..1b85934b2 100644 --- a/DiscImageChef.Wpf/DiscImageChef.Wpf.csproj +++ b/DiscImageChef.Wpf/DiscImageChef.Wpf.csproj @@ -100,10 +100,10 @@ - 2.5.0-beta.1 + 2.5.0-rc.4 - 2.2.4 + 2.2.6 0.3.0 diff --git a/DiscImageChef.Xamarin.sln b/DiscImageChef.Xamarin.sln index d3846d6d1..74b390639 100644 --- a/DiscImageChef.Xamarin.sln +++ b/DiscImageChef.Xamarin.sln @@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Gui", "DiscIm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.EntityFramework", "DiscImageChef.EntityFramework\DiscImageChef.EntityFramework.csproj", "{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server", "DiscImageChef.Server\DiscImageChef.Server.csproj", "{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server.Task", "DiscImageChef.Server.Task\DiscImageChef.Server.Task.csproj", "{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Dto", "DiscImageChef.Dto\DiscImageChef.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}" EndProject Global @@ -217,22 +213,6 @@ Global {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.Build.0 = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.ActiveCfg = Release|Any CPU {F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.Build.0 = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.Build.0 = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|x86.ActiveCfg = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|x86.Build.0 = Debug|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.ActiveCfg = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.Build.0 = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|x86.ActiveCfg = Release|Any CPU - {911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|x86.Build.0 = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|x86.ActiveCfg = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|x86.Build.0 = Debug|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.Build.0 = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|x86.ActiveCfg = Release|Any CPU - {79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|x86.Build.0 = Release|Any CPU {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj index d7883eb51..58e965be7 100644 --- a/DiscImageChef/DiscImageChef.csproj +++ b/DiscImageChef/DiscImageChef.csproj @@ -262,17 +262,19 @@ - + - + - + + + \ No newline at end of file