[BREAKING]: Target .NET 4.6.2 and Updated Exceptionless.NET to 6.0

niemyjski · niemyjski · commit e8cbe1e66f0d · 2023-05-04T21:49:38.000-05:00
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -13,13 +13,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.x
+        dotnet-version: 6.x
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
       shell: bash
       run: |
-        dotnet tool install --global minver-cli --version 2.5.0
+        dotnet tool install --global minver-cli --version 4.3.0
         version=$(minver --tag-prefix v)
         echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
     - name: Build
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
@@ -13,13 +13,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.x
+        dotnet-version: 6.x
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
       shell: bash
       run: |
-        dotnet tool install --global minver-cli --version 2.5.0
+        dotnet tool install --global minver-cli --version 4.3.0
         version=$(minver --tag-prefix v)
         echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
     - name: Build
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -13,13 +13,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.x
+        dotnet-version: 6.x
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
       shell: bash
       run: |
-        dotnet tool install --global minver-cli --version 2.5.0
+        dotnet tool install --global minver-cli --version 4.3.0
         version=$(minver --tag-prefix v)
         echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
     - name: Build
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,7 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "taskName": "build",
+            "label": "build",
             "command": "dotnet build",
             "type": "shell",
             "group": {
diff --git a/README.md b/README.md
@@ -38,4 +38,4 @@ Log.Logger = new LoggerConfiguration()
 
 * [Documentation](https://github.com/serilog/serilog/wiki)
 
-Copyright &copy; 2017 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html).
+Copyright &copy; 2023 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html).
diff --git a/sample/ConsoleDemo/ConsoleDemo.csproj b/sample/ConsoleDemo/ConsoleDemo.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net50</TargetFrameworks>
+        <TargetFrameworks>net60</TargetFrameworks>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
       <ProjectReference Include="..\..\src\Serilog.Sinks.Exceptionless\Serilog.Sinks.Exceptionless.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+      <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     </ItemGroup>
 </Project>
diff --git a/sample/SampleWeb/SampleWeb.csproj b/sample/SampleWeb/SampleWeb.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Exceptionless.AspNetCore" Version="4.6.2" />
-        <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+        <PackageReference Include="Exceptionless.AspNetCore" Version="6.0.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Serilog.Sinks.Exceptionless/Serilog.Sinks.Exceptionless.csproj b/src/Serilog.Sinks.Exceptionless/Serilog.Sinks.Exceptionless.csproj
@@ -41,7 +41,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Signing">
@@ -56,12 +56,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Exceptionless" Version="4.6.2" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Exceptionless" Version="6.0.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
 
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
diff --git a/src/Serilog.Sinks.Exceptionless/Sinks/Exceptionless/ExceptionlessSink.cs b/src/Serilog.Sinks.Exceptionless/Sinks/Exceptionless/ExceptionlessSink.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using Exceptionless;
 using Exceptionless.Dependency;
@@ -145,7 +145,7 @@ public void Emit(LogEvent logEvent) {
         }
 
         void IDisposable.Dispose() {
-            _client?.ProcessQueue();
+            _client?.ProcessQueueAsync().GetAwaiter().GetResult();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"version": "2.0.0",`
`5`	`5`	`"tasks": [`
`6`	`6`	`{`
`7`		`- "taskName": "build",`
	`7`	`+ "label": "build",`
`8`	`8`	`"command": "dotnet build",`
`9`	`9`	`"type": "shell",`
`10`	`10`	`"group": {`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,4 @@ Log.Logger = new LoggerConfiguration()`
`38`	`38`
`39`	`39`	`* [Documentation](https://github.com/serilog/serilog/wiki)`
`40`	`40`
`41`		`-Copyright © 2017 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html).`
	`41`	`+Copyright © 2023 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html).`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Exceptionless;`
`4`	`4`	`using Exceptionless.Dependency;`
`@@ -145,7 +145,7 @@ public void Emit(LogEvent logEvent) {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`void IDisposable.Dispose() {`
`148`		`- _client?.ProcessQueue();`
	`148`	`+ _client?.ProcessQueueAsync().GetAwaiter().GetResult();`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`