Merge pull request #400 from nblumhardt/net-80-rc2

nblumhardt · web-flow · commit b174dd27b062 · 2023-11-13T16:03:07.000+11:00
.NET 8 RC2
diff --git a/global.json b/global.json
@@ -1,7 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.201",
-    "allowPrerelease": false,
-    "rollForward": "latestFeature"
+    "version": "8.0.100-rc.2.23502.2"
   }
 }
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net462</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-*" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
diff --git a/src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj b/src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <Description>Microsoft.Extensions.Configuration (appsettings.json) support for Serilog.</Description>
     <!-- This must match the major and minor components of the referenced Microsoft.Extensions.Logging package. -->
-    <VersionPrefix>7.0.2</VersionPrefix>
+    <VersionPrefix>8.0.0</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
     <!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.settings.configuration at
         the target version. -->
-    <TargetFrameworks>net462;netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Settings.Configuration</AssemblyName>
     <PackageTags>serilog;json</PackageTags>
@@ -27,13 +27,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="PolySharp" Version="1.13.1" PrivateAssets="All" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog" Version="3.1.0-*" />
     <None Include="..\..\assets\icon.png" Pack="true" PackagePath="" Visible="false" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0-*" />
   </ItemGroup>
 </Project>
diff --git a/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs b/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs
@@ -395,12 +395,12 @@ public void TestMinimumLevelOverridesForChildContext()
         log.Write(Some.DebugEvent());
         Assert.Null(evt);
 
-        var custom = log.ForContext(Constants.SourceContextPropertyName, typeof(System.Threading.Tasks.Task).FullName + "<42>");
+        var custom = log.ForContext(Constants.SourceContextPropertyName, typeof(Task).FullName + "<42>");
         custom.Write(Some.DebugEvent());
         Assert.NotNull(evt);
 
         evt = null;
-        var systemThreadingLogger = log.ForContext<System.Threading.Tasks.Task>();
+        var systemThreadingLogger = log.ForContext<Task>();
         systemThreadingLogger.Write(Some.DebugEvent());
         Assert.NotNull(evt);
     }
diff --git a/test/Serilog.Settings.Configuration.Tests/DllScanningAssemblyFinderTests.cs b/test/Serilog.Settings.Configuration.Tests/DllScanningAssemblyFinderTests.cs
@@ -9,18 +9,11 @@ namespace Serilog.Settings.Configuration.Tests;
 
 public class DllScanningAssemblyFinderTests
 {
+#if NETFRAMEWORK
     const string BinDir1 = "bin1";
     const string BinDir2 = "bin2";
     const string BinDir3 = "bin3";
 
-    [Fact]
-    public void ShouldProbeCurrentDirectory()
-    {
-        var assemblyNames = new DllScanningAssemblyFinder().FindAssembliesContainingName("TestDummies");
-        Assert.Single(assemblyNames);
-    }
-
-#if NETFRAMEWORK
     [Fact]
     public void ShouldProbePrivateBinPath()
     {
@@ -61,4 +54,11 @@ static void DoTestInner()
         }
     }
 #endif
+
+    [Fact]
+    public void ShouldProbeCurrentDirectory()
+    {
+        var assemblyNames = new DllScanningAssemblyFinder().FindAssembliesContainingName("TestDummies");
+        Assert.Single(assemblyNames);
+    }
 }
diff --git a/test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj b/test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net48</TargetFrameworks>
-    <TargetFrameworks>$(TargetFrameworks);net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="CliWrap" Version="3.6.0" />
     <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="NuGet.Frameworks" Version="6.5.0" />
     <PackageReference Include="Polly" Version="7.2.3" />
diff --git a/test/TestApp/TestApp.csproj b/test/TestApp/TestApp.csproj
@@ -9,6 +9,7 @@
     <PublishReferencesDocumentationFiles>false</PublishReferencesDocumentationFiles>
     <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
     <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup Condition="$(Configuration) == 'Debug'">

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.201",`
`4`		`- "allowPrerelease": false,`
`5`		`- "rollForward": "latestFeature"`
	`3`	`+ "version": "8.0.100-rc.2.23502.2"`
`6`	`4`	`}`
`7`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,11 @@ namespace Serilog.Settings.Configuration.Tests;`
`9`	`9`
`10`	`10`	`public class DllScanningAssemblyFinderTests`
`11`	`11`	`{`
	`12`	`+#if NETFRAMEWORK`
`12`	`13`	`const string BinDir1 = "bin1";`
`13`	`14`	`const string BinDir2 = "bin2";`
`14`	`15`	`const string BinDir3 = "bin3";`
`15`	`16`
`16`		`- [Fact]`
`17`		`- public void ShouldProbeCurrentDirectory()`
`18`		`- {`
`19`		`- var assemblyNames = new DllScanningAssemblyFinder().FindAssembliesContainingName("TestDummies");`
`20`		`- Assert.Single(assemblyNames);`
`21`		`- }`
`22`		`-`
`23`		`-#if NETFRAMEWORK`
`24`	`17`	`[Fact]`
`25`	`18`	`public void ShouldProbePrivateBinPath()`
`26`	`19`	`{`
`@@ -61,4 +54,11 @@ static void DoTestInner()`
`61`	`54`	`}`
`62`	`55`	`}`
`63`	`56`	`#endif`
	`57`	`+`
	`58`	`+ [Fact]`
	`59`	`+ public void ShouldProbeCurrentDirectory()`
	`60`	`+ {`
	`61`	`+ var assemblyNames = new DllScanningAssemblyFinder().FindAssembliesContainingName("TestDummies");`
	`62`	`+ Assert.Single(assemblyNames);`
	`63`	`+ }`
`64`	`64`	`}`