Merge branch 'master' of http://175.27.215.92:3000/wangsr/DalianML-SCADA

HighWayIot.Common/HighWayIot.Common.csproj

@@ -32,9 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <PackageReference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Version>13.0.3</Version>
-    </Reference>
+    </PackageReference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -58,8 +58,6 @@
       <Name>HighWayIot.Log4net</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup />
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

HighWayIot.Common/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-</packages>

HighWayIot.Rfid/HighWayIot.Rfid.csproj

@@ -63,7 +63,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="TouchSocket" Version="3.0.6" />
+    <PackageReference Include="TouchSocket">
+      <Version>3.0.6</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Impl\" />