diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 62bb7d5..17a3887 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -52,8 +52,8 @@ ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll - - ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll + + ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll @@ -68,8 +68,8 @@ ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - ..\packages\DnsClient.1.3.1\lib\net45\DnsClient.dll + + ..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll @@ -88,14 +88,14 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.10.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.1\lib\net452\MongoDB.Bson.dll ..\packages\MongoDB.Driver.2.10.3\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.10.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.1\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -145,6 +145,11 @@ ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll @@ -158,6 +163,26 @@ True + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll @@ -292,6 +317,9 @@ + + + @@ -1090,9 +1118,11 @@ + + @@ -406,12 +406,16 @@ - + + + + + diff --git a/GPW_Smart/packages.config b/GPW_Smart/packages.config index abdd3c9..480db7e 100644 --- a/GPW_Smart/packages.config +++ b/GPW_Smart/packages.config @@ -1,14 +1,14 @@  - + - + @@ -35,9 +35,9 @@ - + - + @@ -55,9 +55,14 @@ + + + + + diff --git a/GPW_data/App.config b/GPW_data/App.config index 1bffe64..34e2f83 100644 --- a/GPW_data/App.config +++ b/GPW_data/App.config @@ -49,12 +49,16 @@ - + + + + + diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj index 22ef46b..df4e8c8 100644 --- a/GPW_data/GPW_data.csproj +++ b/GPW_data/GPW_data.csproj @@ -39,14 +39,14 @@ ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll - - ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll + + ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - ..\packages\DnsClient.1.3.1\lib\net45\DnsClient.dll + + ..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll @@ -54,14 +54,14 @@ ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\MongoDB.Bson.2.10.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.1\lib\net452\MongoDB.Bson.dll ..\packages\MongoDB.Driver.2.10.3\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.10.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.1\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -110,6 +110,11 @@ ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll @@ -123,6 +128,26 @@ True + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll @@ -225,6 +250,9 @@ + + + @@ -270,8 +298,10 @@ + +