修改为dll引用

IntegrationControlSystem/ColorPicker/ColorPicker.csproj

@@ -31,7 +31,6 @@ Originally developed for PixiEditor: https://github.com/PixiEditor/PixiEditor.</
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
-        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
         <Resource Include="Images\CircularHueGradient.png" />
     </ItemGroup>
 
@@ -45,4 +44,11 @@ Originally developed for PixiEditor: https://github.com/PixiEditor/PixiEditor.</
     </ItemGroup>
 
 
+    <ItemGroup>
+      <Reference Include="Microsoft.Xaml.Behaviors">
+        <HintPath>..\Import\Microsoft.Xaml.Behaviors.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
+
 </Project>

IntegrationControlSystem/OxyPlot/OxyPlot.SkiaSharp.Wpf/OxyPlot.SkiaSharp.Wpf.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <Description>OxyPlot is a plotting library for .NET. This package targets WPF applications and uses the SkiaSharp renderer.</Description>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -11,7 +11,6 @@
     <AssemblyOriginatorKeyFile>OxyPlot.SkiaSharp.Wpf.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.6" />
     <None Include="OxyPlot.SkiaSharp.Wpf.snk" />
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
   </ItemGroup>
@@ -20,4 +19,12 @@
     <ProjectReference Include="..\OxyPlot.Wpf.Shared\OxyPlot.Wpf.Shared.csproj" />
     <ProjectReference Include="..\OxyPlot\OxyPlot.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="SkiaSharp">
+      <HintPath>..\..\..\..\..\..\IntegrationControlSystem\IntegrationControlSystem\Lib\SkiaSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="SkiaSharp.Views.Desktop.Common">
+      <HintPath>..\..\Import\SkiaSharp.Views.Desktop.Common.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>

IntegrationControlSystem/OxyPlot/OxyPlot.SkiaSharp/OxyPlot.SkiaSharp.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <LangVersion>8</LangVersion>
     <Copyright>Copyright (c) 2020 OxyPlot contributors</Copyright>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <Authors>OxyPlot contributors</Authors>
     <Description>OxyPlot is a plotting library for .NET. This package provides rendering based on SkiaSharp.</Description>
     <PackageTags>plotting plot charting chart skiasharp skia pdf</PackageTags>
@@ -11,14 +11,21 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>OxyPlot.SkiaSharp.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="OxyPlot.SkiaSharp.snk" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OxyPlot\OxyPlot.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HarfBuzzSharp">
+      <HintPath>..\..\Import\HarfBuzzSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="SkiaSharp">
+      <HintPath>..\..\Import\SkiaSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="SkiaSharp.HarfBuzz">
+      <HintPath>..\..\Import\SkiaSharp.HarfBuzz.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>

IntegrationControlSystem/OxyPlot/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <LangVersion>8</LangVersion>
     <Description>OxyPlot is a plotting library for .NET. This package is the base for WPF PlotView implementations.</Description>

IntegrationControlSystem/OxyPlot/OxyPlot/OxyPlot.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <PackageId>OxyPlot.Core</PackageId>
         <Description>OxyPlot is a plotting library for .NET. This is the core library including the foundation classes and plot model. To display the plots, you also need to add a platform-specific OxyPlot package that contains a PlotView component.</Description>
         <PackageTags>plotting plot charting chart</PackageTags>

IntegrationControlSystem/S7.Net/S7.Net.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>net5.0;</TargetFrameworks>
 
     <PackageId>S7netplus</PackageId>
     <Title>S7.Net Plus</Title>
@@ -19,9 +19,5 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-  </ItemGroup>
 
 </Project>

IntegrationControlSystem/WpfApp1/Convert/SecondToTimeConverter.cs

@@ -1,5 +1,4 @@
-using Amazon.Runtime.Internal.Util;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;

IntegrationControlSystem/WpfApp1/ViewModel/DevicePlan/DeviceEndItemViewModel.cs

@@ -1,5 +1,4 @@
-using DnsClient.Protocol;
-using OxyPlot;
+using OxyPlot;
 using System;
 using System.Diagnostics;
 using System.Threading;

IntegrationControlSystem/WpfApp1/ViewModel/DevicePlan/PlanLineViewModel.cs

@@ -1,5 +1,4 @@
-using Amazon.Runtime.Internal.Util;
-using OxyPlot;
+using OxyPlot;
 using OxyPlot.Axes;
 using System;
 using System.Collections.Generic;

IntegrationControlSystem/WpfApp1/WpfApp1.csproj

@@ -67,12 +67,6 @@
     <Compile Include="View\Device\ShakerControlView.xaml.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="Quartz" Version="3.8.1" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AppResource\AppResource.csproj" />
     <ProjectReference Include="..\ColorPicker\ColorPicker.csproj" />
@@ -196,6 +190,33 @@
     <Folder Include="View\Device\ControlView\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="DnsClient">
+      <HintPath>..\Import\DnsClient.dll</HintPath>
+    </Reference>
+    <Reference Include="HarfBuzzSharp">
+      <HintPath>..\Import\HarfBuzzSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Bson">
+      <HintPath>..\Import\MongoDB.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver">
+      <HintPath>..\Import\MongoDB.Driver.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver.Core">
+      <HintPath>..\Import\MongoDB.Driver.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Libmongocrypt">
+      <HintPath>..\Import\MongoDB.Libmongocrypt.dll</HintPath>
+    </Reference>
+    <Reference Include="Quartz">
+      <HintPath>..\Import\Quartz.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpCompress">
+      <HintPath>..\Import\SharpCompress.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="View\OperationCondition\InternalHeatSourceOperationConditionView.xaml.cs">
       <SubType>Code</SubType>
@@ -232,4 +253,46 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="libHarfBuzzSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="libSkiaSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\linux\native\libmongocrypt.so">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\osx\native\libHarfBuzzSharp.dylib">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\osx\native\libmongocrypt.dylib">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\osx\native\libSkiaSharp.dylib">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win-arm64\native\libHarfBuzzSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win-arm64\native\libSkiaSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win-x64\native\libHarfBuzzSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win-x64\native\libSkiaSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win-x86\native\libHarfBuzzSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win-x86\native\libSkiaSharp.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="runtimes\win\native\mongocrypt.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>