Skip to content

Commit

Permalink
Migrated to framework .NET 4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@dukus
dukus committed Sep 3, 2022
1 parent 993e615 commit 69e7069
Show file tree
Hide file tree
Showing 56 changed files with 369 additions and 499 deletions.
51 changes: 14 additions & 37 deletions CameraControl.Core/CameraControl.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CameraControl.Core</RootNamespace>
<AssemblyName>CameraControl.Core</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -118,36 +118,28 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accord, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.3.8.2-alpha\lib\net46\Accord.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.3.8.2-alpha\lib\net462\Accord.dll</HintPath>
</Reference>
<Reference Include="Accord.Imaging, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Imaging.3.8.2-alpha\lib\net46\Accord.Imaging.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Imaging.3.8.2-alpha\lib\net462\Accord.Imaging.dll</HintPath>
</Reference>
<Reference Include="Accord.MachineLearning, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.MachineLearning.3.8.2-alpha\lib\net46\Accord.MachineLearning.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.MachineLearning.3.8.2-alpha\lib\net462\Accord.MachineLearning.dll</HintPath>
</Reference>
<Reference Include="Accord.Math, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Math.3.8.2-alpha\lib\net46\Accord.Math.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Math.3.8.2-alpha\lib\net462\Accord.Math.dll</HintPath>
</Reference>
<Reference Include="Accord.Math.Core, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Math.3.8.2-alpha\lib\net46\Accord.Math.Core.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Math.3.8.2-alpha\lib\net462\Accord.Math.Core.dll</HintPath>
</Reference>
<Reference Include="Accord.Statistics, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Statistics.3.8.2-alpha\lib\net46\Accord.Statistics.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Statistics.3.8.2-alpha\lib\net462\Accord.Statistics.dll</HintPath>
</Reference>
<Reference Include="Accord.Video, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Video.3.8.2-alpha\lib\net46\Accord.Video.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Video.3.8.2-alpha\lib\net462\Accord.Video.dll</HintPath>
</Reference>
<Reference Include="Accord.Vision, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Vision.3.8.2-alpha\lib\net46\Accord.Vision.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Vision.3.8.2-alpha\lib\net462\Accord.Vision.dll</HintPath>
</Reference>
<Reference Include="AForge.Imaging.Formats">
<HintPath>..\refs\AForge.Imaging.Formats.dll</HintPath>
Expand All @@ -157,34 +149,27 @@
</Reference>
<Reference Include="DotNetZip, Version=1.13.4.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.13.4\lib\net40\DotNetZip.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Eagle, Version=1.0.7213.50727, Culture=neutral, PublicKeyToken=29c6297630be05eb, processorArchitecture=MSIL">
<HintPath>..\packages\Eagle.CLRv4.Core.1.0.7213.50727\lib\net40\Eagle.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Gif.Components">
<HintPath>..\packages\Gif.Components.dll</HintPath>
</Reference>
<Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL">
<HintPath>..\packages\gong-wpf-dragdrop.2.2.0\lib\net46\GongSolutions.WPF.DragDrop.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\gong-wpf-dragdrop.2.2.0\lib\net47\GongSolutions.WPF.DragDrop.dll</HintPath>
</Reference>
<Reference Include="Griffin.Networking, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Griffin.Networking.0.5.7\lib\net40\Griffin.Networking.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Griffin.Networking.Protocol.Http, Version=0.5.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Griffin.Networking.Protocol.Http.0.5.2\lib\net40\Griffin.Networking.Protocol.Http.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Griffin.WebServer, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Griffin.WebServer.0.5.0\lib\net40\Griffin.WebServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ICSharpCode.AvalonEdit, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
<HintPath>..\packages\AvalonEdit.6.0.0\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Interop.PortableDeviceApiLib">
<HintPath>..\refs\Interop.PortableDeviceApiLib.dll</HintPath>
Expand All @@ -198,9 +183,8 @@
<HintPath>..\refs\Interop.WIA.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="log4net">
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Magick.NET-Q8-x86, Version=8.1.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
<HintPath>..\packages\Magick.NET-Q8-x86.8.1.0\lib\net20\Magick.NET-Q8-x86.dll</HintPath>
Expand All @@ -210,26 +194,21 @@
</Reference>
<Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MaterialDesignThemes.MahApps, Version=0.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.MahApps.0.0.11\lib\net45\MaterialDesignThemes.MahApps.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf, Version=2.3.2.1016, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.2.3.2-ci1016\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MeasurementProtocolClient">
<Reference Include="MeasurementProtocolClient, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MeasurementProtocolClient.1.0.0.0\lib\net40\MeasurementProtocolClient.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
Expand All @@ -240,7 +219,6 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
Expand All @@ -251,7 +229,6 @@
<Reference Include="WindowsBase" />
<Reference Include="WriteableBitmapEx.Wpf, Version=1.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WriteableBitmapEx.1.6.3\lib\net40\WriteableBitmapEx.Wpf.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -443,14 +420,14 @@
<Content Include="Classes\PipeServerCommands.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Accord.3.8.2-alpha\build\Accord.targets" Condition="Exists('..\packages\Accord.3.8.2-alpha\build\Accord.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Accord.3.8.2-alpha\build\Accord.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Accord.3.8.2-alpha\build\Accord.targets'))" />
<Error Condition="!Exists('..\packages\Magick.NET-Q8-x86.8.1.0\build\net20\Magick.NET-Q8-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q8-x86.8.1.0\build\net20\Magick.NET-Q8-x86.targets'))" />
</Target>
<Import Project="..\packages\Accord.3.8.2-alpha\build\Accord.targets" Condition="Exists('..\packages\Accord.3.8.2-alpha\build\Accord.targets')" />
<Import Project="..\packages\Magick.NET-Q8-x86.8.1.0\build\net20\Magick.NET-Q8-x86.targets" Condition="Exists('..\packages\Magick.NET-Q8-x86.8.1.0\build\net20\Magick.NET-Q8-x86.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
12 changes: 6 additions & 6 deletions CameraControl.Core/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="GoogleAnalyticsTracker.Core" publicKeyToken="04ab204e84b117c0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
<assemblyIdentity name="GoogleAnalyticsTracker.Core" publicKeyToken="04ab204e84b117c0" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Magick.NET.Core" publicKeyToken="2004825badfa91ec" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
<assemblyIdentity name="Magick.NET.Core" publicKeyToken="2004825badfa91ec" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
54 changes: 27 additions & 27 deletions CameraControl.Core/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Imaging" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Video" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Vision" version="3.8.2-alpha" targetFramework="net46" />
<package id="AvalonEdit" version="6.0.0" targetFramework="net46" />
<package id="DotNetZip" version="1.13.4" targetFramework="net46" />
<package id="Eagle" version="1.0.7213.50727" targetFramework="net46" />
<package id="Eagle.CLRv4" version="1.0.7213.50727" targetFramework="net46" />
<package id="Eagle.CLRv4.Core" version="1.0.7213.50727" targetFramework="net46" />
<package id="gong-wpf-dragdrop" version="2.2.0" targetFramework="net46" />
<package id="Griffin.Networking" version="0.5.7" targetFramework="net46" />
<package id="Griffin.Networking.Protocol.Http" version="0.5.2" targetFramework="net46" />
<package id="Griffin.WebServer" version="0.5.0" targetFramework="net45" />
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Magick.NET.Core" version="8.1.0" targetFramework="net46" />
<package id="Magick.NET-Q8-x86" version="8.1.0" targetFramework="net46" />
<package id="MahApps.Metro" version="1.5.0" targetFramework="net46" />
<package id="MaterialDesignColors" version="1.1.2" targetFramework="net46" />
<package id="MaterialDesignThemes" version="2.3.2-ci1016" targetFramework="net46" />
<package id="MaterialDesignThemes.MahApps" version="0.0.11" targetFramework="net46" />
<package id="MeasurementProtocolClient" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
<package id="sqlite-net" version="1.0.8" targetFramework="net46" />
<package id="WriteableBitmapEx" version="1.6.3" targetFramework="net46" />
<package id="Accord" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Imaging" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Video" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Vision" version="3.8.2-alpha" targetFramework="net48" />
<package id="AvalonEdit" version="6.0.0" targetFramework="net48" />
<package id="DotNetZip" version="1.13.4" targetFramework="net48" />
<package id="Eagle" version="1.0.7213.50727" targetFramework="net48" />
<package id="Eagle.CLRv4" version="1.0.7213.50727" targetFramework="net48" />
<package id="Eagle.CLRv4.Core" version="1.0.7213.50727" targetFramework="net48" />
<package id="gong-wpf-dragdrop" version="2.2.0" targetFramework="net48" />
<package id="Griffin.Networking" version="0.5.7" targetFramework="net48" />
<package id="Griffin.Networking.Protocol.Http" version="0.5.2" targetFramework="net48" />
<package id="Griffin.WebServer" version="0.5.0" targetFramework="net48" />
<package id="log4net" version="2.0.8" targetFramework="net48" />
<package id="Magick.NET.Core" version="8.1.0" targetFramework="net48" />
<package id="Magick.NET-Q8-x86" version="8.1.0" targetFramework="net48" />
<package id="MahApps.Metro" version="1.5.0" targetFramework="net48" />
<package id="MaterialDesignColors" version="1.1.2" targetFramework="net48" />
<package id="MaterialDesignThemes" version="2.3.2-ci1016" targetFramework="net48" />
<package id="MaterialDesignThemes.MahApps" version="0.0.11" targetFramework="net48" />
<package id="MeasurementProtocolClient" version="1.0.0.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
<package id="sqlite-net" version="1.0.8" targetFramework="net48" />
<package id="WriteableBitmapEx" version="1.6.3" targetFramework="net48" />
</packages>
14 changes: 4 additions & 10 deletions CameraControl.Devices/CameraControl.Devices.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CameraControl.Devices</RootNamespace>
<AssemblyName>CameraControl.Devices</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -110,30 +110,25 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accord, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.3.8.2-alpha\lib\net46\Accord.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.3.8.2-alpha\lib\net462\Accord.dll</HintPath>
</Reference>
<Reference Include="Accord.Video, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Video.3.8.2-alpha\lib\net46\Accord.Video.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Video.3.8.2-alpha\lib\net462\Accord.Video.dll</HintPath>
</Reference>
<Reference Include="Accord.Video.DirectShow, Version=3.8.2.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<HintPath>..\packages\Accord.Video.DirectShow.3.8.2-alpha\lib\net46\Accord.Video.DirectShow.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Accord.Video.DirectShow.3.8.2-alpha\lib\net462\Accord.Video.DirectShow.dll</HintPath>
</Reference>
<Reference Include="Interop.WIA">
<HintPath>..\refs\Interop.WIA.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Rssdp.Native, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rssdp.2.0.9\lib\net45\Rssdp.Native.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -148,7 +143,6 @@
<Reference Include="System.Xml" />
<Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 69e7069

Please sign in to comment.