Refactoring (#1)

v2.0

Author: KSemenenko

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dotnet.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: [ main ]
 
-
+  
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -16,31 +16,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.x
 
-    - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-        
-      # run build and test           
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --logger 'trx;LogFileName=test-results.trx'
-    - name: Collect Code Coverage
-      run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=ManagedCode.Communication.Tests/lcov.info
-    - name : coverlet
-      uses: b3b00/coverlet-action@1.1.9
-      with:
-        testProject: 'ManagedCode.Communication.Tests/ManagedCode.Communication.Tests.csproj'
-        output: 'lcov.info'
-        outputFormat: 'lcov'
-        excludes: '[program]*,[test]test.*'
-    - name: coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{secrets.GITHUB_TOKEN }}
-        path-to-lcov: ManagedCode.Communication.Tests/lcov.info   
+        # run build and test           
+      - name: Restore dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --no-restore
+      - name: Test and Collect Code Coverage
+        run: dotnet test -p:CollectCoverage=true -p:CoverletOutputFormat=lcov -p:CoverletOutput=ManagedCode.Communication.Tests/
+    
+          
+      - name: coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN }}
+          path-to-lcov: ManagedCode.Communication.Tests/coverage.info

.github/workflows/nuget.yml

@@ -3,7 +3,7 @@ name: nuget
 on:
   push:
     branches: [ main ]
-    
+  
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -13,23 +13,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-          
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release
-    - name: Pack
-      run: dotnet pack --configuration Release
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.x
 
-    - name: publish nuget packages
-      run: |
-        shopt -s globstar
-        for file in **/*.nupkg
-        do
-          dotnet nuget push "$file" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
-        done  
+      - name: Restore dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release
+      - name: Pack
+        run: dotnet pack -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg --configuration Release
+
+      - name: publish nuget packages
+        run: |
+          shopt -s globstar
+          for file in **/*.nupkg
+          do
+            dotnet nuget push "$file" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+          done

Directory.Build.props

@@ -13,13 +13,13 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <EnablePackageValidation>true</EnablePackageValidation>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        
+
         <RepositoryUrl>https://github.com/managedcode/Communication</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/Communication</PackageProjectUrl>
         <Product>Managed Code - Communication</Product>
-        <Version>1.0.3</Version>
-        <PackageVersion>1.0.3</PackageVersion>
-        
+        <Version>2.0.0</Version>
+        <PackageVersion>2.0.0</PackageVersion>
+
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

ManagedCode.Communication.Tests/DeserializationTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using FluentAssertions;
 using Newtonsoft.Json;
 using Xunit;
@@ -11,19 +12,19 @@ public class DeserializationTests
 {
     [Theory]
     [MemberData(nameof(GetResults))]
-    public void DeserializeResult_WithNewtonsoftJson(Result result)
+    public void DeserializeResult_WithNewtonsoftJson(IResult result)
     {
         // Act 
         var serialized = JsonConvert.SerializeObject(result);
-        var deserialized = JsonConvert.DeserializeObject<Result<int>>(serialized);
+        var deserialized = JsonConvert.DeserializeObject<Result>(serialized);
 
         // Assert
         deserialized.Should().BeEquivalentTo(result);
     }
 
     [Theory]
     [MemberData(nameof(GetValueResults))]
-    public void DeserializeValueResult_WithNewtonsoftJson<T>(Result<T> result)
+    public void DeserializeValueResult_WithNewtonsoftJson<T>(IResult result)
     {
         // Act 
         var serialized = JsonConvert.SerializeObject(result);
@@ -35,7 +36,7 @@ public void DeserializeValueResult_WithNewtonsoftJson<T>(Result<T> result)
 
     [Theory]
     [MemberData(nameof(GetResults))]
-    public void DeserializeResult_WithTextJson(Result result)
+    public void DeserializeResult_WithTextJson(IResult result)
     {
         // Act 
         var serialized = JsonSerializer.Serialize(result);
@@ -47,7 +48,7 @@ public void DeserializeResult_WithTextJson(Result result)
 
     [Theory]
     [MemberData(nameof(GetValueResults))]
-    public void DeserializeValueResult_WithTextJson<T>(Result<T> result)
+    public void DeserializeValueResult_WithTextJson<T>(IResult result)
     {
         // Act 
         var serialized = JsonSerializer.Serialize(result);
@@ -62,7 +63,7 @@ public static IEnumerable<object[]> GetResults()
         yield return new object[] { Result.Succeed() };
         yield return new object[] { Result.Fail() };
         yield return new object[] { Result.Fail(new Exception("Test exception")) };
-        yield return new object[] { Result.Fail(new Error<ErrorCode>("Test error", ErrorCode.InvalidState)) };
+        yield return new object[] { Result.Fail(new Error("Test error", HttpStatusCode.Found)) };
     }
 
     public static IEnumerable<object[]> GetValueResults()
@@ -71,6 +72,6 @@ public static IEnumerable<object[]> GetValueResults()
         yield return new object[] { Result<string>.Succeed("Test string") };
         yield return new object[] { Result<int>.Fail() };
         yield return new object[] { Result<int>.Fail(new Exception("Test exception")) };
-        yield return new object[] { Result<int>.Fail(new Error<ErrorCode>("Test error", ErrorCode.InvalidState)) };
+        yield return new object[] { Result<int>.Fail(new Error("Test error", HttpStatusCode.Found)) };
     }
 }

ManagedCode.Communication.Tests/ManagedCode.Communication.Tests.csproj

@@ -1,16 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
         <IsPackable>false</IsPackable>
-        <LangVersion>10</LangVersion>
+        <LangVersion>11</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <PropertyGroup>
         <VSTestLogger>trx%3bLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
         <VSTestResultsDirectory>$(MSBuildThisFileDirectory)</VSTestResultsDirectory>
     </PropertyGroup>
+    <PropertyGroup>
+        <CollectCoverage>true</CollectCoverage>
+        <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
+        <Exclude>[*]*.Migrations.*</Exclude>
+        <ExcludeByFile>**/MyFile.cs</ExcludeByFile>
+        <CoverletOutputFormat>lcov</CoverletOutputFormat>
+    </PropertyGroup>
     <ItemGroup>
         <None Update="xunit.runner.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>