Merge pull request #68 from Ali-YousefiTelori/develop

fix actions
EasyMicroservices · Dec 11, 2023 · b9b99a5 · b9b99a5
2 parents 44e7f27 + 8fc5d52
commit b9b99a5
Show file tree

Hide file tree

Showing 13 changed files with 824 additions and 22 deletions.
diff --git a/.github/workflows/dotnet-format-action.yml b/.github/workflows/dotnet-format-action.yml
@@ -24,13 +24,13 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           action: "fix"
-          workspace: "./src/CSharp/EasyMicroservices.Serialization.sln"
+          workspace: "./src/CSharp/EasyMicroservices.Serialization-net6.0.sln"
       - name: Test
-        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln
+        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln
       - name:  Test to generate Code Coverage Report
         working-directory: ./src/CSharp
         run: |
-          dotnet build ./EasyMicroservices.Serialization.sln
+          dotnet build ./EasyMicroservices.Serialization-net6.0.sln
           dotnet tool install --global coverlet.console
           coverlet EasyMicroservices.Serialization.Tests/bin/Debug/net6.0/EasyMicroservices.Serialization.Tests.dll --target "dotnet" --targetargs "test EasyMicroservices.Serialization.Tests/bin/Debug/net6.0/EasyMicroservices.Serialization.Tests.dll --no-build" -f opencover
       - name: OpenCover Badge Generator

diff --git a/.github/workflows/dotnet-linux.yml b/.github/workflows/dotnet-linux.yml
@@ -21,8 +21,14 @@ jobs:
             7.0.x
             8.0.x
       - name: Restore dependencies
-        run: dotnet restore ./src/CSharp/EasyMicroservices.Serialization.sln
+        run: |
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln
       - name: Build
-        run: dotnet build ./src/CSharp/EasyMicroservices.Serialization.sln --no-restore
+        run: |
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-restore
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-restore
       - name: Test
-        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln --no-build --verbosity diag
+        run: |
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-build --verbosity normal
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-build --verbosity normal
diff --git a/.github/workflows/dotnet-macos.yml b/.github/workflows/dotnet-macos.yml
@@ -21,8 +21,14 @@ jobs:
             7.0.x
             8.0.x
       - name: Restore dependencies
-        run: dotnet restore ./src/CSharp/EasyMicroservices.Serialization.sln
+        run: |
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln
       - name: Build
-        run: dotnet build ./src/CSharp/EasyMicroservices.Serialization.sln --no-restore
+        run: |
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-restore
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-restore
       - name: Test
-        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln --no-build --verbosity diag
+        run: |
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-build --verbosity normal
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-build --verbosity normal
diff --git a/.github/workflows/dotnet-windows.yml b/.github/workflows/dotnet-windows.yml
@@ -25,4 +25,4 @@ jobs:
       - name: Build
         run: dotnet build ./src/CSharp/EasyMicroservices.Serialization.sln --no-restore
       - name: Test
-        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln --no-build --verbosity diag
+        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln --no-build --verbosity normal
diff --git a/.github/workflows/nuget-push-public.yml b/.github/workflows/nuget-push-public.yml
@@ -18,11 +18,20 @@ jobs:
         env:
           DOTNET_INSTALL_DIR: /usr/share/dotnet
       - name: Restore dependencies
-        run: dotnet restore ./src/CSharp/EasyMicroservices.Serialization.sln
+        run: |
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net8.0.sln
       - name: Build
-        run: dotnet build ./src/CSharp/EasyMicroservices.Serialization.sln --no-restore
+        run: |
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-restore
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-restore
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net8.0.sln --no-restore
       - name: Test
-        run: dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln --no-build --verbosity diag
+        run: |
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-build --verbosity normal
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-build --verbosity normal
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net8.0.sln --no-build --verbosity normal
       - name: Create the package
         run: dotnet pack ./src/CSharp/EasyMicroservices.Serialization.sln --output nupkgs
       - name: Publish the package to NuGet.org

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,9 +19,15 @@ jobs:
           DOTNET_INSTALL_DIR: /usr/share/dotnet
       - name: build and test
         run: |
-          dotnet restore ./src/CSharp/EasyMicroservices.Serialization.sln
-          dotnet build ./src/CSharp/EasyMicroservices.Serialization.sln --no-restore
-          dotnet test ./src/CSharp/EasyMicroservices.Serialization.sln --no-build
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln
+          dotnet restore ./src/CSharp/EasyMicroservices.Serialization-net8.0.sln
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-restore
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-restore
+          dotnet build ./src/CSharp/EasyMicroservices.Serialization-net8.0.sln --no-restore
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net6.0.sln --no-build
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net7.0.sln --no-build
+          dotnet test ./src/CSharp/EasyMicroservices.Serialization-net8.0.sln --no-build
       - name: setup semantic-release
         run: |
           npm install -D semantic-release

diff --git a/src/CSharp/EasyMicroservices.Serialization.BinaryGo/BinaryGoExtensions.cs b/src/CSharp/EasyMicroservices.Serialization.BinaryGo/BinaryGoExtensions.cs
@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using EasyMicroservices.Serialization.Options;
 using EasyMicroservices.Serialization.BinaryGo.Providers;
+using EasyMicroservices.Serialization.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {

diff --git a/src/CSharp/EasyMicroservices.Serialization.MemoryPack/MemoryPackExtensions.cs b/src/CSharp/EasyMicroservices.Serialization.MemoryPack/MemoryPackExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using EasyMicroservices.Serialization.Options;
 using EasyMicroservices.Serialization.MemoryPack.Providers;
+using EasyMicroservices.Serialization.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {

diff --git a/src/CSharp/EasyMicroservices.Serialization.MessagePack/MessagePackExtensions.cs b/src/CSharp/EasyMicroservices.Serialization.MessagePack/MessagePackExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using EasyMicroservices.Serialization.Options;
 using EasyMicroservices.Serialization.MessagePack.Providers;
+using EasyMicroservices.Serialization.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {

diff --git a/src/CSharp/EasyMicroservices.Serialization.NewtonSoft.Json/NewtonsoftJsonExtensions.cs b/src/CSharp/EasyMicroservices.Serialization.NewtonSoft.Json/NewtonsoftJsonExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using EasyMicroservices.Serialization.Options;
 using EasyMicroservices.Serialization.Newtonsoft.Json.Providers;
+using EasyMicroservices.Serialization.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {

diff --git a/...CSharp/EasyMicroservices.Serialization.Tests/EasyMicroservices.Serialization.Tests.csproj b/...CSharp/EasyMicroservices.Serialization.Tests/EasyMicroservices.Serialization.Tests.csproj
@@ -8,7 +8,7 @@
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0;net48;net452;net8.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net48;net452;net8.0;net7.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>

diff --git a/src/CSharp/coverage-badge-line.svg b/src/CSharp/coverage-badge-line.svg