From d250651c28411a2aea966e93ceeeb4414599e722 Mon Sep 17 00:00:00 2001
From: Mike Phares <mike.phares@infineon.com>
Date: Mon, 6 Feb 2023 07:43:49 -0700
Subject: [PATCH] PackageReference arrangement

---
 Adaptation/EC.Tests.csproj | 42 +++++++++++++++++---------------------
 EC.csproj                  |  3 ++-
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/Adaptation/EC.Tests.csproj b/Adaptation/EC.Tests.csproj
index 13ecff4..3d9f78b 100644
--- a/Adaptation/EC.Tests.csproj
+++ b/Adaptation/EC.Tests.csproj
@@ -10,7 +10,7 @@
         <IsPackable>false</IsPackable>
         <LangVersion>10.0</LangVersion>
         <Nullable>disable</Nullable>
-        <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
     <PropertyGroup>
@@ -33,6 +33,16 @@
         <DefineConstants>Linux</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="3.2.0" />
+        <PackageReference Include="FFMpegCore" Version="5.0.0" />
+        <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Media" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Text" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.Util" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.OpenJDK.XML.API" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="IKVM.Runtime" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="Instances" Version="3.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
         <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
@@ -45,43 +55,29 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
         <PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    </ItemGroup>
-    <ItemGroup>
+        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+        <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="RoboSharp" Version="1.2.8" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
         <PackageReference Include="System.Data.OleDb" Version="7.0.0" />
         <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
         <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
         <PackageReference Include="System.Text.Json" Version="7.0.1" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.2.0" />
-        <PackageReference Include="FFMpegCore" Version="4.8.0" />
-        <PackageReference Include="Instances" Version="2.0.0" />
-        <PackageReference Include="RoboSharp" Version="1.2.8" />
         <PackageReference Include="Tesseract" Version="5.2.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
+        <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="External.Common.Logging.Core" Version="3.3.1"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="External.Common.Logging" Version="3.3.1"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="External.log4net" Version="2.0.8"><NoWarn>NU1701</NoWarn></PackageReference>
     </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Media" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Text" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.Util" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.OpenJDK.XML.API" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="IKVM.Runtime" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
-    </ItemGroup>
     <ItemGroup>
         <None Include="appsettings.json">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/EC.csproj b/EC.csproj
index e0eccaf..ca33220 100644
--- a/EC.csproj
+++ b/EC.csproj
@@ -11,7 +11,8 @@
     <RootNamespace>EC</RootNamespace>
     <AssemblyName>EC</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
+    <RuntimeIdentifier Condition="'$(Configuration)' == 'Debug'">win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(Configuration)' == 'Release'">win</RuntimeIdentifier>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup>