diff --git a/RawTools/App.config b/RawTools/App.config index 8d69da2..977d8ce 100644 --- a/RawTools/App.config +++ b/RawTools/App.config @@ -15,6 +15,18 @@ + + + + + + + + + + + + diff --git a/RawTools/RawTools.csproj b/RawTools/RawTools.csproj index c896bd2..1860ac3 100644 --- a/RawTools/RawTools.csproj +++ b/RawTools/RawTools.csproj @@ -89,28 +89,31 @@ ..\..\..\softwareRepository\CLParser\CLParserForNetFramework\CLParserForNetFramework\bin\Release\CLParserForNetFramework.dll + + ..\packages\OxyPlot.Core.2.0.0\lib\net45\OxyPlot.dll + + + ..\packages\OxyPlot.WindowsForms.2.0.0\lib\net45\OxyPlot.WindowsForms.dll + - ..\packages\Serilog.2.7.1\lib\net46\Serilog.dll + ..\packages\Serilog.2.10.0\lib\net46\Serilog.dll - ..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll + ..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll - - ..\packages\System.IO.FileSystem.AccessControl.4.5.0\lib\net461\System.IO.FileSystem.AccessControl.dll - True + + ..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll - - ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll - True + + ..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll - - ..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll - True + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll diff --git a/RawTools/packages.config b/RawTools/packages.config index b8a5c22..2d395c2 100644 --- a/RawTools/packages.config +++ b/RawTools/packages.config @@ -2,11 +2,13 @@ - - - - - + + + + + + + diff --git a/RawToolsGUI/App.config b/RawToolsGUI/App.config index 654af87..32214ad 100644 --- a/RawToolsGUI/App.config +++ b/RawToolsGUI/App.config @@ -13,6 +13,18 @@ + + + + + + + + + + + + diff --git a/RawToolsGUI/RawToolsGUI.csproj b/RawToolsGUI/RawToolsGUI.csproj index 8fdc9f9..bf19d49 100644 --- a/RawToolsGUI/RawToolsGUI.csproj +++ b/RawToolsGUI/RawToolsGUI.csproj @@ -34,21 +34,34 @@ + + ..\packages\OpenMcdf.2.2.1.9\lib\net40\OpenMcdf.dll + + + ..\packages\OpenMcdf.Extensions.2.2.1.4\lib\net40\OpenMcdf.Extensions.dll + + + ..\packages\OxyPlot.Core.2.0.0\lib\net45\OxyPlot.dll + + + ..\packages\OxyPlot.WindowsForms.2.0.0\lib\net45\OxyPlot.WindowsForms.dll + + + False + ..\RawTools\bin\x64\Release\RawTools.exe + - - ..\packages\System.IO.FileSystem.AccessControl.4.5.0\lib\net461\System.IO.FileSystem.AccessControl.dll - True + + ..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll - - ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll - True + + ..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll - - ..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll - True + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -133,12 +146,6 @@ - - - {a9bf3db6-a6e6-4324-aa7a-625639c17e64} - RawTools - - \ No newline at end of file diff --git a/RawToolsGUI/packages.config b/RawToolsGUI/packages.config index e51d8b4..2053991 100644 --- a/RawToolsGUI/packages.config +++ b/RawToolsGUI/packages.config @@ -1,11 +1,15 @@  - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/RawToolsViz/RawToolsViz.csproj b/RawToolsViz/RawToolsViz.csproj index 5f351fd..1154760 100644 --- a/RawToolsViz/RawToolsViz.csproj +++ b/RawToolsViz/RawToolsViz.csproj @@ -36,6 +36,12 @@ ..\..\..\softwareRepository\CheckBoxComboBox\CheckBoxComboBox\bin\Debug\CheckBoxComboBox.dll + + ..\packages\OpenMcdf.2.2.1.9\lib\net40\OpenMcdf.dll + + + ..\packages\OpenMcdf.Extensions.2.2.1.4\lib\net40\OpenMcdf.Extensions.dll + ..\packages\OxyPlot.Core.2.0.0\lib\net45\OxyPlot.dll diff --git a/RawToolsViz/packages.config b/RawToolsViz/packages.config index 83e45ab..c8a467d 100644 --- a/RawToolsViz/packages.config +++ b/RawToolsViz/packages.config @@ -1,5 +1,7 @@  + +