Skip to content

Commit

Permalink
Merge pull request #13 from Ali-YousefiTelori/develop
Browse files Browse the repository at this point in the history
Fix some issues of identity and update packages
  • Loading branch information
Ali-YousefiTelori authored Jan 12, 2024
2 parents 08c871d + 2fbf1c1 commit a79fe7d
Show file tree
Hide file tree
Showing 30 changed files with 455 additions and 101 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/dotnet-format-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Run dotnet format
id: format
uses: jfversluis/[email protected]
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/dotnet-linux-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,37 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln
- name: Build
run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-restore
- name: Test
run: |
dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-build --verbosity normal -f net7.0
- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
26 changes: 26 additions & 0 deletions .github/workflows/dotnet-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,37 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln
- name: Build
run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-restore
- name: Test
run: |
dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-build --verbosity normal -f net7.0
- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
26 changes: 26 additions & 0 deletions .github/workflows/dotnet-macos-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,37 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln
- name: Build
run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-restore
- name: Test
run: |
dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-build --verbosity normal -f net7.0
- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
26 changes: 26 additions & 0 deletions .github/workflows/dotnet-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,37 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln
- name: Build
run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-restore
- name: Test
run: |
dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-build --verbosity normal -f net7.0
- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
27 changes: 27 additions & 0 deletions .github/workflows/dotnet-windows-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,37 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
shell: bash
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln
- name: Build
run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-restore
- name: Test
run: dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-build --verbosity normal

- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
27 changes: 27 additions & 0 deletions .github/workflows/dotnet-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,37 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
shell: bash
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln
- name: Build
run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-restore
- name: Test
run: dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-build --verbosity normal

- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
31 changes: 28 additions & 3 deletions .github/workflows/nuget-push-public-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,27 @@ jobs:
- uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
env:
DOTNET_INSTALL_DIR: /usr/share/dotnet
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
shell: bash
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln
- name: Build
Expand All @@ -22,4 +40,11 @@ jobs:
- name: Create the package
run: dotnet pack ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --output nupkgs
- name: Publish the package to NuGet.org
run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate

- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
31 changes: 28 additions & 3 deletions .github/workflows/nuget-push-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,27 @@ jobs:
- uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
env:
DOTNET_INSTALL_DIR: /usr/share/dotnet
8.0.x
- name: Clone and run Authentication
run: |
git clone https://github.com/EasyMicroservices/Authentications-Microservice.git
cd Authentications-Microservice
dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj &
AUTH_PID=$!
echo "Started Authentication Service with PID $AUTH_PID"
cd ..
shell: bash
- name: Clone and run WhiteLabel
run: |
git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git
cd WhiteLabels-Microservice
dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj &
WHITELABEL_PID=$!
echo "Started WhiteLabel Service with PID $WHITELABEL_PID"
cd ..
shell: bash
- name: Restore dependencies
run: dotnet restore ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln
- name: Build
Expand All @@ -22,4 +40,11 @@ jobs:
- name: Create the package
run: dotnet pack ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --output nupkgs
- name: Publish the package to NuGet.org
run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate

- name: Cleanup
if: always()
run: echo "Shutting down Authentication Service with PID $AUTH_PID"
kill $AUTH_PID echo "Authentication Service shutdown failed"
echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
28 changes: 14 additions & 14 deletions src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test-Layer", "Test-Layer",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.IdentityMicroservice.Clients", "EasyMicroservices.IdentityMicroservice.Clients\EasyMicroservices.IdentityMicroservice.Clients.csproj", "{EBDC4665-F64A-4F50-B939-3ACCAFB72A3D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.IdentityMicroservice.Clients.Tests", "EasyMicroservices.IdentityMicroservice.Tests\EasyMicroservices.IdentityMicroservice.Clients.Tests.csproj", "{3969FAB0-9A48-4516-97DD-C1882DDF1E96}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.IdentityMicroservice.Clients.Tests", "EasyMicroservices.IdentityMicroservice.Clients.Tests\EasyMicroservices.IdentityMicroservice.Clients.Tests.csproj", "{FC8072F3-3FE4-405C-B3C6-EF5927599515}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -33,25 +33,25 @@ Global
{EBDC4665-F64A-4F50-B939-3ACCAFB72A3D}.Release|x64.Build.0 = Release|x64
{EBDC4665-F64A-4F50-B939-3ACCAFB72A3D}.Release|x86.ActiveCfg = Release|x86
{EBDC4665-F64A-4F50-B939-3ACCAFB72A3D}.Release|x86.Build.0 = Release|x86
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Debug|x64.ActiveCfg = Debug|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Debug|x64.Build.0 = Debug|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Debug|x86.ActiveCfg = Debug|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Debug|x86.Build.0 = Debug|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Release|Any CPU.Build.0 = Release|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Release|x64.ActiveCfg = Release|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Release|x64.Build.0 = Release|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Release|x86.ActiveCfg = Release|Any CPU
{3969FAB0-9A48-4516-97DD-C1882DDF1E96}.Release|x86.Build.0 = Release|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Debug|x64.ActiveCfg = Debug|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Debug|x64.Build.0 = Debug|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Debug|x86.ActiveCfg = Debug|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Debug|x86.Build.0 = Debug|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Release|Any CPU.Build.0 = Release|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Release|x64.ActiveCfg = Release|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Release|x64.Build.0 = Release|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Release|x86.ActiveCfg = Release|Any CPU
{FC8072F3-3FE4-405C-B3C6-EF5927599515}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EBDC4665-F64A-4F50-B939-3ACCAFB72A3D} = {D2CA37CF-478B-4F54-B119-69AE1B8C525B}
{3969FAB0-9A48-4516-97DD-C1882DDF1E96} = {E9B271A6-185D-4C47-A7BA-61832F628E25}
{FC8072F3-3FE4-405C-B3C6-EF5927599515} = {E9B271A6-185D-4C47-A7BA-61832F628E25}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B8B82934-7EE0-4C86-9065-ADF9092553E1}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global using Xunit;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<RootNamespace>EasyMicroservices.IdentityMicroservice</RootNamespace>
</PropertyGroup>

Expand Down
Loading

0 comments on commit a79fe7d

Please sign in to comment.