diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 515821c..44655fc 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -112,16 +112,15 @@ - False - ExtLib\Microsoft.ReportViewer.Common.dll + ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll + True + + + ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.ProcessingObjectModel.DLL - False - ExtLib\Microsoft.ReportViewer.WebForms.dll - - - False - ExtLib\Microsoft.ReportViewer.WinForms.dll + ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.WebForms.DLL + True ..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll @@ -134,8 +133,8 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.2.2.6\lib\net40\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.4.12\lib\net45\NLog.dll @@ -284,9 +283,6 @@ - - - diff --git a/CMS_SC/ExtLib/Microsoft.ReportViewer.Common.dll b/CMS_SC/ExtLib/Microsoft.ReportViewer.Common.dll deleted file mode 100644 index 56e5d41..0000000 Binary files a/CMS_SC/ExtLib/Microsoft.ReportViewer.Common.dll and /dev/null differ diff --git a/CMS_SC/ExtLib/Microsoft.ReportViewer.WebForms.dll b/CMS_SC/ExtLib/Microsoft.ReportViewer.WebForms.dll deleted file mode 100644 index 7952e9c..0000000 Binary files a/CMS_SC/ExtLib/Microsoft.ReportViewer.WebForms.dll and /dev/null differ diff --git a/CMS_SC/ExtLib/Microsoft.ReportViewer.WinForms.dll b/CMS_SC/ExtLib/Microsoft.ReportViewer.WinForms.dll deleted file mode 100644 index 51ba352..0000000 Binary files a/CMS_SC/ExtLib/Microsoft.ReportViewer.WinForms.dll and /dev/null differ diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index 27692bb..d2c5416 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -24,7 +24,7 @@ - + @@ -175,7 +175,7 @@ - + diff --git a/CMS_SC/bin/CMS_SC.dll.config b/CMS_SC/bin/CMS_SC.dll.config index 27692bb..fa07e15 100644 --- a/CMS_SC/bin/CMS_SC.dll.config +++ b/CMS_SC/bin/CMS_SC.dll.config @@ -24,7 +24,7 @@ - + diff --git a/CMS_SC/bin/Microsoft.ReportViewer.Common.dll b/CMS_SC/bin/Microsoft.ReportViewer.Common.dll index 56e5d41..b418a45 100644 Binary files a/CMS_SC/bin/Microsoft.ReportViewer.Common.dll and b/CMS_SC/bin/Microsoft.ReportViewer.Common.dll differ diff --git a/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll b/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll index 7952e9c..2ca9b6a 100644 Binary files a/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll and b/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll differ diff --git a/CMS_SC/bin/Microsoft.ReportViewer.WinForms.dll b/CMS_SC/bin/Microsoft.ReportViewer.WinForms.dll deleted file mode 100644 index 51ba352..0000000 Binary files a/CMS_SC/bin/Microsoft.ReportViewer.WinForms.dll and /dev/null differ diff --git a/CMS_SC/bin/Newtonsoft.Json.dll b/CMS_SC/bin/Newtonsoft.Json.dll index 77a5d89..1971a35 100644 Binary files a/CMS_SC/bin/Newtonsoft.Json.dll and b/CMS_SC/bin/Newtonsoft.Json.dll differ diff --git a/CMS_SC/packages.config b/CMS_SC/packages.config index 9dcb51b..0a8b076 100644 --- a/CMS_SC/packages.config +++ b/CMS_SC/packages.config @@ -28,10 +28,11 @@ + - +