diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index dfeed63..1d5b215 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -82,7 +82,7 @@ ..\packages\Microsoft.AspNet.SessionState.SessionStateModule.1.1.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -113,7 +113,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.25.0\lib\net46\SharpCompress.dll @@ -122,7 +122,7 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.1.30\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll @@ -138,7 +138,11 @@ ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + ..\packages\System.IO.Pipelines.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll @@ -188,7 +192,7 @@ ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + ..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/GPW_Admin/Web.config b/GPW_Admin/Web.config index 721b46e..b15d7f3 100644 --- a/GPW_Admin/Web.config +++ b/GPW_Admin/Web.config @@ -422,6 +422,10 @@ + + + + diff --git a/GPW_Admin/packages.config b/GPW_Admin/packages.config index 732b7cc..a3ea5d2 100644 --- a/GPW_Admin/packages.config +++ b/GPW_Admin/packages.config @@ -22,7 +22,7 @@ - + @@ -41,16 +41,17 @@ - + - + + @@ -62,7 +63,7 @@ - + \ No newline at end of file diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index 49ef7a5..4608b78 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -74,7 +74,7 @@ ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -102,7 +102,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.25.0\lib\net46\SharpCompress.dll @@ -111,7 +111,7 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.1.30\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll @@ -127,7 +127,11 @@ ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + ..\packages\System.IO.Pipelines.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll @@ -177,7 +181,7 @@ ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + ..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/GPW_Barcode/Web.config b/GPW_Barcode/Web.config index 36a7a11..5f9a506 100644 --- a/GPW_Barcode/Web.config +++ b/GPW_Barcode/Web.config @@ -409,6 +409,10 @@ + + + + diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 41467c4..65aff80 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Barcode/packages.config b/GPW_Barcode/packages.config index e658b19..de381fa 100644 --- a/GPW_Barcode/packages.config +++ b/GPW_Barcode/packages.config @@ -17,7 +17,7 @@ - + @@ -29,16 +29,17 @@ - + - + + @@ -50,7 +51,7 @@ - + \ No newline at end of file diff --git a/GPW_Data/packages.config b/GPW_Data/packages.config index 3391692..e95cd93 100644 --- a/GPW_Data/packages.config +++ b/GPW_Data/packages.config @@ -4,7 +4,7 @@ - + @@ -14,14 +14,15 @@ - + - + + @@ -33,6 +34,6 @@ - + \ No newline at end of file diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index 9c281dd..e3045d3 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -77,7 +77,7 @@ ..\packages\Microsoft.AspNet.SessionState.SessionStateModule.1.1.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -108,7 +108,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.25.0\lib\net46\SharpCompress.dll @@ -117,7 +117,7 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.1.30\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll @@ -133,7 +133,11 @@ ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + ..\packages\System.IO.Pipelines.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll @@ -186,7 +190,7 @@ ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + ..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/GPW_Smart/Web.config b/GPW_Smart/Web.config index 8fa60ff..2419944 100644 --- a/GPW_Smart/Web.config +++ b/GPW_Smart/Web.config @@ -416,6 +416,10 @@ + + + + diff --git a/GPW_Smart/packages.config b/GPW_Smart/packages.config index fa7cae0..3ddc35a 100644 --- a/GPW_Smart/packages.config +++ b/GPW_Smart/packages.config @@ -29,7 +29,7 @@ - + @@ -43,16 +43,17 @@ - + - + + @@ -64,7 +65,7 @@ - + \ No newline at end of file diff --git a/GPW_data/App.config b/GPW_data/App.config index 34e2f83..c9a76c5 100644 --- a/GPW_data/App.config +++ b/GPW_data/App.config @@ -59,6 +59,10 @@ + + + + diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj index 1ca20f8..e3e4e27 100644 --- a/GPW_data/GPW_data.csproj +++ b/GPW_data/GPW_data.csproj @@ -52,7 +52,7 @@ ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\MongoDB.Bson.2.11.1\lib\net452\MongoDB.Bson.dll @@ -79,7 +79,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.25.0\lib\net46\SharpCompress.dll @@ -88,7 +88,7 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.1.30\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll @@ -103,7 +103,11 @@ ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + ..\packages\System.IO.Pipelines.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll @@ -153,7 +157,7 @@ ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + ..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll