diff --git a/.gitignore b/.gitignore index ecee024..8739f07 100644 --- a/.gitignore +++ b/.gitignore @@ -1081,3 +1081,7 @@ packages/WebGrease.1.5.2/tools/uninstall.ps1 packages/WebGrease.1.5.2/tools/WG.exe Common/obj/Debug/Common.csproj.AssemblyReference.cache JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user +JMEAgentSystem/Web.config +JMEAgentSystem/bin/API.dll.config +API/bin/Debug/API.dll.config +API/app.config diff --git a/API/API.csproj b/API/API.csproj index ee14b40..98056c0 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -12,7 +12,7 @@ v4.6.1 512 true - + true full @@ -56,5 +56,8 @@ Common + + + \ No newline at end of file diff --git a/Common/Common.csproj b/Common/Common.csproj index 3a7408b..53df256 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -73,6 +73,7 @@ + diff --git a/JMEAgentSystem/JMEAgentSystem.csproj b/JMEAgentSystem/JMEAgentSystem.csproj index a228456..184e4eb 100644 --- a/JMEAgentSystem/JMEAgentSystem.csproj +++ b/JMEAgentSystem/JMEAgentSystem.csproj @@ -47,6 +47,9 @@ ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll + + ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + ..\packages\Autofac.4.9.4\lib\net45\Autofac.dll @@ -88,6 +91,9 @@ ..\packages\Microsoft.Owin.Security.Twitter.3.0.1\lib\net45\Microsoft.Owin.Security.Twitter.dll + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll @@ -102,6 +108,9 @@ ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + @@ -113,10 +122,6 @@ - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - ..\packages\AspNet.ScriptManager.bootstrap.3.3.7\lib\net45\AspNet.ScriptManager.bootstrap.dll @@ -129,13 +134,6 @@ ..\packages\Microsoft.AspNet.ScriptManager.WebForms.5.0.0\lib\net45\Microsoft.ScriptManager.WebForms.dll - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - True - ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - True ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll @@ -144,8 +142,7 @@ ..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll - False - ..\packages\WebGrease.1.5.1\lib\WebGrease.dll + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -749,7 +746,7 @@ - {E5471373-6DAB-4038-9F1F-EA9B03BB3B12} + {e5471373-6dab-4038-9f1f-ea9b03bb3b12} API diff --git a/JMEAgentSystem/JMEAgentSystem.csproj.user b/JMEAgentSystem/JMEAgentSystem.csproj.user index df4cfd5..6f1681f 100644 --- a/JMEAgentSystem/JMEAgentSystem.csproj.user +++ b/JMEAgentSystem/JMEAgentSystem.csproj.user @@ -9,8 +9,8 @@ Debug|Any CPU - ProjectFiles - FolderProfile + ShowAllFiles + D:\Office\SourceCodes\git-repo\JME\12. Agent_Login\JMEAgentSystem\Properties\PublishProfiles\FolderProfile.pubxml diff --git a/JMEAgentSystem/Web.config b/JMEAgentSystem/Web.config deleted file mode 100644 index ba86c4f..0000000 --- a/JMEAgentSystem/Web.config +++ /dev/null @@ -1,158 +0,0 @@ - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JMEAgentSystem/packages.config b/JMEAgentSystem/packages.config index dfd9694..0b1b6d7 100644 --- a/JMEAgentSystem/packages.config +++ b/JMEAgentSystem/packages.config @@ -21,9 +21,9 @@ - - - + + + diff --git a/Repository/Repository.csproj b/Repository/Repository.csproj index f9bea72..8a02a52 100644 --- a/Repository/Repository.csproj +++ b/Repository/Repository.csproj @@ -80,6 +80,7 @@ +