Merge pull request #75 from gqy117/CSharp6

C sharp6
gqy117 · May 13, 2016 · 495fdac · 495fdac
2 parents cd86a91 + 8f849cb
commit 495fdac
Show file tree

Hide file tree

Showing 134 changed files with 915 additions and 1,369 deletions.
diff --git a/WebSite/DataAccess/Properties/AssemblyInfo.cs b/WebSite/DataAccess/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/WebSite/DependencyInjection/DependencyInjection/AutoMapper/LogOnModelProfile.cs b/WebSite/DependencyInjection/DependencyInjection/AutoMapper/LogOnModelProfile.cs
@@ -1,10 +1,5 @@
 namespace DependencyInjection
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
     using AutoMapper;
     using WebToolRepository;
     using WebToolService;

diff --git a/WebSite/DependencyInjection/DependencyInjection/AutoMapper/UserProfile.cs b/WebSite/DependencyInjection/DependencyInjection/AutoMapper/UserProfile.cs
@@ -1,10 +1,5 @@
 namespace DependencyInjection
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
     using AutoMapper;
     using WebToolRepository;
     using WebToolService;

diff --git a/WebSite/DependencyInjection/DependencyInjection/AutoMapper/WOLProfile.cs b/WebSite/DependencyInjection/DependencyInjection/AutoMapper/WOLProfile.cs
@@ -1,10 +1,5 @@
 namespace DependencyInjection
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
     using AutoMapper;
     using WebToolRepository;
     using WebToolService;

diff --git a/WebSite/DependencyInjection/DependencyInjection/AutoMapper/WolModelProfile.cs b/WebSite/DependencyInjection/DependencyInjection/AutoMapper/WolModelProfile.cs
@@ -1,10 +1,5 @@
 namespace DependencyInjection
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
     using AutoMapper;
     using WebToolRepository;
     using WebToolService;

diff --git a/WebSite/DependencyInjection/DependencyInjection/BootStrap.cs b/WebSite/DependencyInjection/DependencyInjection/BootStrap.cs
@@ -1,25 +1,14 @@
 namespace WebTool
 {
     using System;
-    using System;
-    using System.Collections.Generic;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Linq;
     using System.Reflection;
-    using System.Web;
-    using System.Web;
-    using System.Web.Compilation;
     using System.Web.Mvc;
     using AutoMapper;
-    using DependencyInjection;
-    using Microsoft.Practices.ObjectBuilder2;
     using Microsoft.Practices.Unity;
     using Microsoft.Practices.Unity.Configuration;
     using Microsoft.Practices.Unity.Mvc;
-    using Microsoft.SqlServer.Server;
-    using WebToolRepository;
-    using WebToolService;
 
     public class BootStrap
     {

diff --git a/WebSite/DependencyInjection/DependencyInjection/DependencyInjection.csproj b/WebSite/DependencyInjection/DependencyInjection/DependencyInjection.csproj
@@ -65,28 +65,28 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -136,5 +136,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
-
+</Project>
diff --git a/WebSite/DependencyInjection/DependencyInjection/Properties/AssemblyInfo.cs b/WebSite/DependencyInjection/DependencyInjection/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/WebSite/DependencyInjection/DependencyInjection/app.config b/WebSite/DependencyInjection/DependencyInjection/app.config
@@ -4,7 +4,19 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/WebSite/DependencyInjection/DependencyInjection/packages.config b/WebSite/DependencyInjection/DependencyInjection/packages.config
@@ -2,9 +2,9 @@
 <packages>
   <package id="AutoMapper" version="4.2.0" targetFramework="net45" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="StyleCop.MSBuild" version="4.7.53.0" targetFramework="net45" developmentDependency="true" />
   <package id="Unity" version="4.0.1" targetFramework="net45" />

diff --git a/WebSite/Service/WebToolService/Attribute/RequiredExt.cs b/WebSite/Service/WebToolService/Attribute/RequiredExt.cs
@@ -1,9 +1,6 @@
 namespace WebToolService
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
     public class RequiredExtAttribute : System.ComponentModel.DataAnnotations.RequiredAttribute

diff --git a/WebSite/Service/WebToolService/Base/ServiceBase.cs b/WebSite/Service/WebToolService/Base/ServiceBase.cs
@@ -1,19 +1,11 @@
 namespace WebToolService
 {
-    using System;
     using System.Collections.Generic;
-    using System.ComponentModel;
     using System.ComponentModel.DataAnnotations;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.Remoting.Contexts;
-    using System.Text;
     using AutoMapper;
     using Microsoft.Practices.Unity;
     using Utilities;
     using WebToolRepository;
-    using WebToolService;
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable", Justification = "Justification")]
     public abstract class ServiceBase

diff --git a/WebSite/Service/WebToolService/Interface/ITotalRecords.cs b/WebSite/Service/WebToolService/Interface/ITotalRecords.cs
@@ -1,10 +1,5 @@
 namespace WebToolService
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
     public interface ITotalRecords
     {
         int TotalRecords { get; set; }

diff --git a/WebSite/Service/WebToolService/Interface/ListWrapper.cs b/WebSite/Service/WebToolService/Interface/ListWrapper.cs
@@ -1,11 +1,6 @@
 namespace WebToolService
 {
-    using System;
-    using System.Collections;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
 
     public class ListWrapper<T> : ITotalRecords
     {

diff --git a/WebSite/Service/WebToolService/Models/Account/LogonBaseModel.cs b/WebSite/Service/WebToolService/Models/Account/LogonBaseModel.cs
@@ -1,9 +1,6 @@
 namespace WebToolService
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     [Serializable]
     public class LogOnBaseModel

diff --git a/WebSite/Service/WebToolService/Models/Account/LogonModel.cs b/WebSite/Service/WebToolService/Models/Account/LogonModel.cs
@@ -1,10 +1,7 @@
 namespace WebToolService
 {
     using System;
-    using System.Collections.Generic;
     using System.ComponentModel.DataAnnotations;
-    using System.Linq;
-    using System.Text;
     using WebToolCulture.Resource;
 
     [Serializable]

diff --git a/WebSite/Service/WebToolService/Models/Account/RegisterModel.cs b/WebSite/Service/WebToolService/Models/Account/RegisterModel.cs
@@ -1,10 +1,6 @@
 namespace WebToolService
 {
-    using System;
-    using System.Collections.Generic;
     using System.ComponentModel.DataAnnotations;
-    using System.Linq;
-    using System.Text;
     using WebToolCulture.Resource;
 
     public class RegisterModel : LogOnModel

diff --git a/WebSite/Service/WebToolService/Models/Account/UserModel.cs b/WebSite/Service/WebToolService/Models/Account/UserModel.cs
@@ -1,9 +1,6 @@
 namespace WebToolService
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     [Serializable]
     public class UserModel : LogOnModel

diff --git a/WebSite/Service/WebToolService/Models/Home/LanguageModel.cs b/WebSite/Service/WebToolService/Models/Home/LanguageModel.cs
@@ -1,9 +1,6 @@
 namespace WebToolService
 {
-    using System;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     using WebToolCulture;
 
     public class LanguageModel

diff --git a/WebSite/Service/WebToolService/Models/JQueryTable.cs b/WebSite/Service/WebToolService/Models/JQueryTable.cs
@@ -1,11 +1,8 @@
 namespace WebToolService
 {
-    using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
-    using System.Linq;
-    using System.Text;
 
     /// <summary>
     /// Represents the direction of sorting for a column.
@@ -20,12 +17,6 @@ public enum SortingDirection
 
     public class JQueryTable
     {
-        public JQueryTable()
-        {
-            this.iDisplayStart = 0;
-            this.iDisplayLength = 10;
-        }
-
         /// <summary>
         /// Gets or sets if the Global search is regex or not.
         /// </summary>
@@ -54,12 +45,12 @@ public JQueryTable()
         /// <summary>
         /// Gets or sets the number of records to display.
         /// </summary>
-        public int iDisplayLength { get; set; }
+        public int iDisplayLength { get; set; } = 10;
 
         /// <summary>
         /// Gets or sets the display start point.
         /// </summary>
-        public int iDisplayStart { get; set; }
+        public int iDisplayStart { get; set; } = 0;
 
         /// <summary>
         /// Gets or sets column being sorted on (you will need to decode this number for your database).

diff --git a/WebSite/Service/WebToolService/Models/SortedColumn.cs b/WebSite/Service/WebToolService/Models/SortedColumn.cs
@@ -1,10 +1,5 @@
 namespace WebToolService
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-
     /// <summary>
     /// Represents a sorted column from DataTables.
     /// </summary>

diff --git a/WebSite/Service/WebToolService/Models/WOLModel.cs b/WebSite/Service/WebToolService/Models/WOLModel.cs
@@ -1,38 +1,25 @@
 namespace WebToolService
 {
-    using System;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Web;
     using Utilities;
 
     public class WolModel : ITotalRecords
     {
-        public WolModel()
-        {
-            this.CmdHelper = new CmdHelper();
-            this.FileName = string.Empty;
-            this.Port = 9;
-            this.HostName = string.Empty;
-            this.SubnetMask = "255.255.255.255";
-            this.MacAddress = string.Empty;
-        }
-
         public string Arguments { get; set; }
 
-        public ICmdHelper CmdHelper { get; set; }
+        public ICmdHelper CmdHelper { get; set; } = new CmdHelper();
 
-        public string FileName { get; set; }
+        public string FileName { get; set; } = string.Empty;
 
-        public string HostName { get; set; }
+        public string HostName { get; set; } = string.Empty;
 
-        public string MacAddress { get; set; }
+        public string MacAddress { get; set; } = string.Empty;
 
-        public int Port { get; set; }
+        public int Port { get; set; } = 9;
 
         public string Protocol { get; set; }
 
-        public string SubnetMask { get; set; }
+        public string SubnetMask { get; set; } = "255.255.255.255";
 
         public int TotalRecords { get; set; }
 
@@ -46,10 +33,10 @@ public void PrepareArgument()
         {
             List<string> argumentList = new List<string>();
 
-            argumentList.Add(string.Format("\"{0}\"", this.MacAddress));
-            argumentList.Add(string.Format("\"{0}\"", this.HostName));
-            argumentList.Add(string.Format("\"{0}\"", this.SubnetMask));
-            argumentList.Add(string.Format("\"{0}\"", this.Port));
+            argumentList.Add($"\"{MacAddress}\"");
+            argumentList.Add($"\"{HostName}\"");
+            argumentList.Add($"\"{SubnetMask}\"");
+            argumentList.Add($"\"{Port}\"");
 
             this.Arguments = string.Join(" ", argumentList.ToArray());
         }

diff --git a/WebSite/Service/WebToolService/Properties/AssemblyInfo.cs b/WebSite/Service/WebToolService/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following