diff --git a/.github/workflows/build-myget.yml b/.github/workflows/build-myget.yml deleted file mode 100644 index 3eb52beee1..0000000000 --- a/.github/workflows/build-myget.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Build and deploy to MyGet - -on: - push: - branches: - - myget - tags: - - '*' - -jobs: - - test: - runs-on: ubuntu-latest - - services: - redis: - image: redis - ports: - - 6379/tcp - options: --entrypoint redis-server - mongodb: - image: mongo - ports: - - 27017/tcp - - steps: - - uses: actions/checkout@v1 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.100' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - name: Build - run: dotnet build -c Release - - - name: Run tests netcoreapp3.1 - env: - ConnectionStrings__MongoDB: mongodb://localhost:${{ job.services.mongodb.ports[27017] }}/ProtoMongo - ConnectionStrings__Redis: localhost:${{ job.services.redis.ports[6379] }},syncTimeout=10000 - run: | - dotnet test -c Release --framework netcoreapp3.1 --no-build - - - name: Run tests net5.0 - env: - ConnectionStrings__MongoDB: mongodb://localhost:${{ job.services.mongodb.ports[27017] }}/ProtoMongo - ConnectionStrings__Redis: localhost:${{ job.services.redis.ports[6379] }},syncTimeout=10000 - run: | - dotnet test -c Release --framework net5.0 --no-build - - nuget: - runs-on: ubuntu-latest - needs: [test] - - steps: - - uses: actions/checkout@v1 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.100' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - name: Create and push NuGet package - run: | - dotnet pack -c Release -o nuget -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg - dotnet nuget push nuget/**/*.nupkg --api-key ${{ secrets.MYGET_API_KEY }} --source https://www.myget.org/F/asynkron/api/v3/index.json --skip-duplicate \ No newline at end of file diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8a300da4d8..411f16c671 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -27,18 +27,18 @@ jobs: dotnet-version: '3.1.x' - name: Build - run: dotnet build -c Release + run: dotnet build ProtoActor.sln -c Release - name: Run tests netcoreapp3.1 env: ConnectionStrings__MongoDB: mongodb://localhost:${{ job.services.mongodb.ports[27017] }}/ProtoMongo ConnectionStrings__Redis: localhost:${{ job.services.redis.ports[6379] }},syncTimeout=10000 run: | - dotnet test -c Release --framework netcoreapp3.1 --no-build + dotnet test ProtoActor.sln -c Release --framework netcoreapp3.1 --no-build - name: Run tests net5.0 env: ConnectionStrings__MongoDB: mongodb://localhost:${{ job.services.mongodb.ports[27017] }}/ProtoMongo ConnectionStrings__Redis: localhost:${{ job.services.redis.ports[6379] }},syncTimeout=10000 run: | - dotnet test -c Release --framework net5.0 --no-build + dotnet test ProtoActor.sln -c Release --framework net5.0 --no-build diff --git a/ProtoActorCoreOnly.sln b/ProtoActorCoreOnly.sln new file mode 100644 index 0000000000..dc0339580e --- /dev/null +++ b/ProtoActorCoreOnly.sln @@ -0,0 +1,323 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.202 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{771514F1-12AE-4A26-89CB-2646D3EF7034}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Actor", "src\Proto.Actor\Proto.Actor.csproj", "{7D13CCDD-6B93-45B8-BA88-761744601726}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9AA2BCF0-19AB-4DD9-8D91-7D188E463806}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Actor.Tests", "tests\Proto.Actor.Tests\Proto.Actor.Tests.csproj", "{6A8DB932-5230-4179-A3F0-291407E0419D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Remote", "src\Proto.Remote\Proto.Remote.csproj", "{4494E76E-16AC-4A7B-A2B8-A9B2D0568630}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Persistence", "src\Proto.Persistence\Proto.Persistence.csproj", "{30AAE00A-7FB9-43AC-8304-B824C0F097F2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Persistence.Tests", "tests\Proto.Persistence.Tests\Proto.Persistence.Tests.csproj", "{848E5CE2-D894-4321-8961-3521D3F2233C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.TestFixtures", "tests\Proto.TestFixtures\Proto.TestFixtures.csproj", "{BEAC63DD-5701-4B33-8155-5218B9761A70}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Cluster", "src\Proto.Cluster\Proto.Cluster.csproj", "{31517A92-5B06-434B-8BA2-597ECD3DEBA5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Remote.Tests.Messages", "tests\Proto.Remote.Tests.Messages\Proto.Remote.Tests.Messages.csproj", "{68867B24-B794-4C28-A9FC-BD6D86B19750}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Remote.Tests", "tests\Proto.Remote.Tests\Proto.Remote.Tests.csproj", "{62D3B49D-F51A-4B80-88C4-76C2CD583DC9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Cluster.Tests", "tests\Proto.Cluster.Tests\Proto.Cluster.Tests.csproj", "{9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Cluster.TestProvider", "src\Proto.Cluster.TestProvider\Proto.Cluster.TestProvider.csproj", "{D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Cluster.Consul", "src\Proto.Cluster.Consul\Proto.Cluster.Consul.csproj", "{D9E84C28-FC26-4547-9F16-5BA7147B1B82}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Proto.Cluster.Identity.MongoDb", "src\Proto.Cluster.Identity.MongoDb\Proto.Cluster.Identity.MongoDb.csproj", "{C087B9A2-6790-484B-9C19-C23DDB025CEA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto.Cluster.Identity.Redis", "src\Proto.Cluster.Identity.Redis\Proto.Cluster.Identity.Redis.csproj", "{B0F9003C-BA53-4948-8FB7-1F7F230F9310}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto.Cluster.Identity.Tests", "tests\Proto.Cluster.Identity.Tests\Proto.Cluster.Identity.Tests.csproj", "{24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto.Remote.GrpcNet", "src\Proto.Remote.GrpcNet\Proto.Remote.GrpcNet.csproj", "{AE486B56-98CC-4E9A-ADC7-B94358B68D43}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto.Remote.GrpcCore", "src\Proto.Remote.GrpcCore\Proto.Remote.GrpcCore.csproj", "{4C38FFE1-705F-41FC-9411-C4EA878B41DB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Proto.Cluster", "Proto.Cluster", "{86C608E7-AD97-45C9-9EAC-F45466A59DF0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Proto.Remote", "Proto.Remote", "{387739A5-FA85-484D-A09A-D0B773FBA4F1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Proto.Persistence", "Proto.Persistence", "{BD54E34A-A37A-4350-8FE7-233807E114A1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto.Persistence.SqlServer", "src\Proto.Persistence.SqlServer\Proto.Persistence.SqlServer.csproj", "{44E4A1E5-BBB4-48CE-BB2F-48177B28553D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto.OpenTracing", "src\Proto.OpenTracing\Proto.OpenTracing.csproj", "{75B4CA82-8C92-4363-BDDA-BFBD51C0646D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7D13CCDD-6B93-45B8-BA88-761744601726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Debug|x64.ActiveCfg = Debug|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Debug|x64.Build.0 = Debug|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Debug|x86.ActiveCfg = Debug|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Debug|x86.Build.0 = Debug|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Release|Any CPU.Build.0 = Release|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Release|x64.ActiveCfg = Release|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Release|x64.Build.0 = Release|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Release|x86.ActiveCfg = Release|Any CPU + {7D13CCDD-6B93-45B8-BA88-761744601726}.Release|x86.Build.0 = Release|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Debug|x64.ActiveCfg = Debug|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Debug|x64.Build.0 = Debug|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Debug|x86.Build.0 = Debug|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Release|Any CPU.Build.0 = Release|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Release|x64.ActiveCfg = Release|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Release|x64.Build.0 = Release|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Release|x86.ActiveCfg = Release|Any CPU + {6A8DB932-5230-4179-A3F0-291407E0419D}.Release|x86.Build.0 = Release|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Debug|x64.ActiveCfg = Debug|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Debug|x64.Build.0 = Debug|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Debug|x86.ActiveCfg = Debug|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Debug|x86.Build.0 = Debug|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Release|Any CPU.Build.0 = Release|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Release|x64.ActiveCfg = Release|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Release|x64.Build.0 = Release|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Release|x86.ActiveCfg = Release|Any CPU + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630}.Release|x86.Build.0 = Release|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Debug|x64.ActiveCfg = Debug|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Debug|x64.Build.0 = Debug|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Debug|x86.ActiveCfg = Debug|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Debug|x86.Build.0 = Debug|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Release|Any CPU.Build.0 = Release|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Release|x64.ActiveCfg = Release|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Release|x64.Build.0 = Release|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Release|x86.ActiveCfg = Release|Any CPU + {30AAE00A-7FB9-43AC-8304-B824C0F097F2}.Release|x86.Build.0 = Release|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Debug|x64.ActiveCfg = Debug|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Debug|x64.Build.0 = Debug|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Debug|x86.ActiveCfg = Debug|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Debug|x86.Build.0 = Debug|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Release|Any CPU.Build.0 = Release|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Release|x64.ActiveCfg = Release|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Release|x64.Build.0 = Release|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Release|x86.ActiveCfg = Release|Any CPU + {848E5CE2-D894-4321-8961-3521D3F2233C}.Release|x86.Build.0 = Release|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Debug|x64.ActiveCfg = Debug|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Debug|x64.Build.0 = Debug|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Debug|x86.ActiveCfg = Debug|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Debug|x86.Build.0 = Debug|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Release|Any CPU.Build.0 = Release|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Release|x64.ActiveCfg = Release|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Release|x64.Build.0 = Release|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Release|x86.ActiveCfg = Release|Any CPU + {BEAC63DD-5701-4B33-8155-5218B9761A70}.Release|x86.Build.0 = Release|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Debug|x64.ActiveCfg = Debug|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Debug|x64.Build.0 = Debug|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Debug|x86.ActiveCfg = Debug|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Debug|x86.Build.0 = Debug|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Release|Any CPU.Build.0 = Release|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Release|x64.ActiveCfg = Release|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Release|x64.Build.0 = Release|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Release|x86.ActiveCfg = Release|Any CPU + {31517A92-5B06-434B-8BA2-597ECD3DEBA5}.Release|x86.Build.0 = Release|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Debug|x64.ActiveCfg = Debug|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Debug|x64.Build.0 = Debug|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Debug|x86.ActiveCfg = Debug|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Debug|x86.Build.0 = Debug|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Release|Any CPU.Build.0 = Release|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Release|x64.ActiveCfg = Release|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Release|x64.Build.0 = Release|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Release|x86.ActiveCfg = Release|Any CPU + {68867B24-B794-4C28-A9FC-BD6D86B19750}.Release|x86.Build.0 = Release|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Debug|x64.ActiveCfg = Debug|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Debug|x64.Build.0 = Debug|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Debug|x86.ActiveCfg = Debug|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Debug|x86.Build.0 = Debug|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Release|Any CPU.Build.0 = Release|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Release|x64.ActiveCfg = Release|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Release|x64.Build.0 = Release|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Release|x86.ActiveCfg = Release|Any CPU + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9}.Release|x86.Build.0 = Release|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Debug|x64.ActiveCfg = Debug|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Debug|x64.Build.0 = Debug|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Debug|x86.ActiveCfg = Debug|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Debug|x86.Build.0 = Debug|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Release|Any CPU.Build.0 = Release|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Release|x64.ActiveCfg = Release|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Release|x64.Build.0 = Release|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Release|x86.ActiveCfg = Release|Any CPU + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43}.Release|x86.Build.0 = Release|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Debug|x64.ActiveCfg = Debug|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Debug|x64.Build.0 = Debug|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Debug|x86.ActiveCfg = Debug|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Debug|x86.Build.0 = Debug|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Release|Any CPU.Build.0 = Release|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Release|x64.ActiveCfg = Release|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Release|x64.Build.0 = Release|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Release|x86.ActiveCfg = Release|Any CPU + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8}.Release|x86.Build.0 = Release|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Debug|x64.ActiveCfg = Debug|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Debug|x64.Build.0 = Debug|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Debug|x86.ActiveCfg = Debug|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Debug|x86.Build.0 = Debug|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Release|Any CPU.Build.0 = Release|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Release|x64.ActiveCfg = Release|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Release|x64.Build.0 = Release|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Release|x86.ActiveCfg = Release|Any CPU + {D9E84C28-FC26-4547-9F16-5BA7147B1B82}.Release|x86.Build.0 = Release|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Debug|x64.ActiveCfg = Debug|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Debug|x64.Build.0 = Debug|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Debug|x86.ActiveCfg = Debug|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Debug|x86.Build.0 = Debug|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Release|Any CPU.Build.0 = Release|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Release|x64.ActiveCfg = Release|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Release|x64.Build.0 = Release|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Release|x86.ActiveCfg = Release|Any CPU + {C087B9A2-6790-484B-9C19-C23DDB025CEA}.Release|x86.Build.0 = Release|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Debug|x64.ActiveCfg = Debug|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Debug|x64.Build.0 = Debug|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Debug|x86.ActiveCfg = Debug|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Debug|x86.Build.0 = Debug|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Release|Any CPU.Build.0 = Release|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Release|x64.ActiveCfg = Release|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Release|x64.Build.0 = Release|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Release|x86.ActiveCfg = Release|Any CPU + {B0F9003C-BA53-4948-8FB7-1F7F230F9310}.Release|x86.Build.0 = Release|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Debug|x64.ActiveCfg = Debug|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Debug|x64.Build.0 = Debug|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Debug|x86.ActiveCfg = Debug|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Debug|x86.Build.0 = Debug|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Release|Any CPU.Build.0 = Release|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Release|x64.ActiveCfg = Release|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Release|x64.Build.0 = Release|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Release|x86.ActiveCfg = Release|Any CPU + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E}.Release|x86.Build.0 = Release|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Debug|x64.ActiveCfg = Debug|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Debug|x64.Build.0 = Debug|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Debug|x86.ActiveCfg = Debug|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Debug|x86.Build.0 = Debug|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Release|Any CPU.Build.0 = Release|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Release|x64.ActiveCfg = Release|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Release|x64.Build.0 = Release|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Release|x86.ActiveCfg = Release|Any CPU + {AE486B56-98CC-4E9A-ADC7-B94358B68D43}.Release|x86.Build.0 = Release|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Debug|x64.ActiveCfg = Debug|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Debug|x64.Build.0 = Debug|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Debug|x86.ActiveCfg = Debug|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Debug|x86.Build.0 = Debug|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Release|Any CPU.Build.0 = Release|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Release|x64.ActiveCfg = Release|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Release|x64.Build.0 = Release|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Release|x86.ActiveCfg = Release|Any CPU + {4C38FFE1-705F-41FC-9411-C4EA878B41DB}.Release|x86.Build.0 = Release|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Debug|x64.ActiveCfg = Debug|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Debug|x64.Build.0 = Debug|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Debug|x86.ActiveCfg = Debug|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Debug|x86.Build.0 = Debug|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Release|Any CPU.Build.0 = Release|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Release|x64.ActiveCfg = Release|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Release|x64.Build.0 = Release|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Release|x86.ActiveCfg = Release|Any CPU + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D}.Release|x86.Build.0 = Release|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Debug|x64.ActiveCfg = Debug|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Debug|x64.Build.0 = Debug|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Debug|x86.ActiveCfg = Debug|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Debug|x86.Build.0 = Debug|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Release|Any CPU.Build.0 = Release|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Release|x64.ActiveCfg = Release|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Release|x64.Build.0 = Release|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Release|x86.ActiveCfg = Release|Any CPU + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {7D13CCDD-6B93-45B8-BA88-761744601726} = {771514F1-12AE-4A26-89CB-2646D3EF7034} + {6A8DB932-5230-4179-A3F0-291407E0419D} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {848E5CE2-D894-4321-8961-3521D3F2233C} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {BEAC63DD-5701-4B33-8155-5218B9761A70} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {68867B24-B794-4C28-A9FC-BD6D86B19750} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {62D3B49D-F51A-4B80-88C4-76C2CD583DC9} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {9DE48E83-DF4E-4C5F-9BC8-CB05C646FC43} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {24AA3B6A-54BA-4B87-BBAE-1B5D6FBF207E} = {9AA2BCF0-19AB-4DD9-8D91-7D188E463806} + {86C608E7-AD97-45C9-9EAC-F45466A59DF0} = {771514F1-12AE-4A26-89CB-2646D3EF7034} + {31517A92-5B06-434B-8BA2-597ECD3DEBA5} = {86C608E7-AD97-45C9-9EAC-F45466A59DF0} + {D9E84C28-FC26-4547-9F16-5BA7147B1B82} = {86C608E7-AD97-45C9-9EAC-F45466A59DF0} + {C087B9A2-6790-484B-9C19-C23DDB025CEA} = {86C608E7-AD97-45C9-9EAC-F45466A59DF0} + {B0F9003C-BA53-4948-8FB7-1F7F230F9310} = {86C608E7-AD97-45C9-9EAC-F45466A59DF0} + {D7B5C59D-865F-4E2E-8EC3-92AF15D1D4C8} = {86C608E7-AD97-45C9-9EAC-F45466A59DF0} + {387739A5-FA85-484D-A09A-D0B773FBA4F1} = {771514F1-12AE-4A26-89CB-2646D3EF7034} + {4494E76E-16AC-4A7B-A2B8-A9B2D0568630} = {387739A5-FA85-484D-A09A-D0B773FBA4F1} + {4C38FFE1-705F-41FC-9411-C4EA878B41DB} = {387739A5-FA85-484D-A09A-D0B773FBA4F1} + {AE486B56-98CC-4E9A-ADC7-B94358B68D43} = {387739A5-FA85-484D-A09A-D0B773FBA4F1} + {BD54E34A-A37A-4350-8FE7-233807E114A1} = {771514F1-12AE-4A26-89CB-2646D3EF7034} + {30AAE00A-7FB9-43AC-8304-B824C0F097F2} = {BD54E34A-A37A-4350-8FE7-233807E114A1} + {44E4A1E5-BBB4-48CE-BB2F-48177B28553D} = {BD54E34A-A37A-4350-8FE7-233807E114A1} + {75B4CA82-8C92-4363-BDDA-BFBD51C0646D} = {771514F1-12AE-4A26-89CB-2646D3EF7034} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CD0D1E44-8118-4682-8793-6B20ABFA824C} + EndGlobalSection +EndGlobal diff --git a/src/Proto.Cluster/Cache/ClusterCacheInvalidation.cs b/src/Proto.Cluster/Cache/ClusterCacheInvalidation.cs index d91f140311..97d5adcec8 100644 --- a/src/Proto.Cluster/Cache/ClusterCacheInvalidation.cs +++ b/src/Proto.Cluster/Cache/ClusterCacheInvalidation.cs @@ -44,8 +44,8 @@ private void Invalidate(ClusterIdentity identity, PID activation, BitArray activ }; var remotesToInvalidate = Cluster.MemberList.GetAllMembers() .Select(m => Cluster.MemberList.GetMetaMember(m.Id)) - .Where(m => activeRemotes.Length > m.Index && activeRemotes[m.Index]) - .Select(m => m.Member.Address); + .Where(m => activeRemotes.Length > m!.Index && activeRemotes[m.Index]) + .Select(m => m!.Member.Address); foreach (var address in remotesToInvalidate) { diff --git a/src/Proto.Cluster/Member/MemberList.cs b/src/Proto.Cluster/Member/MemberList.cs index 207a7c34ae..0f17c42da4 100644 --- a/src/Proto.Cluster/Member/MemberList.cs +++ b/src/Proto.Cluster/Member/MemberList.cs @@ -75,19 +75,22 @@ private void OnClusterTopologyNotification(ClusterTopologyNotification ctn) _topologyConsensus.TrySetResult(true); var leaderId = LeaderElection.Elect(_memberState); var newLeader = _members.GetById(leaderId); - if (!newLeader.Equals(_leader)) + if (newLeader != null) { - _leader = newLeader; - _system.EventStream.Publish(new LeaderElected(newLeader)); - - // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression - if (_leader.Id == _system.Id) - { - Logger.LogInformation("[MemberList] I am leader {Id}", _leader.Id); - } - else + if (!newLeader.Equals(_leader)) { - Logger.LogInformation("[MemberList] Member {Id} is leader", _leader.Id); + _leader = newLeader; + _system.EventStream.Publish(new LeaderElected(newLeader)); + + // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression + if (_leader.Id == _system.Id) + { + Logger.LogInformation("[MemberList] I am leader {Id}", _leader.Id); + } + else + { + Logger.LogInformation("[MemberList] Member {Id} is leader", _leader.Id); + } } } }