Merge 55735e0 into 1779914

.github/workflows/test.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - master
       - develop
+  push:
+    branches:
+      - master
+      - develop
 
 jobs:
   test:
@@ -17,14 +21,18 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
-      - name: Use .NET Core 2.2 SDK
+      - name: Use .NET Core 2.1 LTS SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '2.2.x'
+          dotnet-version: '2.1.x'
       - name: Use .NET Core 3.1 LTS SDK
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'
+      - name: Use .NET Core 5.0 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
           source-url: https://nuget.pkg.github.com/Shane32/index.json
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -35,4 +43,65 @@ jobs:
       - name: Build solution [Debug]
         run: dotnet build --no-restore -p:NoWarn=CS1591
       - name: Test solution [Debug]
-        run: dotnet test --no-restore --no-build
+        run: dotnet test --no-restore --no-build -p:CollectCoverage=true -p:CoverletOutputFormat=lcov -p:CoverletOutput=../../${{ matrix.os }}.lcov.info
+      # ==== code coverage reports (ubuntu-latest only) ====
+      - name: Convert coverage report to clover & htmlsummary format
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: danielpalme/ReportGenerator-GitHub-Action@4.7.1
+        with:
+          reports: '${{ matrix.os }}.lcov.info'
+          targetdir: '.'
+          reporttypes: 'Clover;HtmlSummary'
+          tag: 'test_${{ github.run_number }}'
+      - name: Convert coverage report to html
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: danielpalme/ReportGenerator-GitHub-Action@4.7.1
+        with:
+          reports: '${{ matrix.os }}.lcov.info'
+          targetdir: './cloverreport'
+          reporttypes: 'Html'
+          tag: 'test_${{ github.run_number }}'
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Code coverage artifacts
+          path: |
+            ${{ matrix.os }}.lcov.info
+            Clover.xml
+            cloverreport/**
+            summary.html
+      - name: Monitor coverage
+        if: ${{ matrix.os == 'ubuntu-latest' && github.event_name == 'pull_request' }}
+        uses: slavcodev/coverage-monitor-action@1.2.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          clover_file: "Clover.xml"
+          threshold_alert: 80
+          threshold_warning: 90
+      # https://github.com/marketplace/actions/coveralls-github-action
+      - name: Upload coverage to Coveralls
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN }}
+          path-to-lcov: ${{ matrix.os }}.lcov.info
+          parallel: true
+          flag-name: ${{ matrix.os }}
+      - name: Upload coverage to Codecov
+        if: ${{ 0 == 1 }}
+        uses: codecov/codecov-action@v1
+        with:
+          file: ${{ matrix.os }}.lcov.info
+          flags: unittests # optional
+          name: codecov-umbrella # optional
+          fail_ci_if_error: true # optional (default = false)
+          verbose: true # optional (default = false)
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

Directory.Build.props

@@ -13,14 +13,14 @@
     <Deterministic>true</Deterministic>
     <!-- https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables -->
     <!-- https://github.com/clairernovotny/DeterministicBuilds -->
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">True</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(Configuration)' != 'Debug'">True</ContinuousIntegrationBuild>
     <DebugType>embedded</DebugType>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" Condition="'$(IsPackable)' == 'true'"/>
-    <None Include="..\logo.64x64.png" Pack="true" PackagePath="\"/>
+    <None Include="..\..\logo.64x64.png" Pack="true" PackagePath="\" Condition="'$(IsPackable)' == 'true'"/>
   </ItemGroup>
 
 </Project>

GraphQL.DI.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30611.23
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shane32.GraphQL.DI", "src\Shane32.GraphQL.DI.csproj", "{72C179A6-53BF-48BC-BFE0-BD8CA2618AF6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shane32.GraphQL.DI", "src\GraphQL.DI\Shane32.GraphQL.DI.csproj", "{72C179A6-53BF-48BC-BFE0-BD8CA2618AF6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{B194B3FB-53C8-4C5D-ABC3-EAB6A52C674D}"
 	ProjectSection(SolutionItems) = preProject
@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "src\Tests\Tests.csproj", "{BA5F3790-9FE0-4A10-8528-0756334AC727}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,6 +28,10 @@ Global
 		{72C179A6-53BF-48BC-BFE0-BD8CA2618AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{72C179A6-53BF-48BC-BFE0-BD8CA2618AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72C179A6-53BF-48BC-BFE0-BD8CA2618AF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA5F3790-9FE0-4A10-8528-0756334AC727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA5F3790-9FE0-4A10-8528-0756334AC727}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA5F3790-9FE0-4A10-8528-0756334AC727}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA5F3790-9FE0-4A10-8528-0756334AC727}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -1,3 +1,3 @@
 # GraphQL.DI
 
-[![NuGet](https://img.shields.io/nuget/v/Shane32.GraphQL.DI.svg)](https://www.nuget.org/packages/Shane32.GraphQL.DI)
+[![NuGet](https://img.shields.io/nuget/v/Shane32.GraphQL.DI.svg)](https://www.nuget.org/packages/Shane32.GraphQL.DI) [![Coverage Status](https://coveralls.io/repos/github/Shane32/GraphQL.DI/badge.svg?branch=master)](https://coveralls.io/github/Shane32/GraphQL.DI?branch=master)