Merge pull request #223 from Stravaig-Projects/#221/support.net7

colinangusmackay · web-flow · commit 6b78d2de57fb · 2022-11-13T15:38:46.000Z
#221: Upgrade to .NET 7.0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,6 +79,11 @@ jobs:
         with:
           dotnet-version: 6.0.x # Always the latest patch version.
 
+      - uses: actions/setup-dotnet@v1
+        name: Setup .NET 7.0
+        with:
+          dotnet-version: 7.0.x # Always the latest patch version.
+
       - name: Build Solution
         run: dotnet build $STRAVAIG_SOLUTION --configuration Release
        
diff --git a/README.md b/README.md
@@ -16,6 +16,10 @@ Provides logged diagnostics for the app configuration.
 
 The `Stravaig.Extensions.Configuration.Diagnostics` package is now deprecated. It is replaced by the `Stravaig.Configuration.Diagnostics.Logging` package (which references the `Stravaig.Configuration.Diagnostics.Core` package.)
 
+Supported frameworks: .NET Core 3.1, .NET 5.0, 6.0, & 7.0
+
+NOTE: :warning: .NET 5.0 support will be removed from this package at the next major version update.
+
 ## Read the Docs
 
 The docs for this project are now available at Read The Docs:
diff --git a/release-notes/wip-release-notes.md b/release-notes/wip-release-notes.md
@@ -4,22 +4,16 @@
 
 Date: ???
 
-### Bugs
-
-### Features
-
-### Miscellaneous
-
 ### Dependent Packages
 
+- .NET 7.0
+  - Introducing Microsoft.Extensions.Configuration.Abstractions 7.0.0
+  - Introducing Microsoft.Extensions.Logging.Abstractions 7.0.0
 - .NET 6.0
-  - No changes
-- .NET 5.0
-  - No changes
+  - Bump Microsoft.Extensions.Logging.Abstractions to 6.0.3
 - .NET Core 3.1
-  - No changes
-- General
-  - No changes
+  - Bump Microsoft.Extensions.Configuration.Abstractions to 3.1.31
+  - Bump Microsoft.Extensions.Logging.Abstractions to 3.1.31
 
 ---
 
diff --git a/src/Stravaig.Configuration.Diagnostics.AdHocTests/Stravaig.Configuration.Diagnostics.AdHocTests.csproj b/src/Stravaig.Configuration.Diagnostics.AdHocTests/Stravaig.Configuration.Diagnostics.AdHocTests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.AdHocTests</RootNamespace>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.29" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.31" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
@@ -34,10 +34,19 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="Seq.Extensions.Logging" Version="6.1.0" />
     </ItemGroup>
 
diff --git a/src/Stravaig.Configuration.Diagnostics.Core/Stravaig.Configuration.Diagnostics.Core.csproj b/src/Stravaig.Configuration.Diagnostics.Core/Stravaig.Configuration.Diagnostics.Core.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
         <Title>Stravaig Configuration Diagnostics Core</Title>
         <Authors>Stravaig Projects</Authors>
         <Copyright>©2020-$(StravaigCopyrightYear) Stravaig Projects. See licence for more information.</Copyright>
@@ -44,7 +44,7 @@ Release notes at: $(StravaigReleaseNotes)
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.29" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.31" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
@@ -55,4 +55,8 @@ Release notes at: $(StravaigReleaseNotes)
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Stravaig.Configuration.Diagnostics.Logging/Stravaig.Configuration.Diagnostics.Logging.csproj b/src/Stravaig.Configuration.Diagnostics.Logging/Stravaig.Configuration.Diagnostics.Logging.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
         <Title>Stravaig Configuration Diagnostics (Logging Extensions)</Title>
         <Authors>Stravaig Projects</Authors>
         <Copyright>©2020-$(StravaigCopyrightYear) Stravaig Projects. See licence for more information.</Copyright>
@@ -43,8 +43,8 @@ Release notes at: $(StravaigReleaseNotes)
     </ItemGroup>
     
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.29" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.31" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
@@ -54,7 +54,12 @@ Release notes at: $(StravaigReleaseNotes)
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Stravaig.Configuration.Diagnostics.Serilog/Stravaig.Configuration.Diagnostics.Serilog.csproj b/src/Stravaig.Configuration.Diagnostics.Serilog/Stravaig.Configuration.Diagnostics.Serilog.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
         <Title>Stravaig Configuration Diagnostics (Serilog Extensions)</Title>
         <Authors>Stravaig Projects</Authors>
         <Copyright>©2020-$(StravaigCopyrightYear) Stravaig Projects. See licence for more information.</Copyright>
diff --git a/src/Stravaig.Configuration.Diagnostics.Tests/Stravaig.Configuration.Diagnostics.Tests.csproj b/src/Stravaig.Configuration.Diagnostics.Tests/Stravaig.Configuration.Diagnostics.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.Tests</RootNamespace>
         <LangVersion>10</LangVersion>
@@ -10,28 +10,28 @@
     <ItemGroup>
         <PackageReference Include="nunit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="Serilog" Version="2.12.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
         <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> 
         <PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
         <PackageReference Include="Shouldly" Version="4.1.0" />
-        <PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="1.3.3" />
+        <PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="1.4.0" />
         <PackageReference Include="Stravaig.Jailbreak" Version="0.1.0" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.29" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.29" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.31" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.31" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
@@ -56,10 +56,23 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Logging\Stravaig.Configuration.Diagnostics.Logging.csproj" />
       <ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Serilog\Stravaig.Configuration.Diagnostics.Serilog.csproj" />
diff --git a/src/Stravaig.Configuration.Diagnostics.Tests/__fakes/FakeDbConnection.cs b/src/Stravaig.Configuration.Diagnostics.Tests/__fakes/FakeDbConnection.cs
@@ -32,7 +32,7 @@ public void Close()
 
         public IDbCommand CreateCommand()
         {
-            return null;
+            return null!;
         }
 
         public void Open()
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.1.6
+1.2.0

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void Close()`
`32`	`32`
`33`	`33`	`public IDbCommand CreateCommand()`
`34`	`34`	`{`
`35`		`- return null;`
	`35`	`+ return null!;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public void Open()`