Update TFM to netstandard2.0, update dependencies

datalust · Aug 28, 2023 · ce6989a · ce6989a
1 parent 446813e
commit ce6989a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 30 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,10 +1,9 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2017
+image: Visual Studio 2022
 configuration: Release
-install:
 build_script:
-- ps: ./Build.ps1
+- pwsh: ./Build.ps1
 test: off
 artifacts:
 - path: artifacts/Seq.Apps.*.nupkg
@@ -20,4 +19,4 @@ deploy:
   artifact: /Seq.Api.*\.nupkg/
   tag: v$(appveyor_build_version)
   on:
-    branch: master
+    branch: main
diff --git a/src/Seq.Apps/Apps/Event.cs b/src/Seq.Apps/Apps/Event.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 
 namespace Seq.Apps
 {
@@ -13,13 +14,13 @@ public class Event<TData>
         /// </summary>
         /// <param name="id">The event ID.</param>
         /// <param name="eventType">The event type.</param>
-        /// <param name="timestampUtc">The </param>
+        /// <param name="timestamp">The event timestamp.</param>
         /// <param name="data"></param>
-        public Event(string id, uint eventType, DateTime timestampUtc, TData data)
+        public Event(string id, uint eventType, DateTime timestamp, TData data)
         {
             Id = id;
             EventType = eventType;
-            TimestampUtc = timestampUtc;
+            Timestamp = timestamp;
             Data = data;
         }
 
@@ -30,9 +31,9 @@ public Event(string id, uint eventType, DateTime timestampUtc, TData data)
         public uint EventType { get; }
 
         /// <summary>
-        /// The UTC timestamp at which the event was created.
+        /// The event timestamp.
         /// </summary>
-        public DateTime TimestampUtc { get; }
+        public DateTime Timestamp { get; }
 
         /// <summary>
         /// The event payload.
@@ -43,5 +44,9 @@ public Event(string id, uint eventType, DateTime timestampUtc, TData data)
         /// The Seq event ID.
         /// </summary>
         public string Id { get; }
+
+
+        [Obsolete("Use `Timestamp` instead."), EditorBrowsable(EditorBrowsableState.Never)]
+        public DateTime TimestampUtc => Timestamp;
     }
-}
+}
diff --git a/src/Seq.Apps/Apps/ISubscribeTo.cs b/src/Seq.Apps/Apps/ISubscribeTo.cs
@@ -4,6 +4,7 @@
     /// Subscribes an app to a typed event.
     /// </summary>
     /// <typeparam name="TData">The type representing event data.</typeparam>
+    /// <remarks>Use <see cref="ISubscribeToJsonAsync" /> for new code when possible.</remarks>
     public interface ISubscribeTo<TData>
     {
         /// <summary>

diff --git a/src/Seq.Apps/Apps/ISubscribeToAsync.cs b/src/Seq.Apps/Apps/ISubscribeToAsync.cs
@@ -6,6 +6,7 @@ namespace Seq.Apps
     /// Subscribes a app to a typed event, with the event handled asynchronously.
     /// </summary>
     /// <typeparam name="TData">The type representing event data.</typeparam>
+    /// <remarks>Use <see cref="ISubscribeToJsonAsync" /> for new code when possible.</remarks>
     public interface ISubscribeToAsync<TData>
     {
         /// <summary>

diff --git a/src/Seq.Apps/Seq.Apps.csproj b/src/Seq.Apps/Seq.Apps.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net4.5.2;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>2021.4.1</VersionPrefix>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <VersionPrefix>2023.4.0</VersionPrefix>
     <RootNamespace>Seq</RootNamespace>
     <GenerateXmlDocumentation>true</GenerateXmlDocumentation>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -11,20 +11,10 @@
     <PackageTags>seq</PackageTags>
     <PackageIconUrl>https://getseq.net/images/seq-nuget.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/datalust/seq-apps-runtime</PackageProjectUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>    
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net4.5.2' ">
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>    
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.5.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net4.5.2' ">
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Serilog" Version="3.0.1" />
   </ItemGroup>
 </Project>
diff --git a/test/Seq.Apps.Tests/Seq.Apps.Tests.csproj b/test/Seq.Apps.Tests/Seq.Apps.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
@@ -15,9 +15,4 @@
     <PackageReference Include="xunit" Version="2.3.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>