Big Change - Moved DSC Core to using the DSC Library.

Updated build rules
crcrewso · Jun 13, 2024 · 5fecf51 · 5fecf51
1 parent 8a7a66e
commit 5fecf51
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 1,080 deletions.
diff --git a/DicomStrictCompare/DSCcore/Controller/DscDataHandler.cs b/DicomStrictCompare/DSCcore/Controller/DscDataHandler.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.ComponentModel;
-using DCSCore.Model;
+using DSClibrary;
 
 namespace DCSCore
 {

diff --git a/DicomStrictCompare/DSCcore/Controller/MatchedDosePair.cs b/DicomStrictCompare/DSCcore/Controller/MatchedDosePair.cs
@@ -3,8 +3,8 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using DCSCore.Model;
 using EvilDICOM.RT;
+using DSClibrary;
 
 namespace DCSCore
 {

diff --git a/DicomStrictCompare/DSCcore/Controller/settings.cs b/DicomStrictCompare/DSCcore/Controller/settings.cs
@@ -6,14 +6,15 @@
 using System.Configuration;
 using System.Collections.Specialized;
 using System.Runtime.CompilerServices;
+using DSClibrary;
 
 namespace DCSCore.Controller
 {
     /// <summary>
     /// Consolidated settings collection to undo feature creep spaghettification.  
     /// </summary>
     public class Settings(
-        Model.Dta[] dtas
+        DSClibrary.Dta[] dtas
             , bool runDoseComparisons
             , bool runPDDComparisons
             , bool runProfileComparisons
@@ -26,7 +27,7 @@ Model.Dta[] dtas
         /// </summary>
 
 
-        public Model.Dta[] Dtas { get; } = dtas;
+        public Dta[] Dtas { get; } = dtas;
         public bool RunDoseComparisons { get; } = runDoseComparisons;
         public bool RunPDDComparisons { get; } = runPDDComparisons;
         public bool RunProfileComparisons { get; } = runProfileComparisons;

diff --git a/DicomStrictCompare/DSCcore/DSCcore.csproj b/DicomStrictCompare/DSCcore/DSCcore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Platforms>x64</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -13,26 +13,24 @@
     <AnalysisLevel>latest</AnalysisLevel>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Nullable>warnings</Nullable>
-    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DocumentationFile>
     </DocumentationFile>
     <Optimize>false</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="docfx.console" Version="2.58.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="EvilDICOM" Version="2.0.6.5" />
     <PackageReference Include="EvilDICOM.CV" Version="0.0.3" />
-    <PackageReference Include="MathNet.Numerics" Version="4.15.0" />
     <PackageReference Include="Microcharts" Version="0.9.5.9" />
     <PackageReference Include="Microcharts.Forms" Version="0.9.5.9" />
     <PackageReference Include="ScottPlot" Version="4.1.27" />
     <PackageReference Include="ScottPlot.WinForms" Version="4.1.27" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DSClibrary\DSClibrary.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

diff --git a/DicomStrictCompare/DSCcore/File Handling/SaveFile.cs b/DicomStrictCompare/DSCcore/File Handling/SaveFile.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using EvilDICOM.RT;
+using DSClibrary;
 
 namespace DCSCore
 {

diff --git a/DicomStrictCompare/DSCcore/Model/DoseMatrixOptimal.cs b/DicomStrictCompare/DSCcore/Model/DoseMatrixOptimal.cs
diff --git a/DicomStrictCompare/DSCcore/Model/Mathematics.cs b/DicomStrictCompare/DSCcore/Model/Mathematics.cs