* no more IClassFixture

* code reformat where possible for better readability
EventStore · Oct 24, 2023 · e39d52d · e39d52d
1 parent 33512f3
commit e39d52d
Show file tree

Hide file tree

Showing 197 changed files with 5,261 additions and 4,677 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,20 +1,22 @@
 <Project>
-	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
-		<Platform>x64</Platform>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Nullable>enable</Nullable>
-		<NullableContextOptions>enable</NullableContextOptions>
+    <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
+        <Platform>x64</Platform>
+        <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+        <Nullable>enable</Nullable>
+        <NullableContextOptions>enable</NullableContextOptions>
         <ImplicitUsings>true</ImplicitUsings>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-		<LangVersion>11</LangVersion>
-<!--		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>-->
-<!--		<DebugType Condition=" '$(Configuration)' == 'Debug' ">full</DebugType>-->
-<!--		<DebugType Condition=" '$(Configuration)' == 'Release' ">pdbonly</DebugType>-->
-<!--		<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Configuration)\$(MSBuildProjectName)\</OutputPath>-->
-
-		<UseLinkBase>true</UseLinkBase>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <LangVersion>11</LangVersion>
+
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <DebugType Condition=" '$(Configuration)' == 'Debug' ">full</DebugType>
+        <DebugType Condition=" '$(Configuration)' == 'Release' ">pdbonly</DebugType>
+
+        <!--<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Configuration)\$(MSBuildProjectName)\</OutputPath>-->
+
+        <UseLinkBase>true</UseLinkBase>
         <GrpcPackageVersion>2.49.0</GrpcPackageVersion>
         <GrpcToolsPackageVersion>2.50.0</GrpcToolsPackageVersion>
-	</PropertyGroup>
+    </PropertyGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project>
-	<PropertyGroup>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
 </Project>
diff --git a/EventStore.Client.sln.DotSettings b/EventStore.Client.sln.DotSettings
@@ -79,20 +79,23 @@
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/CONSTRUCTOR_OR_DESTRUCTOR_BODY/@EntryValue">ExpressionBody</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_DECLARED_IN/@EntryValue">BaseClass</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_FIELD/@EntryValue">0</s:Int64>
     <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
     <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BETWEEN_USING_GROUPS/@EntryValue">0</s:Int64>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_ENUM_ARRANGEMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INITIALIZER_ARRANGEMENT/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INVOCATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_LIST_PATTERNS_ARRANGEMENT/@EntryValue">False</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">True</s:Boolean>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_OWNER_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
-    <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">False</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
-    <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_TUPLE_COMPONENTS/@EntryValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_TUPLE_COMPONENTS/@EntryValue">False</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALLOW_COMMENT_AFTER_LBRACE/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALLOW_FAR_ALIGNMENT/@EntryValue">True</s:Boolean>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
@@ -116,6 +119,7 @@
     <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
     <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_SWITCH_EXPRESSION_ARRANGEMENT/@EntryValue">False</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_INITIALIZER_ELEMENTS_ON_LINE/@EntryValue">10</s:Int64>
     <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_INVOCATION_ARGUMENTS_ON_LINE/@EntryValue">3</s:Int64>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/NESTED_TERNARY_STYLE/@EntryValue">EXPANDED</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">END_OF_LINE</s:String>
@@ -127,10 +131,13 @@
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_INITIALIZER_ON_SINGLE_LINE/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
-    <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+    <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_PRIMARY_CONSTRUCTOR_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
     <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
     <s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;
   &lt;TypePattern DisplayName="Non-reorderable types"&gt;
@@ -282,24 +289,23 @@
       &lt;/Entry.SortBy&gt;
     &lt;/Entry&gt;
 
-    &lt;Entry DisplayName="Static Fields and Constants"&gt;
+    &lt;Entry DisplayName="Constants" Priority="90"&gt;
       &lt;Entry.Match&gt;
-        &lt;Or&gt;
-          &lt;Kind Is="Constant" /&gt;
-          &lt;And&gt;
+        &lt;Kind Is="Constant" /&gt;
+      &lt;/Entry.Match&gt;
+    &lt;/Entry&gt;
+
+    &lt;Entry DisplayName="Static Fields" Priority="85"&gt;
+      &lt;Entry.Match&gt;
+        &lt;And&gt;
             &lt;Kind Is="Field" /&gt;
             &lt;Static /&gt;
-          &lt;/And&gt;
-        &lt;/Or&gt;
+        &lt;/And&gt;
       &lt;/Entry.Match&gt;
 
       &lt;Entry.SortBy&gt;
-        &lt;Kind&gt;
-          &lt;Kind.Order&gt;
-            &lt;DeclarationKind&gt;Constant&lt;/DeclarationKind&gt;
-            &lt;DeclarationKind&gt;Field&lt;/DeclarationKind&gt;
-          &lt;/Kind.Order&gt;
-        &lt;/Kind&gt;
+        &lt;Readonly /&gt;
+        &lt;Name /&gt;
       &lt;/Entry.SortBy&gt;
     &lt;/Entry&gt;
 

diff --git a/generators/EventStore.Tests.SourceGenerators/MsBuildContextSourceGenerator.cs b/generators/EventStore.Tests.SourceGenerators/MsBuildContextSourceGenerator.cs
@@ -2,27 +2,24 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 
-namespace EventStore.Client {
-	[Generator]
-	public class MsBuildContextSourceGenerator : ISourceGenerator {
-		public void Initialize(GeneratorInitializationContext context) {
-		}
+namespace EventStore.Client.Tests; 
 
-		public void Execute(GeneratorExecutionContext context) {
-			context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.RootNamespace",
-				out var rootNamespace);
-			context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProjectDir",
-				out var projectDir);
+[Generator]
+public class MsBuildContextSourceGenerator : ISourceGenerator {
+    public void Initialize(GeneratorInitializationContext context) { }
 
-			var sourceText = SourceText.From(@$"
+    public void Execute(GeneratorExecutionContext context) {
+        context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.RootNamespace", out var rootNamespace);
+        context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProjectDir", out var projectDir);
+
+        var sourceText = SourceText.From(@$"
 namespace {rootNamespace} {{
     public static class ProjectDir {{
 		public static readonly string Current = @""{projectDir}"";
 	}}
 }}
 ", Encoding.UTF8);
 
-			context.AddSource("ProjectDir.cs", sourceText); ;
-		}
-	}
-}
+        context.AddSource("ProjectDir.cs", sourceText); ;
+    }
+}
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,8 +1,9 @@
 <Project>
-	<PropertyGroup>
-		<Nullable>enable</Nullable>
-		<NullableContextOptions>enable</NullableContextOptions>
-		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <Nullable>enable</Nullable>
+        <NullableContextOptions>enable</NullableContextOptions>
+        <ImplicitUsings>true</ImplicitUsings>
+        <OutputType>Exe</OutputType>
+    </PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -57,5 +57,8 @@
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
 			<_Parameter1>$(ProjectName).Tests.Common</_Parameter1>
 		</AssemblyAttribute>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>EventStore.Client</_Parameter1>
+        </AssemblyAttribute>
 	</ItemGroup>
 </Project>
diff --git a/src/EventStore.Client/EventStoreClientBase.cs b/src/EventStore.Client/EventStoreClientBase.cs
@@ -82,22 +82,11 @@ private async Task<ChannelInfo> GetChannelInfoExpensive(
 		/// Gets the current channel info.
 		protected async ValueTask<ChannelInfo> GetChannelInfo(CancellationToken cancellationToken) =>
 			await _channelInfoProvider.CurrentAsync.WithCancellation(cancellationToken).ConfigureAwait(false);
-
-
-		/// <summary>
-		/// only exists so that we can manually trigger rediscovery in the tests (by reflection)
-		/// in cases where the server doesn't yet let the client know that it needs to.
-		/// see EventStoreClientExtensions.WarmUpWith.
-		/// note if rediscovery is already in progress it will continue, not restart.
-		/// </summary>
-		internal void Rediscover() {
-			_channelInfoProvider.Reset();
-		}
+
 
 		/// <summary>
-		/// only exists so that we can manually trigger rediscovery in the tests (by reflection)
+		/// Only exists so that we can manually trigger rediscovery in the tests
 		/// in cases where the server doesn't yet let the client know that it needs to.
-		/// see EventStoreClientExtensions.WarmUpWith.
 		/// note if rediscovery is already in progress it will continue, not restart.
 		/// </summary>
 		internal Task RediscoverAsync() {

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,50 +1,41 @@
 <Project>
-	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-	<PropertyGroup>
-		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="AutoFixture.Idioms" Version="4.18.0" />
-		<PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
-		<PackageReference Include="Ductus.FluentDocker" Version="2.10.*" />
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.*"/>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
-		<PackageReference Include="Polly" Version="8.0.0" />
-		<PackageReference Include="Serilog" Version="3.0.1"/>
-		<PackageReference Include="Serilog.AspNetCore" Version="7.0.0"/>
-		<PackageReference Include="Serilog.Sinks.Observable" Version="2.0.2"/>
-		<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.3"/>
-		<PackageReference Include="System.Net.Http" Version="4.3.4"/>
-		<PackageReference Include="System.Reactive" Version="6.0.0"/>
-		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
-		<PackageReference Include="xunit" Version="2.4.2"/>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<!-- https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageReference Include="Shouldly" Version="4.2.*"/>
-		<PackageReference Include="Bogus" Version="34.0.*"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0"/>
-	</ItemGroup>
-	<ItemGroup>
-		<CompilerVisibleProperty Include="RootNamespace"/>
-		<ProjectReference Include="..\..\generators\EventStore.Tests.SourceGenerators\EventStore.Tests.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
-	</ItemGroup>
-
-<!--	<ItemGroup>-->
-<!--		<Content Include="..\..\certs\**\*">-->
-<!--			<Link>certs\%(RecursiveDir)/%(FileName)%(Extension)</Link>-->
-<!--			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>-->
-<!--		</Content>-->
-<!--	</ItemGroup>-->
-
-	<ItemGroup>
-		<Using Include="Bogus"/>
-		<Using Include="Shouldly"/>
-		<Using Include="Xunit"/>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+
+    <PropertyGroup>
+        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Bogus" Version="34.0.2"/>
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
+        <!-- https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
+        <PackageReference Include="Shouldly" Version="4.2.1"/>
+        <PackageReference Include="xunit" Version="2.4.2"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <CompilerVisibleProperty Include="RootNamespace"/>
+        <ProjectReference Include="..\..\generators\EventStore.Tests.SourceGenerators\EventStore.Tests.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="..\..\certs\**\*">
+            <Link>certs\%(RecursiveDir)/%(FileName)%(Extension)</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="Bogus"/>
+        <Using Include="Shouldly"/>
+        <Using Include="Xunit"/>
         <Using Include="Xunit.Abstractions"/>
         <Using Include="EventStore.Client.Tests"/>
-	</ItemGroup>
+    </ItemGroup>
 </Project>
diff --git a/test/EventStore.Client.Operations.Tests/AuthenticationTests.cs b/test/EventStore.Client.Operations.Tests/AuthenticationTests.cs
@@ -1,10 +1,7 @@
 namespace EventStore.Client;
 
-public class AuthenticationTests : IClassFixture<EventStoreClientsFixture> {
-    public AuthenticationTests(EventStoreClientsFixture fixture, ITestOutputHelper output) =>
-        Fixture = fixture.With(f => f.CaptureLogs(output));
-
-    EventStoreClientsFixture Fixture { get; }
+public class AuthenticationTests : EventStoreFixture {
+    public AuthenticationTests(ITestOutputHelper output) : base(output) { }
 
     public enum CredentialsCase { None, TestUser, RootUser }
 
@@ -39,19 +36,7 @@ async Task ExecuteTest(int caseNr, CredentialsCase defaultCredentials, Credentia
         var defaultUserCredentials = GetCredentials(defaultCredentials);
         var actualUserCredentials  = GetCredentials(actualCredentials);
 
-        var settings = Fixture.GetOptions().ClientSettings;
-
-        // var settings = new EventStoreClientSettings {
-        //     Interceptors             = ogSettings.Interceptors,
-        //     ConnectionName           = $"Authentication case #{caseNr} {defaultCredentials}",
-        //     CreateHttpMessageHandler = ogSettings.CreateHttpMessageHandler,
-        //     LoggerFactory            = ogSettings.LoggerFactory,
-        //     ChannelCredentials       = ogSettings.ChannelCredentials,
-        //     OperationOptions         = ogSettings.OperationOptions,
-        //     ConnectivitySettings     = ogSettings.ConnectivitySettings,
-        //     DefaultCredentials       = defaultUserCredentials,
-        //     DefaultDeadline          = ogSettings.DefaultDeadline
-        // };
+        var settings = Fixture.ClientSettings;
 
         settings.DefaultCredentials = defaultUserCredentials;
         settings.ConnectionName     = $"Authentication case #{caseNr} {defaultCredentials}";

diff --git a/test/EventStore.Client.Operations.Tests/EventStore.Client.Operations.Tests.csproj b/test/EventStore.Client.Operations.Tests/EventStore.Client.Operations.Tests.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<ItemGroup>
-<!--		<ProjectReference Include="..\..\src\EventStore.Client.Operations\EventStore.Client.Operations.csproj" />-->
-<!--		<ProjectReference Include="..\..\src\EventStore.Client.Streams\EventStore.Client.Streams.csproj" />-->
-<!--		<ProjectReference Include="..\..\src\EventStore.Client.UserManagement\EventStore.Client.UserManagement.csproj" />-->
-		<ProjectReference Include="..\EventStore.Client.Tests.Common\EventStore.Client.Tests.Common.csproj"/>
+        <ProjectReference Include="..\EventStore.Client.Tests.Common\EventStore.Client.Tests.Common.csproj"/>
 	</ItemGroup>
 </Project>