moved files into main project and deleted remaining empty projects

dropped support for net6.0 and net7.0
added some helpers to fluentdocker
playing around the idea of keeping the container on tests

Author: RagingKore

Directory.Build.props

@@ -1,20 +1,17 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <Nullable>enable</Nullable>
         <NullableContextOptions>enable</NullableContextOptions>
         <ImplicitUsings>true</ImplicitUsings>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <LangVersion>preview</LangVersion>
 
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <DebugType Condition=" '$(Configuration)' == 'Debug' ">full</DebugType>
         <DebugType Condition=" '$(Configuration)' == 'Release' ">pdbonly</DebugType>
 
         <UseLinkBase>true</UseLinkBase>
-        <GrpcPackageVersion>2.60.0</GrpcPackageVersion>
-        <GrpcToolsPackageVersion>2.60.0</GrpcToolsPackageVersion>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net48'">

EventStore.Client.sln

@@ -5,16 +5,6 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.UserManagement", "src\EventStore.Client.UserManagement\EventStore.Client.UserManagement.csproj", "{D3744A86-DD35-4104-AAEE-84B79062C4A2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.Streams", "src\EventStore.Client.Streams\EventStore.Client.Streams.csproj", "{362C0CF9-81C9-400F-94C7-A8B190ECE94A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.Operations", "src\EventStore.Client.Operations\EventStore.Client.Operations.csproj", "{6EFB980F-C72C-40F1-9232-479BE5617580}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.ProjectionManagement", "src\EventStore.Client.ProjectionManagement\EventStore.Client.ProjectionManagement.csproj", "{B275EF4B-80D3-4205-9C7A-337A2A2BD99C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.PersistentSubscriptions", "src\EventStore.Client.PersistentSubscriptions\EventStore.Client.PersistentSubscriptions.csproj", "{66FDEE78-836E-49F0-A4DD-BF7539C34E54}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client", "src\EventStore.Client\EventStore.Client.csproj", "{8853D875-4A8E-450B-A1BE-9CEF8BEDABC3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C51F2C69-45A9-4D0D-A708-4FC319D5D340}"
@@ -46,26 +36,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D3744A86-DD35-4104-AAEE-84B79062C4A2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3744A86-DD35-4104-AAEE-84B79062C4A2}.Debug|x64.Build.0 = Debug|Any CPU
-		{D3744A86-DD35-4104-AAEE-84B79062C4A2}.Release|x64.ActiveCfg = Release|Any CPU
-		{D3744A86-DD35-4104-AAEE-84B79062C4A2}.Release|x64.Build.0 = Release|Any CPU
-		{362C0CF9-81C9-400F-94C7-A8B190ECE94A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{362C0CF9-81C9-400F-94C7-A8B190ECE94A}.Debug|x64.Build.0 = Debug|Any CPU
-		{362C0CF9-81C9-400F-94C7-A8B190ECE94A}.Release|x64.ActiveCfg = Release|Any CPU
-		{362C0CF9-81C9-400F-94C7-A8B190ECE94A}.Release|x64.Build.0 = Release|Any CPU
-		{6EFB980F-C72C-40F1-9232-479BE5617580}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6EFB980F-C72C-40F1-9232-479BE5617580}.Debug|x64.Build.0 = Debug|Any CPU
-		{6EFB980F-C72C-40F1-9232-479BE5617580}.Release|x64.ActiveCfg = Release|Any CPU
-		{6EFB980F-C72C-40F1-9232-479BE5617580}.Release|x64.Build.0 = Release|Any CPU
-		{B275EF4B-80D3-4205-9C7A-337A2A2BD99C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B275EF4B-80D3-4205-9C7A-337A2A2BD99C}.Debug|x64.Build.0 = Debug|Any CPU
-		{B275EF4B-80D3-4205-9C7A-337A2A2BD99C}.Release|x64.ActiveCfg = Release|Any CPU
-		{B275EF4B-80D3-4205-9C7A-337A2A2BD99C}.Release|x64.Build.0 = Release|Any CPU
-		{66FDEE78-836E-49F0-A4DD-BF7539C34E54}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{66FDEE78-836E-49F0-A4DD-BF7539C34E54}.Debug|x64.Build.0 = Debug|Any CPU
-		{66FDEE78-836E-49F0-A4DD-BF7539C34E54}.Release|x64.ActiveCfg = Release|Any CPU
-		{66FDEE78-836E-49F0-A4DD-BF7539C34E54}.Release|x64.Build.0 = Release|Any CPU
 		{8853D875-4A8E-450B-A1BE-9CEF8BEDABC3}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{8853D875-4A8E-450B-A1BE-9CEF8BEDABC3}.Debug|x64.Build.0 = Debug|Any CPU
 		{8853D875-4A8E-450B-A1BE-9CEF8BEDABC3}.Release|x64.ActiveCfg = Release|Any CPU
@@ -108,11 +78,6 @@ Global
 		{7D929D45-F1D9-462B-BE49-84BEC11D5039}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D3744A86-DD35-4104-AAEE-84B79062C4A2} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
-		{362C0CF9-81C9-400F-94C7-A8B190ECE94A} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
-		{6EFB980F-C72C-40F1-9232-479BE5617580} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
-		{B275EF4B-80D3-4205-9C7A-337A2A2BD99C} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
-		{66FDEE78-836E-49F0-A4DD-BF7539C34E54} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
 		{8853D875-4A8E-450B-A1BE-9CEF8BEDABC3} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
 		{8F8548D6-694C-4BAE-9EF3-A020140E04C7} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 		{4BA2E05E-6B45-47C3-9001-8B039244ECA9} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}

src/Directory.Build.props

@@ -2,35 +2,20 @@
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
     <PropertyGroup>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <RootNamespace>EventStore.Client</RootNamespace>
+        <PackageId>Kurrent.Client</PackageId>
     </PropertyGroup>
 
-    <!-- Reference client base project -->
-    <ItemGroup Condition="$(MSBuildProjectName) != 'EventStore.Client'">
-        <ProjectReference Include="..\EventStore.Client\EventStore.Client.csproj" />
-    </ItemGroup>
-
-    <!-- Set package id and generate proto file path-->
-    <PropertyGroup Condition="$(MSBuildProjectName) != 'EventStore.Client' And $(MSBuildProjectName) != 'EventStore.Client.Extensions.OpenTelemetry'">
-        <PackageIdSuffix>$(MSBuildProjectName.Remove(0,18))</PackageIdSuffix>
-        <PackageId>EventStore.Client.Grpc.$(PackageIdSuffix)</PackageId>
-        <ESProtoFilePath>../EventStore.Client/Common/protos/$(PackageIdSuffix.ToLower()).proto</ESProtoFilePath>
-    </PropertyGroup>
-
-    <!-- Configure grpc services -->
-    <ItemGroup Condition="$(MSBuildProjectName) != 'EventStore.Client' And $(MSBuildProjectName) != 'EventStore.Client.Extensions.OpenTelemetry'">
-        <Protobuf Access="internal" Include="$(ESProtoFilePath)" GrpcServices="Client" Link="protos/%(FileName)%(Extension)" />
-    </ItemGroup>
-
     <PropertyGroup>
         <PackageIcon>ouro.png</PackageIcon>
         <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-        <PackageProjectUrl>https://eventstore.com</PackageProjectUrl>
+        <PackageProjectUrl>https://kurrent.io</PackageProjectUrl>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <PackageReleaseNotes>https://eventstore.com/blog/</PackageReleaseNotes>
-        <PackageTags>eventstore client grpc</PackageTags>
-        <Authors>Event Store Ltd</Authors>
-			  <Copyright>Copyright 2012-$([System.DateTime]::Today.Year.ToString()) Event Store Ltd</Copyright>
+        <PackageTags>kurrent eventstore client grpc</PackageTags>
+        <Authors>Kurrent Ltd</Authors>
+        <Copyright>Copyright 2012-$([System.DateTime]::Today.Year.ToString()) Kurrent Ltd</Copyright>
         <MinVerTagPrefix>v</MinVerTagPrefix>
     </PropertyGroup>
 
@@ -40,28 +25,25 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
+<!--        <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">-->
+<!--            <PrivateAssets>all</PrivateAssets>-->
+<!--            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
+<!--        </PackageReference>-->
+<!--        <PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)">-->
+<!--            <PrivateAssets>all</PrivateAssets>-->
+<!--            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>-->
+<!--        </PackageReference>-->
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
         <PackageReference Include="MinVer" Version="3.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
         <InternalsVisibleTo Include="$(ProjectName)" />
-        <InternalsVisibleTo Include="$(ProjectName).Operations" />
         <InternalsVisibleTo Include="$(ProjectName).Operations.Tests" />
-        <InternalsVisibleTo Include="$(ProjectName).PersistentSubscriptions" />
         <InternalsVisibleTo Include="$(ProjectName).PersistentSubscriptions.Tests" />
-        <InternalsVisibleTo Include="$(ProjectName).ProjectionManagement" />
         <InternalsVisibleTo Include="$(ProjectName).ProjectionManagement.Tests" />
-        <InternalsVisibleTo Include="$(ProjectName).Streams" />
         <InternalsVisibleTo Include="$(ProjectName).Streams.Tests" />
-        <InternalsVisibleTo Include="$(ProjectName).UserManagement" />
         <InternalsVisibleTo Include="$(ProjectName).UserManagement.Tests" />
         <InternalsVisibleTo Include="$(ProjectName).Extensions.OpenTelemetry" />
         <InternalsVisibleTo Include="$(ProjectName).Tests" />

src/EventStore.Client.Extensions.OpenTelemetry/EventStore.Client.Extensions.OpenTelemetry.csproj

@@ -13,4 +13,8 @@
 	  <PackageReference Include="OpenTelemetry.Api" Version="1.8.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\EventStore.Client\EventStore.Client.csproj" />
+	</ItemGroup>
+	
 </Project>

src/EventStore.Client.Operations/EventStore.Client.Operations.csproj

@@ -3,7 +3,7 @@
 
 namespace EventStore.Client {
 #pragma warning disable 1591
-	public partial class StreamIdentifier {
+    internal partial class StreamIdentifier {
 		private string? _cached;
 
 		public static implicit operator string?(StreamIdentifier? source) {
@@ -25,4 +25,4 @@ public partial class StreamIdentifier {
 		public static implicit operator StreamIdentifier(string source) =>
 			new() {StreamName = ByteString.CopyFromUtf8(source)};
 	}
-}
+}

src/EventStore.Client.PersistentSubscriptions/EventStore.Client.PersistentSubscriptions.csproj

@@ -51,7 +51,7 @@ namespace EventStore.Client {
 		/// </summary>
 		/// <param name="dto"></param>
 		/// <returns><see cref="Uuid"/></returns>
-		public static Uuid FromDto(UUID dto) =>
+		internal static Uuid FromDto(UUID dto) =>
 			dto == null
 				? throw new ArgumentNullException(nameof(dto))
 				: dto.ValueCase switch {
@@ -106,7 +106,7 @@ private Uuid(long msb, long lsb) {
 		/// Converts the <see cref="Uuid"/> to the gRPC wire format.
 		/// </summary>
 		/// <returns><see cref="UUID"/></returns>
-		public UUID ToDto() =>
+        internal UUID ToDto() =>
 			new UUID {
 				Structured = new UUID.Types.Structured {
 					LeastSignificantBits = _lsb,
@@ -200,4 +200,4 @@ private bool TryWriteGuidBytes(Guid value, Span<byte> destination)
 #endif
 		}
 	}
-}
+}

src/EventStore.Client.ProjectionManagement/EventStore.Client.ProjectionManagement.csproj

@@ -7,54 +7,46 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.25.1"/>
-        <PackageReference Include="Grpc.Net.Client" Version="$(GrpcPackageVersion)"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
-        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+        <PackageReference Include="Google.Protobuf" Version="3.29.1" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0"/>
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1"/>
-        <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+
+        <PackageReference Include="Grpc.Tools" Version="2.68.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-<!--        <Protobuf -->
-<!--            Include="..\EventStore.Client\Common\protos\shared.proto;..\EventStore.Client\Common\protos\status.proto;..\EventStore.Client\Common\protos\code.proto;"-->
-<!--            ProtoRoot="..\EventStore.Client\Common\protos"-->
-<!--            GrpcServices="Client"-->
-<!--        />-->
-
-       
         <Protobuf
-                Include="..\EventStore.Client\Common\protos\shared.proto;..\EventStore.Client\Common\protos\status.proto;..\EventStore.Client\Common\protos\code.proto;"
-                ProtoRoot="..\EventStore.Client\Common\protos"
+                ProtoRoot="Core/protos"
+                Include="Core/protos/**/*.proto"
+                Link="Core\protos\%(RecursiveDir)/%(FileName)%(Extension)"
                 GrpcServices="Client"
+                Access="internal"
         />
-
-        <Protobuf Access="internal" Include="$(ESProtoFilePath)" GrpcServices="Client" Link="protos/%(FileName)%(Extension)" />
-
-        <Protobuf Include="..\EventStore.Client\Common\protos\gossip.proto" ProtoRoot="..\EventStore.Client\Common\protos" />
-        <Protobuf Include="..\EventStore.Client\Common\protos\serverfeatures.proto" ProtoRoot="..\EventStore.Client\Common\protos" />
-        <Protobuf Include="Core\Common\protos\code.proto">
-          <Generator>MSBuild:Compile</Generator>
-        </Protobuf>
-        <Protobuf Include="Core\Common\protos\gossip.proto">
-          <Generator>MSBuild:Compile</Generator>
-        </Protobuf>
-        <Protobuf Include="Core\Common\protos\serverfeatures.proto">
-          <Generator>MSBuild:Compile</Generator>
-        </Protobuf>
-        <Protobuf Include="Core\Common\protos\shared.proto">
-          <Generator>MSBuild:Compile</Generator>
-        </Protobuf>
-        <Protobuf Include="Core\Common\protos\status.proto">
-          <Generator>MSBuild:Compile</Generator>
-        </Protobuf>
+        
+<!--       -->
+<!--        <Protobuf-->
+<!--                Access="internal"-->
+<!--                Include="..\EventStore.Client\Common\protos\shared.proto;..\EventStore.Client\Common\protos\status.proto;..\EventStore.Client\Core\Common\protos\code.proto;"-->
+<!--                ProtoRoot="..\EventStore.Client\Core\Common\protos"-->
+<!--                GrpcServices="Client"-->
+<!--        />-->
     </ItemGroup>
 
-    
+<!--    <ItemGroup Condition="'$(TargetFramework)' == 'net48'">-->
+<!--        <PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0"/>-->
+<!--        <PackageReference Include="System.Threading.Channels" Version="9.0.0"/>-->
+<!--        <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />-->
+<!--    </ItemGroup>-->
+
     <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+<!--        <PackageReference Include="System.Net.Http" Version="4.3.4"/>-->
         <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0"/>
+        <PackageReference Include="System.Text.Json" Version="8.0.5" />
         <PackageReference Include="System.Threading.Channels" Version="8.0.0"/>
         <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
     </ItemGroup>