Merge pull request #297 from KodrAus/feat/tracing

Update SDK .NET 8 and packages to latest

Author: nblumhardt

Build.Docker.ps1

@@ -6,7 +6,7 @@ $IsCIBuild = $null -ne $env:APPVEYOR_BUILD_NUMBER
 $IsPublishedBuild = ($env:APPVEYOR_REPO_BRANCH -eq "main" -or $env:APPVEYOR_REPO_BRANCH -eq "dev") -and $null -eq $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH
 
 $version = Get-SemVer(@{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:APPVEYOR_BUILD_VERSION -ne $NULL])
-$framework = "net7.0"
+$framework = "net8.0"
 $image = "datalust/seqcli"
 $archs = @(
     @{ rid = "x64"; platform = "linux/amd64" },

Build.ps1

@@ -5,7 +5,7 @@ Push-Location $PSScriptRoot
 $ErrorActionPreference = 'Stop'
 
 $version = Get-SemVer(@{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:APPVEYOR_BUILD_VERSION -ne $NULL])
-$framework = 'net7.0'
+$framework = 'net8.0'
 $windowsTfmSuffix = '-windows'
 
 function Clean-Output

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2023.4.{build}
+version: 2024.1.{build}
 skip_tags: true
 image:
 - Visual Studio 2022

dockerfiles/seqcli/linux-arm64.Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update \
         zlib1g \
     && rm -rf /var/lib/apt/lists/*
 
-COPY src/SeqCli/bin/Release/net7.0/linux-arm64/publish /bin/seqcli
+COPY src/SeqCli/bin/Release/net8.0/linux-arm64/publish /bin/seqcli
 
 ENTRYPOINT ["/bin/seqcli/seqcli"]
 

dockerfiles/seqcli/linux-x64.Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update \
         zlib1g \
     && rm -rf /var/lib/apt/lists/*
 
-COPY src/SeqCli/bin/Release/net7.0/linux-x64/publish /bin/seqcli
+COPY src/SeqCli/bin/Release/net8.0/linux-x64/publish /bin/seqcli
 
 ENTRYPOINT ["/bin/seqcli/seqcli"]
 

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.400"
+    "version": "8.0.100-rc.2.23502.2"
   }
 }

src/Roastery/Roastery.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="3.0.1" />
+        <PackageReference Include="Serilog" Version="3.1.0-dev-02078" />
     </ItemGroup>
 
 </Project>

src/SeqCli/SeqCli.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
     <AssemblyName>seqcli</AssemblyName>
     <ApplicationIcon>..\..\asset\SeqCli.ico</ApplicationIcon>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64;osx-x64;linux-arm64;linux-musl-arm64;osx-arm64</RuntimeIdentifiers>
@@ -28,13 +28,13 @@
   <ItemGroup>
     <PackageReference Include="Destructurama.JsonNet" Version="2.0.0" />
     <PackageReference Include="newtonsoft.json" Version="13.0.3" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
-    <PackageReference Include="serilog.expressions" Version="3.4.1" />
-    <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
-    <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog" Version="3.1.0-dev-02078" />
+    <PackageReference Include="serilog.expressions" Version="4.0.0-dev-00139" />
+    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0-dev-00961" />
+    <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="3.0.0-dev-00063" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0-dev-00923" />
     <PackageReference Include="Autofac" Version="7.1.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0-dev-00266" />
     <PackageReference Include="Superpower" Version="3.0.0" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />

test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj

@@ -2,12 +2,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0-dev-00266" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Data\*">

test/SeqCli.EndToEnd/Version/VersionCommandTestCase.cs

@@ -20,7 +20,9 @@ public Task ExecuteAsync(SeqConnection connection, ILogger logger, CliCommandRun
         Assert.False(string.IsNullOrWhiteSpace(version));
         Assert.NotEqual("1.0.0", version);
         Assert.NotEqual("0.0.0", version);
-        Assert.True(System.Version.TryParse(version, out _));
+        
+        // Loose version string to make sure the version appears reasonable
+        Assert.Matches(@"[0-9]*\.[0-9]*\.[0-9]*(\+\S*)?", version);
 
         return Task.CompletedTask;
     }