Merge branch 'next'

* next: Downgrade NUnit3TestAdapter from 4.3.0 back to 4.2.1. Moq -> 4.18.2 NUnit3TestAdapter -> 4.3.0 FluentAssertions -> 6.8.0 Microsoft.NET.Test.Sdk -> 17.3.2 Coverlet -> 3.2.0 Squelch warning about .NET 5.0 being EOL. Use 'Build' as the run name. Update action versions to resolve deprecation warnings. Trigger build for 'next' branch. Misc project structure updates. ReportGenerator -> 5.1.10 Subatomix.Build.Versioning.Semantic -> 1.0.1 Version -> 2.3.0
sharpjs · Oct 29, 2022 · 204f32b · 204f32b
2 parents e0f333b + a92a01b
commit 204f32b
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 30 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.9",
+      "version": "5.1.10",
       "commands": [
         "reportgenerator"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -41,3 +41,6 @@ indent_size = 2
 [*.cs]
 csharp_space_after_cast = true
 dotnet_sort_system_directives_first = true
+
+[dotnet-tools.json]
+insert_final_newline = false
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,11 +16,13 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 name: Build
+run-name: Build
 
 on:
   push:
     branches:
       - main
+      - next
       - release/*
     tags:
       - release/*
@@ -43,26 +45,17 @@ jobs:
 
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         #url: https://github.com/actions/checkout
 
-      - name: Configure .NET Core 3.1
-        uses: actions/setup-dotnet@v1
+      - name: Configure .NET
+        uses: actions/setup-dotnet@v3
         #url: https://github.com/actions/setup-dotnet
         with:
-          dotnet-version: 3.1.x
-
-      - name: Configure .NET 5.0
-        uses: actions/setup-dotnet@v1
-        #url: https://github.com/actions/setup-dotnet
-        with:
-          dotnet-version: 5.0.x
-
-      - name: Configure .NET 6.0
-        uses: actions/setup-dotnet@v1
-        #url: https://github.com/actions/setup-dotnet
-        with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            3.1.x
+            5.0.x
+            6.0.x
 
       - name: Stamp Version
         id: stamp
@@ -90,7 +83,7 @@ jobs:
           --results-directory:${{ runner.temp }}\coverage\raw
 
       - name: Prepare Coverage Report
-        uses: danielpalme/ReportGenerator-GitHub-Action@5.1.9
+        uses: danielpalme/ReportGenerator-GitHub-Action@5.1.10
         #url: https://github.com/danielpalme/ReportGenerator-GitHub-Action
         with:
           reports: ${{ runner.temp }}\coverage\raw\**\coverage.opencover.xml
@@ -99,15 +92,15 @@ jobs:
           verbosity: Warning
 
       - name: Save Coverage Report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         #url: https://github.com/actions/upload-artifact
         with:
           name: Coverage Report
           path: ${{ runner.temp }}\coverage
           if-no-files-found: error
 
       - name: Save Package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         #url: https://github.com/actions/upload-artifact
         with:
           name: Packages

diff --git a/.root.targets b/.root.targets
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.5.6">
-  <!-- https://github.com/microsoft/MSBuildSdks/tree/master/src/NoTargets -->
+  <!-- https://github.com/microsoft/MSBuildSdks/tree/main/src/NoTargets -->
 
   <!--
     Copyright 2022 Jeffrey Sharp
@@ -24,10 +24,16 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <IsPublishable>false</IsPublishable>
     <IsPackable>false</IsPackable>
+    <DefaultItemExcludesInProjectFolder>
+      Subatomix*\**;
+      coverage\**;
+      dist\**;
+      $(DefaultItemExcludesInProjectFolder)
+    </DefaultItemExcludesInProjectFolder>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="**" Exclude="Subatomix*\**;dist\**;coverage\**;$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(MSBuildThisFile)" />
+    <None Include="**"    Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(MSBuildThisFile)" />
     <None Include=".*\**" Exclude=".git\**;.vs\**" />
   </ItemGroup>
 

diff --git a/CHANGES.md b/CHANGES.md
@@ -5,9 +5,17 @@ Most lines should begin with one of these words:
 *Add*, *Fix*, *Update*, *Change*, *Deprecate*, *Remove*.
 
 <!--
-## [Unreleased](https://github.com/sharpjs/Subatomix.Testing/compare/release/2.2.0..HEAD)
+## [Unreleased](https://github.com/sharpjs/Subatomix.Testing/compare/release/2.3.0..HEAD)
+- Update NUnit3TestAdapter to [4.3.0](https://docs.nunit.org/articles/vs-test-adapter/AdapterV4-Release-Notes.html#nunit3-test-adapter-for-visual-studio---version-430---oct-29-2022).
+  <br/>Reverted due to https://github.com/nunit/nunit-console/issues/1178
 -->
 
+## [2.3.0](https://github.com/sharpjs/Subatomix.Testing/compare/release/2.2.0..release/2.3.0)
+- Update Coverlet to [3.2.0](https://github.com/coverlet-coverage/coverlet/releases/tag/v5.8.0)
+- Update FluentAssertions to [6.8.0](https://github.com/fluentassertions/fluentassertions/releases/tag/6.8.0)
+- Update Microsoft.NET.Test.Sdk to [17.3.2](https://github.com/microsoft/vstest-docs/blob/main/docs/releases.md#1732)
+- Update Moq to [4.18.2](https://github.com/moq/moq4/blob/v4.18.2/CHANGELOG.md)
+
 ## [2.2.0](https://github.com/sharpjs/Subatomix.Testing/compare/release/2.1.0..release/2.2.0)
 - Add implicit `using` statements for testing-related namespaces:
   - `FluentAssertions`

diff --git a/Coverlet.runsettings b/Coverlet.runsettings
@@ -24,7 +24,7 @@
       <DataCollector friendlyName="XPlat Code Coverage">
         <Configuration>
           <Format>opencover</Format>
-          <ExcludeByAttribute>GeneratedCodeAttribute,CompilerGeneratedAttribute,TestSDKAutoGeneratedCode</ExcludeByAttribute>
+          <ExcludeByAttribute>GeneratedCodeAttribute,TestSDKAutoGeneratedCode</ExcludeByAttribute>
         </Configuration>
       </DataCollector>
     </DataCollectors>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,7 +26,7 @@
   <!-- Descriptive properties -->
   <PropertyGroup>
     <Product>Subatomix.Testing</Product>
-    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionPrefix>2.3.0</VersionPrefix>
     <Authors>Jeffrey Sharp</Authors>
     <Company>Subatomix Research Inc.</Company>
     <Copyright>© $([System.DateTime]::UtcNow.Year) $(Authors)</Copyright>
@@ -44,6 +44,8 @@
     <LangVersion>10</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <InheritDocEnabled>true</InheritDocEnabled>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -38,7 +38,7 @@
 
   <!-- Versioning -->
   <ItemGroup>
-    <PackageReference Include="Subatomix.Build.Versioning.Semantic" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Subatomix.Build.Versioning.Semantic" Version="1.0.1" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- <inheritdoc/> support -->

diff --git a/Subatomix.Testing/Subatomix.Testing.csproj b/Subatomix.Testing/Subatomix.Testing.csproj
@@ -25,10 +25,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector"     Version="[ 3.1.2,   4.0.0)" PrivateAssets="none" />
-    <PackageReference Include="FluentAssertions"       Version="[ 6.7.0,   7.0.0)" PrivateAssets="none" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="[17.2.0,  18.0.0)" PrivateAssets="none" />
-    <PackageReference Include="Moq"                    Version="[ 4.18.1,  5.0.0)" PrivateAssets="none" />
+    <PackageReference Include="coverlet.collector"     Version="[ 3.2.0,   4.0.0)" PrivateAssets="none" />
+    <PackageReference Include="FluentAssertions"       Version="[ 6.8.0,   7.0.0)" PrivateAssets="none" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="[17.3.2,  18.0.0)" PrivateAssets="none" />
+    <PackageReference Include="Moq"                    Version="[ 4.18.2,  5.0.0)" PrivateAssets="none" />
     <PackageReference Include="NUnit"                  Version="[ 3.13.3,  4.0.0)" PrivateAssets="none" />
     <PackageReference Include="NUnit3TestAdapter"      Version="[ 4.2.1,   5.0.0)" PrivateAssets="none" />
   </ItemGroup>