cleanup - per review comments

Author: clrudolphi

dotnet/Query/Query/Query.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using Io.Cucumber.Messages.Types;
 using System.Collections.Concurrent;
+using Cucumber.Messages;
 
 namespace Io.Cucumber.Query;
 
@@ -192,8 +193,8 @@ public IList<Attachment> FindAttachmentsBy(TestStepFinished testStepFinished) =>
         var finished = FindTestCaseFinishedBy(testCaseStarted)?.Timestamp;
         if (finished != null)
         {
-            var startTime = started.ToDateTimeOffset();
-            var finishTime = finished.ToDateTimeOffset();
+            var startTime = Converters.ToDateTime(started);
+            var finishTime = Converters.ToDateTime(finished);
             return finishTime - startTime;
         }
         return null;
@@ -210,8 +211,8 @@ public IList<Attachment> FindAttachmentsBy(TestStepFinished testStepFinished) =>
         // Java: if (testRunStarted == null || testRunFinished == null) return Optional.empty();
         if (_testRunStarted == null || _testRunFinished == null)
             return null;
-        var start = _testRunStarted.Timestamp.ToDateTimeOffset();
-        var finish = _testRunFinished.Timestamp.ToDateTimeOffset();
+        var start = Converters.ToDateTime(_testRunStarted.Timestamp);
+        var finish = Converters.ToDateTime(_testRunFinished.Timestamp);
         return finish - start;
     }
 

dotnet/Query/Query/TimestampExtensions.cs

@@ -208,7 +208,7 @@ private static Stream ReadResourceAsStream(string resourceName)
             if (assemblyLocation == null)
                 throw new InvalidOperationException("Assembly location could not be determined.");
 
-            var fullName = Path.Combine(assemblyLocation, "testdata", resourceName);
+            var fullName = Path.Combine(assemblyLocation, "..\\..\\..\\..\\..\\..\\testdata", resourceName);
             if (!File.Exists(fullName))
                 throw new FileNotFoundException($"Resource {fullName} not found.");
             return File.OpenRead(fullName);

dotnet/Query/QueryTest/QueryAcceptanceTest.cs

@@ -28,13 +28,4 @@
     <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="testdata\*.ndjson">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="testdata\*.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>