Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Target netstandard2.0 only, update dependencies, generate documentation #10

Merged
merged 2 commits into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,4 +19,4 @@ deploy:
artifact: /Seq.Api.*\.nupkg/
tag: v$(appveyor_build_version)
on:
branch: master
branch: main
Binary file added asset/seq-apps-runtime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 14 additions & 6 deletions src/Seq.Apps/Apps/Event.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.ComponentModel;

namespace Seq.Apps
{
Expand All @@ -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;
}

Expand All @@ -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.
Expand All @@ -43,5 +44,12 @@ public Event(string id, uint eventType, DateTime timestampUtc, TData data)
/// The Seq event ID.
/// </summary>
public string Id { get; }


/// <summary>
/// The event timestamp.
/// </summary>
[Obsolete("Use `Timestamp` instead."), EditorBrowsable(EditorBrowsableState.Never)]
public DateTime TimestampUtc => Timestamp;
}
}
}
1 change: 1 addition & 0 deletions src/Seq.Apps/Apps/ISubscribeTo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/Seq.Apps/Apps/ISubscribeToAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 9 additions & 15 deletions src/Seq.Apps/Seq.Apps.csproj
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
<?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>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Description>C# API for Seq creating hosted apps.</Description>
<Authors>Datalust Pty Ltd</Authors>
<PackageTags>seq</PackageTags>
<PackageIconUrl>https://getseq.net/images/seq-nuget.png</PackageIconUrl>
<PackageIcon>seq-apps-runtime.png</PackageIcon>
<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>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.5.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net4.5.2' ">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />

<ItemGroup>
<None Include="../../asset/seq-apps-runtime.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
</Project>
7 changes: 1 addition & 6 deletions test/Seq.Apps.Tests/Seq.Apps.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>

Expand All @@ -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>