项目调整

e2f651d3 · wangonghui · ee88f051 · e2f651d3 · e2f651d3 · e2f651d3
Commit e2f651d3 authored Dec 09, 2022 by wangonghui
20 changed files
--- a/VIZ.Framework.Common/VIZ.Framework.Common.csproj
+++ b/VIZ.Framework.Common/VIZ.Framework.Common.csproj
@@ -64,7 +64,7 @@
      <HintPath>..\..\VIZ.TVP\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\..\VIZ.H2V\packages\OpenCvSharp4.4.6.0.20220608\lib\net48\OpenCvSharp.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.4.6.0.20220608\lib\net48\OpenCvSharp.dll</HintPath>
    </Reference>
    <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
      <HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>

--- a/VIZ.Framework.Core/VIZ.Framework.Core.csproj
+++ b/VIZ.Framework.Core/VIZ.Framework.Core.csproj
@@ -54,10 +54,10 @@
    </Reference>
    <Reference Include="Microsoft.VisualBasic" />
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\VIZ.TimeSlice\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="NvAPIWrapper, Version=0.8.1.100, Culture=neutral, PublicKeyToken=310fd07b25df79b3, processorArchitecture=MSIL">
-      <HintPath>..\..\VIZ.H2V\packages\NvAPIWrapper.Net.0.8.1.101\lib\net45\NvAPIWrapper.dll</HintPath>
+      <HintPath>..\packages\NvAPIWrapper.Net.0.8.1.101\lib\net45\NvAPIWrapper.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
@@ -88,7 +88,7 @@
      <HintPath>..\05-Lib\TDx.SpaceMouse.Navigation3D.dll</HintPath>
    </Reference>
    <Reference Include="VizConnectC">
-      <HintPath>..\..\VIZ.TVP.Golf\Lib\VizConnectC.dll</HintPath>
+      <HintPath>..\05-Lib\VizConnectC.dll</HintPath>
    </Reference>
    <Reference Include="WindowsBase" />
  </ItemGroup>

--- a/VIZ.Framework.ImageContrastTool/VIZ.Framework.ImageContrastTool.csproj
+++ b/VIZ.Framework.ImageContrastTool/VIZ.Framework.ImageContrastTool.csproj
@@ -64,6 +64,9 @@
    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
      <HintPath>..\packages\OpenCvSharp4.4.6.0.20220608\lib\net48\OpenCvSharp.dll</HintPath>
    </Reference>

--- a/VIZ.Framework.ImageContrastTool/packages.config
+++ b/VIZ.Framework.ImageContrastTool/packages.config
@@ -3,6 +3,7 @@
  <package id="LiteDB" version="5.0.12" targetFramework="net48" />
  <package id="log4net" version="2.0.14" targetFramework="net48" />
  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
  <package id="OpenCvSharp4" version="4.6.0.20220608" targetFramework="net48" />
  <package id="OpenCvSharp4.WpfExtensions" version="4.6.0.20220608" targetFramework="net48" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />

--- a/VIZ.Framework.MacTool/VIZ.Framework.MacTool.csproj
+++ b/VIZ.Framework.MacTool/VIZ.Framework.MacTool.csproj
@@ -55,8 +55,16 @@
    <Prefer32Bit>true</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
    <Reference Include="System.Xml" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System.Core" />
@@ -106,6 +114,7 @@
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
+    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>

--- a/VIZ.Framework.MacTool/packages.config
+++ b/VIZ.Framework.MacTool/packages.config
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+</packages>
\ No newline at end of file
--- a/VIZ.Framework.Plugin/VIZ.Framework.Plugin.csproj
+++ b/VIZ.Framework.Plugin/VIZ.Framework.Plugin.csproj
@@ -35,6 +35,9 @@
    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\VIZ.TVP\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />

--- a/VIZ.Framework.Plugin/packages.config
+++ b/VIZ.Framework.Plugin/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
--- a/VIZ.Framework.TVP.Golf/VIZ.Framework.TVP.Golf.csproj
+++ b/VIZ.Framework.TVP.Golf/VIZ.Framework.TVP.Golf.csproj
@@ -53,6 +53,9 @@
    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />

--- a/VIZ.Framework.TVP.Golf/packages.config
+++ b/VIZ.Framework.TVP.Golf/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
--- a/VIZ.Framework.TVP/VIZ.Framework.TVP.csproj
+++ b/VIZ.Framework.TVP/VIZ.Framework.TVP.csproj
@@ -35,6 +35,9 @@
    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />

--- a/VIZ.Framework.TVP/packages.config
+++ b/VIZ.Framework.TVP/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
--- a/VIZ.Framework.TimeSliceTool/VIZ.Framework.TimeSliceTool.csproj
+++ b/VIZ.Framework.TimeSliceTool/VIZ.Framework.TimeSliceTool.csproj
@@ -58,6 +58,9 @@
    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />

--- a/VIZ.Framework.TimeSliceTool/packages.config
+++ b/VIZ.Framework.TimeSliceTool/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
--- a/VIZ.Framework.UDPTestTool/VIZ.Framework.UDPTestTool.csproj
+++ b/VIZ.Framework.UDPTestTool/VIZ.Framework.UDPTestTool.csproj
@@ -64,6 +64,9 @@
    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
      <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
    </Reference>

--- a/VIZ.Framework.UDPTestTool/packages.config
+++ b/VIZ.Framework.UDPTestTool/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
  <package id="NPOI" version="2.5.6" targetFramework="net48" />
  <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net48" />
  <package id="SharpZipLib" version="1.3.3" targetFramework="net48" />

--- a/VIZ.Framework.UnitTest/VIZ.Framework.UnitTest.csproj
+++ b/VIZ.Framework.UnitTest/VIZ.Framework.UnitTest.csproj
@@ -57,6 +57,9 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
    </Reference>
@@ -67,7 +70,9 @@
      <HintPath>..\..\VIZ.H2V\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="GPIOTest.cs" />

--- a/VIZ.Framework.UnitTest/packages.config
+++ b/VIZ.Framework.UnitTest/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
  <package id="MSTest.TestAdapter" version="2.2.7" targetFramework="net48" />
  <package id="MSTest.TestFramework" version="2.2.7" targetFramework="net48" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />

--- a/VIZ.Framework.WpfTest/VIZ.Framework.WpfTest.csproj
+++ b/VIZ.Framework.WpfTest/VIZ.Framework.WpfTest.csproj
@@ -55,6 +55,12 @@
    <Prefer32Bit>true</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
    <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
      <HintPath>..\..\VIZ.H2V\packages\OpenCvSharp4.4.6.0.20220608\lib\net48\OpenCvSharp.dll</HintPath>
    </Reference>
@@ -65,6 +71,7 @@
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\VIZ.H2V\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
    </Reference>
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\VIZ.H2V\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>

--- a/VIZ.Framework.WpfTest/packages.config
+++ b/VIZ.Framework.WpfTest/packages.config
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
  <package id="OpenCvSharp4" version="4.6.0.20220608" targetFramework="net48" />
  <package id="SharpDX" version="4.2.0" targetFramework="net48" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />