Update to .NET Core, part 2: source code

cureos · Feb 14, 2017 · 14b9199 · 14b9199
1 parent dbb966b
commit 14b9199
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 15 deletions.
diff --git a/EvilDICOM/EvilDICOM/Core/Helpers/Constants.cs b/EvilDICOM/EvilDICOM/Core/Helpers/Constants.cs
@@ -7,7 +7,7 @@ public static class Constants
         public static string EVIL_DICOM_IMP_UID = "1.2.598.0.1.2851334.2.1865.1";
 
         public static string EVIL_DICOM_IMP_VERSION =
-            new AssemblyName(Assembly.GetCallingAssembly().FullName).Version.ToString();
+            new AssemblyName(Assembly.GetEntryAssembly().FullName).Version.ToString();
 
         //APPLICATION CONTEXT
         public static string DEFAULT_APPLICATION_CONTEXT = "1.2.840.10008.3.1.1.1";

diff --git a/EvilDICOM/EvilDICOM/Network/DICOMSCP.cs b/EvilDICOM/EvilDICOM/Network/DICOMSCP.cs
@@ -43,7 +43,11 @@ private void SpinUpAssociation(TcpClient client)
                 Logger.Log(asc.ToString());
                 asc.Listen();
                 Logger.Log("Closing association with {0}.", asc.IpAddress, asc.Port);
+#if NET45
                 client.Close();
+#else
+                client.Dispose();
+#endif
             });
         }
 

diff --git a/EvilDICOM/EvilDICOM/Network/DICOMSCU.cs b/EvilDICOM/EvilDICOM/Network/DICOMSCU.cs
@@ -21,7 +21,7 @@ public DICOMSCU(Entity ae) : base(ae) { }
         public void SendMessage(AbstractDIMSERequest dimse, Entity ae)
         {
             var client = new TcpClient();
-            client.Connect(IPAddress.Parse(ae.IpAddress), ae.Port);
+            client.ConnectAsync(IPAddress.Parse(ae.IpAddress), ae.Port).Wait();
             var assoc = new Association(this, client) { AeTitle = ae.AeTitle };
             PDataMessenger.Send(dimse, assoc);
             assoc.Listen();
@@ -30,7 +30,7 @@ public void SendMessage(AbstractDIMSERequest dimse, Entity ae)
         public IEnumerable<CFindResponse> GetResponse(CFindRequest cFind, Entity ae)
         {
             var client = new TcpClient();
-            client.Connect(IPAddress.Parse(ae.IpAddress), ae.Port);
+            client.ConnectAsync(IPAddress.Parse(ae.IpAddress), ae.Port).Wait();
             var assoc = new Association(this, client) { AeTitle = ae.AeTitle };
             PDataMessenger.Send(cFind, assoc);
             List<CFindResponse> responses = new List<CFindResponse>();
@@ -52,7 +52,7 @@ public IEnumerable<CFindResponse> GetResponse(CFindRequest cFind, Entity ae)
         public IEnumerable<CMoveResponse> GetResponse(CMoveRequest cMove, Entity ae)
         {
             var client = new TcpClient();
-            client.Connect(IPAddress.Parse(ae.IpAddress), ae.Port);
+            client.ConnectAsync(IPAddress.Parse(ae.IpAddress), ae.Port).Wait();
             var assoc = new Association(this, client) { AeTitle = ae.AeTitle };
             PDataMessenger.Send(cMove, assoc);
             List<CMoveResponse> responses = new List<CMoveResponse>();

diff --git a/EvilDICOM/EvilDICOM/Network/DIMSE/IOD/CFindImageIOD.cs b/EvilDICOM/EvilDICOM/Network/DIMSE/IOD/CFindImageIOD.cs
@@ -1,5 +1,4 @@
-using System.Runtime.Serialization;
-using EvilDICOM.Core.Element;
+using EvilDICOM.Core.Element;
 using EvilDICOM.Network.Enums;
 using S = System;
 using DF = EvilDICOM.Core.DICOMForge;

diff --git a/EvilDICOM/EvilDICOM/Network/DIMSE/IOD/CFindSeriesIOD.cs b/EvilDICOM/EvilDICOM/Network/DIMSE/IOD/CFindSeriesIOD.cs
@@ -1,5 +1,4 @@
-using System.Runtime.Serialization;
-using EvilDICOM.Core.Element;
+using EvilDICOM.Core.Element;
 using EvilDICOM.Network.Enums;
 using S = System;
 using DF = EvilDICOM.Core.DICOMForge;

diff --git a/EvilDICOM/EvilDICOM/Network/DIMSE/IOD/CFindStudyIOD.cs b/EvilDICOM/EvilDICOM/Network/DIMSE/IOD/CFindStudyIOD.cs
@@ -1,5 +1,4 @@
-using System.Runtime.Serialization;
-using EvilDICOM.Core.Element;
+using EvilDICOM.Core.Element;
 using EvilDICOM.Network.Enums;
 using S = System;
 using DF = EvilDICOM.Core.DICOMForge;

diff --git a/EvilDICOM/EvilDICOM/Network/Extensions/IIODExtensions.cs b/EvilDICOM/EvilDICOM/Network/Extensions/IIODExtensions.cs
@@ -18,7 +18,7 @@ public static string GetLogString(this IIOD iod)
             sb.AppendLine("-----------------------------------");
             Type t = iod.GetType();
             sb.AppendLine(t.Name);
-            foreach (PropertyInfo pi in t.GetProperties())
+            foreach (PropertyInfo pi in t.GetTypeInfo().GetProperties())
             {
                 string name = pi.Name;
                 if (pi.Name != "Elements" && pi.Name != "LogString")

diff --git a/EvilDICOM/EvilDICOM/Network/Helpers/IpHelper.cs b/EvilDICOM/EvilDICOM/Network/Helpers/IpHelper.cs
@@ -14,7 +14,7 @@ public static string LocalIPAddress()
         {
             IPHostEntry host;
             string localIP = "";
-            host = Dns.GetHostEntry(Dns.GetHostName());
+            host = Dns.GetHostEntryAsync(Dns.GetHostName()).Result;
             foreach (IPAddress ip in host.AddressList)
             {
                 if (ip.AddressFamily == AddressFamily.InterNetwork)

diff --git a/EvilDICOM/EvilDICOM/Network/Interfaces/IMessage.cs b/EvilDICOM/EvilDICOM/Network/Interfaces/IMessage.cs
@@ -5,6 +5,6 @@ namespace EvilDICOM.Network.Interfaces
     public interface IMessage
     {
         MessageType Type { get; }
-        dynamic DynPayload { get; }
+        object DynPayload { get; }
     }
 }
diff --git a/EvilDICOM/EvilDICOM/Network/Messaging/Message.cs b/EvilDICOM/EvilDICOM/Network/Messaging/Message.cs
@@ -8,7 +8,7 @@ public class Message<T> : IMessage
         public T Payload { get; set; }
         public MessageType Type { get; set; }
 
-        public dynamic DynPayload
+        public object DynPayload
         {
             get { return Payload; }
         }

diff --git a/EvilDICOM/EvilDICOM/Network/PDUs/Items/ItemWriter.cs b/EvilDICOM/EvilDICOM/Network/PDUs/Items/ItemWriter.cs
@@ -88,7 +88,7 @@ private static void WritePDVFragmentMessageHeader(DICOMBinaryWriter dw, PDVItemF
             bits.Set(0, frag.IsCommandObject);
             bits.Set(1, frag.IsLastItem);
             var bytes = new byte[1];
-            bits.CopyTo(bytes, 0);
+            ((ICollection)bits).CopyTo(bytes, 0);
             dw.Write(bytes[0]);
         }