* implicit usings on tests and file scoped namespaces

* added solution settings * major cleanup on tests
EventStore · Oct 21, 2023 · 33512f3 · 33512f3
1 parent fa00978
commit 33512f3
Show file tree

Hide file tree

Showing 291 changed files with 9,321 additions and 9,223 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,19 +1,20 @@
 <Project>
 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.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>
+<!--		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>-->
+<!--		<DebugType Condition=" '$(Configuration)' == 'Debug' ">full</DebugType>-->
+<!--		<DebugType Condition=" '$(Configuration)' == 'Release' ">pdbonly</DebugType>-->
 <!--		<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Configuration)\$(MSBuildProjectName)\</OutputPath>-->
-		<RootNamespace>EventStore.Client</RootNamespace>
+
 		<UseLinkBase>true</UseLinkBase>
-		<GrpcPackageVersion>2.49.0</GrpcPackageVersion>
-		<GrpcToolsPackageVersion>2.50.0</GrpcToolsPackageVersion>
+        <GrpcPackageVersion>2.49.0</GrpcPackageVersion>
+        <GrpcToolsPackageVersion>2.50.0</GrpcToolsPackageVersion>
 	</PropertyGroup>
 </Project>
diff --git a/EventStore.Client.sln.DotSettings b/EventStore.Client.sln.DotSettings
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -3,6 +3,6 @@
 		<Nullable>enable</Nullable>
 		<NullableContextOptions>enable</NullableContextOptions>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 	</PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,11 @@
 <Project>
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+    <PropertyGroup>
+        <RootNamespace>EventStore.Client</RootNamespace>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <DebugType Condition=" '$(Configuration)' == 'Debug' ">full</DebugType>
+        <DebugType Condition=" '$(Configuration)' == 'Release' ">pdbonly</DebugType>
+    </PropertyGroup>
 	<PropertyGroup Condition="$(MSBuildProjectName) != 'EventStore.Client'">
 		<ESPackageIdSuffix>$(MSBuildProjectName.Remove(0,18))</ESPackageIdSuffix>
 		<ESProto>$(ESPackageIdSuffix.ToLower()).proto</ESProto>
@@ -31,7 +37,7 @@
 		<None Include="..\..\ouro.png" Pack="true" PackagePath="\"/>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
+		<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -42,7 +48,7 @@
 		<PackageReference Include="MinVer" Version="3.0.0" PrivateAssets="All" />
 	</ItemGroup>
 	<ItemGroup>
-		<Compile Include="../EventStore.Client.Common/**/*.cs"/>
+		<Compile Include="../EventStore.Client.Common/**/*.cs" Link="Common\%(RecursiveDir)/%(FileName)%(Extension)"/>
 	</ItemGroup>
 	<ItemGroup>
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

diff --git a/src/EventStore.Client.Common/AsyncStreamReaderExtensions.cs b/src/EventStore.Client.Common/AsyncStreamReaderExtensions.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Threading;
 using Grpc.Core;
+
 namespace EventStore.Client {
 	internal static class AsyncStreamReaderExtensions {
 		public static async IAsyncEnumerable<T> ReadAllAsync<T>(this IAsyncStreamReader<T> reader,

diff --git a/src/EventStore.Client.Common/Constants.cs b/src/EventStore.Client.Common/Constants.cs
@@ -1,61 +1,61 @@
-namespace EventStore.Client {
-	internal static class Constants {
-		public static class Exceptions {
-			public const string ExceptionKey = "exception";
-
-			public const string AccessDenied = "access-denied";
-			public const string InvalidTransaction = "invalid-transaction";
-			public const string StreamDeleted = "stream-deleted";
-			public const string WrongExpectedVersion = "wrong-expected-version";
-			public const string StreamNotFound = "stream-not-found";
-			public const string MaximumAppendSizeExceeded = "maximum-append-size-exceeded";
-			public const string MissingRequiredMetadataProperty = "missing-required-metadata-property";
-			public const string NotLeader = "not-leader";
-
-			public const string PersistentSubscriptionFailed = "persistent-subscription-failed";
-			public const string PersistentSubscriptionDoesNotExist = "persistent-subscription-does-not-exist";
-			public const string PersistentSubscriptionExists = "persistent-subscription-exists";
-			public const string MaximumSubscribersReached = "maximum-subscribers-reached";
-			public const string PersistentSubscriptionDropped = "persistent-subscription-dropped";
-
-			public const string UserNotFound = "user-not-found";
-			public const string UserConflict = "user-conflict";
-
-			public const string ScavengeNotFound = "scavenge-not-found";
-
-			public const string ExpectedVersion = "expected-version";
-			public const string ActualVersion = "actual-version";
-			public const string StreamName = "stream-name";
-			public const string GroupName = "group-name";
-			public const string Reason = "reason";
-			public const string MaximumAppendSize = "maximum-append-size";
-			public const string RequiredMetadataProperties = "required-metadata-properties";
-			public const string ScavengeId = "scavenge-id";
-			public const string LeaderEndpointHost = "leader-endpoint-host";
-			public const string LeaderEndpointPort = "leader-endpoint-port";
-
-			public const string LoginName = "login-name";
-		}
-
-		public static class Metadata {
-			public const string Type = "type";
-			public const string Created = "created";
-			public const string ContentType = "content-type";
-			public static readonly string[] RequiredMetadata = {Type, ContentType};
-
-			public static class ContentTypes {
-				public const string ApplicationJson = "application/json";
-				public const string ApplicationOctetStream = "application/octet-stream";
-			}
-		}
-
-		public static class Headers {
-			public const string Authorization = "authorization";
-			public const string BasicScheme = "Basic";
-			public const string BearerScheme = "Bearer";
-
-			public const string ConnectionName = "connection-name";
-			public const string RequiresLeader = "requires-leader";
-		}
-	}
-}
+namespace EventStore.Client; 
+
+internal static class Constants {
+    public static class Exceptions {
+        public const string ExceptionKey = "exception";
+
+        public const string AccessDenied                    = "access-denied";
+        public const string InvalidTransaction              = "invalid-transaction";
+        public const string StreamDeleted                   = "stream-deleted";
+        public const string WrongExpectedVersion            = "wrong-expected-version";
+        public const string StreamNotFound                  = "stream-not-found";
+        public const string MaximumAppendSizeExceeded       = "maximum-append-size-exceeded";
+        public const string MissingRequiredMetadataProperty = "missing-required-metadata-property";
+        public const string NotLeader                       = "not-leader";
+
+        public const string PersistentSubscriptionFailed       = "persistent-subscription-failed";
+        public const string PersistentSubscriptionDoesNotExist = "persistent-subscription-does-not-exist";
+        public const string PersistentSubscriptionExists       = "persistent-subscription-exists";
+        public const string MaximumSubscribersReached          = "maximum-subscribers-reached";
+        public const string PersistentSubscriptionDropped      = "persistent-subscription-dropped";
+
+        public const string UserNotFound = "user-not-found";
+        public const string UserConflict = "user-conflict";
+
+        public const string ScavengeNotFound = "scavenge-not-found";
+
+        public const string ExpectedVersion            = "expected-version";
+        public const string ActualVersion              = "actual-version";
+        public const string StreamName                 = "stream-name";
+        public const string GroupName                  = "group-name";
+        public const string Reason                     = "reason";
+        public const string MaximumAppendSize          = "maximum-append-size";
+        public const string RequiredMetadataProperties = "required-metadata-properties";
+        public const string ScavengeId                 = "scavenge-id";
+        public const string LeaderEndpointHost         = "leader-endpoint-host";
+        public const string LeaderEndpointPort         = "leader-endpoint-port";
+
+        public const string LoginName = "login-name";
+    }
+
+    public static class Metadata {
+        public const           string   Type             = "type";
+        public const           string   Created          = "created";
+        public const           string   ContentType      = "content-type";
+        public static readonly string[] RequiredMetadata = {Type, ContentType};
+
+        public static class ContentTypes {
+            public const string ApplicationJson        = "application/json";
+            public const string ApplicationOctetStream = "application/octet-stream";
+        }
+    }
+
+    public static class Headers {
+        public const string Authorization = "authorization";
+        public const string BasicScheme   = "Basic";
+        public const string BearerScheme  = "Bearer";
+
+        public const string ConnectionName = "connection-name";
+        public const string RequiresLeader = "requires-leader";
+    }
+}
diff --git a/src/EventStore.Client.Common/EpochExtensions.cs b/src/EventStore.Client.Common/EpochExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace EventStore.Client {
 	internal static class EpochExtensions {
 		private static readonly DateTime UnixEpoch = DateTime.UnixEpoch;

diff --git a/src/EventStore.Client.Common/EventStoreCallOptions.cs b/src/EventStore.Client.Common/EventStoreCallOptions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Threading;
 using Grpc.Core;
 using Timeout_ = System.Threading.Timeout;
 

diff --git a/src/EventStore.Client.Common/MetadataExtensions.cs b/src/EventStore.Client.Common/MetadataExtensions.cs
@@ -1,29 +1,29 @@
 using Grpc.Core;
 
-namespace EventStore.Client {
-	internal static class MetadataExtensions {
-		public static bool TryGetValue(this Metadata metadata, string key, out string? value) {
-			value = default;
+namespace EventStore.Client; 
 
-			foreach (var entry in metadata) {
-				if (entry.Key != key) {
-					continue;
-				}
-				value = entry.Value;
-				return true;
-			}
+internal static class MetadataExtensions {
+    public static bool TryGetValue(this Metadata metadata, string key, out string? value) {
+        value = default;
 
-			return false;
-		}
+        foreach (var entry in metadata) {
+            if (entry.Key != key) {
+                continue;
+            }
+            value = entry.Value;
+            return true;
+        }
 
-		public static StreamRevision GetStreamRevision(this Metadata metadata, string key)
-			=> metadata.TryGetValue(key, out var s) && ulong.TryParse(s, out var value)
-				? new StreamRevision(value)
-				: StreamRevision.None;
+        return false;
+    }
 
-		public static int GetIntValueOrDefault(this Metadata metadata, string key)
-			=> metadata.TryGetValue(key, out var s) && int.TryParse(s, out var value)
-				? value
-				: default;
-	}
-}
+    public static StreamRevision GetStreamRevision(this Metadata metadata, string key)
+        => metadata.TryGetValue(key, out var s) && ulong.TryParse(s, out var value)
+            ? new StreamRevision(value)
+            : StreamRevision.None;
+
+    public static int GetIntValueOrDefault(this Metadata metadata, string key)
+        => metadata.TryGetValue(key, out var s) && int.TryParse(s, out var value)
+            ? value
+            : default;
+}
diff --git a/src/EventStore.Client.ProjectionManagement/EventStoreProjectionManagementClient.State.cs b/src/EventStore.Client.ProjectionManagement/EventStoreProjectionManagementClient.State.cs
@@ -9,6 +9,8 @@
 
 namespace EventStore.Client {
 	public partial class EventStoreProjectionManagementClient {
+        static readonly JsonSerializerOptions DefaultJsonSerializerOptions = new JsonSerializerOptions();
+
 		/// <summary>
 		/// Gets the result of a projection as an untyped document.
 		/// </summary>
@@ -27,7 +29,7 @@ public async Task<JsonDocument> GetResultAsync(string name, string? partition =
 			await using var stream = new MemoryStream();
 			await using var writer = new Utf8JsonWriter(stream);
 			var serializer = new ValueSerializer();
-			serializer.Write(writer, value, new JsonSerializerOptions());
+			serializer.Write(writer, value, DefaultJsonSerializerOptions);
 			await writer.FlushAsync(cancellationToken).ConfigureAwait(false);
 			stream.Position = 0;
 
@@ -54,7 +56,7 @@ public async Task<T> GetResultAsync<T>(string name, string? partition = null,
 			await using var stream = new MemoryStream();
 			await using var writer = new Utf8JsonWriter(stream);
 			var serializer = new ValueSerializer();
-			serializer.Write(writer, value, new JsonSerializerOptions());
+			serializer.Write(writer, value, DefaultJsonSerializerOptions);
 			await writer.FlushAsync(cancellationToken).ConfigureAwait(false);
 			stream.Position = 0;
 
@@ -94,7 +96,7 @@ public async Task<JsonDocument> GetStateAsync(string name, string? partition = n
 			await using var stream = new MemoryStream();
 			await using var writer = new Utf8JsonWriter(stream);
 			var serializer = new ValueSerializer();
-			serializer.Write(writer, value, new JsonSerializerOptions());
+			serializer.Write(writer, value, DefaultJsonSerializerOptions);
 			stream.Position = 0;
 			await writer.FlushAsync(cancellationToken).ConfigureAwait(false);
 
@@ -121,7 +123,7 @@ public async Task<T> GetStateAsync<T>(string name, string? partition = null,
 			await using var stream = new MemoryStream();
 			await using var writer = new Utf8JsonWriter(stream);
 			var serializer = new ValueSerializer();
-			serializer.Write(writer, value, new JsonSerializerOptions());
+			serializer.Write(writer, value, DefaultJsonSerializerOptions);
 			await writer.FlushAsync(cancellationToken).ConfigureAwait(false);
 			stream.Position = 0;
 

diff --git a/src/EventStore.Client.Streams/InvalidTransactionException.cs b/src/EventStore.Client.Streams/InvalidTransactionException.cs
@@ -1,34 +1,31 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace EventStore.Client {
-	/// <summary>
-	/// Exception thrown if there is an attempt to operate inside a
-	/// transaction which does not exist.
-	/// </summary>
-	public class InvalidTransactionException : Exception {
-		/// <summary>
-		/// Constructs a new <see cref="InvalidTransactionException"/>.
-		/// </summary>
-		public InvalidTransactionException() {
-		}
+namespace EventStore.Client; 
 
-		/// <summary>
-		/// Constructs a new <see cref="InvalidTransactionException"/>.
-		/// </summary>
-		public InvalidTransactionException(string message) : base(message) {
-		}
+/// <summary>
+/// Exception thrown if there is an attempt to operate inside a
+/// transaction which does not exist.
+/// </summary>
+public class InvalidTransactionException : Exception {
+    /// <summary>
+    /// Constructs a new <see cref="InvalidTransactionException"/>.
+    /// </summary>
+    public InvalidTransactionException() { }
 
-		/// <summary>
-		/// Constructs a new <see cref="InvalidTransactionException"/>.
-		/// </summary>
-		public InvalidTransactionException(string message, Exception innerException) : base(message, innerException) {
-		}
+    /// <summary>
+    /// Constructs a new <see cref="InvalidTransactionException"/>.
+    /// </summary>
+    public InvalidTransactionException(string message) : base(message) { }
 
-		/// <summary>
-		/// Constructs a new <see cref="InvalidTransactionException"/>.
-		/// </summary>
-		protected InvalidTransactionException(SerializationInfo info, StreamingContext context) : base(info, context) {
-		}
-	}
-}
+    /// <summary>
+    /// Constructs a new <see cref="InvalidTransactionException"/>.
+    /// </summary>
+    public InvalidTransactionException(string message, Exception innerException) : base(message, innerException) { }
+
+    /// <summary>
+    /// Constructs a new <see cref="InvalidTransactionException"/>.
+    /// </summary>
+    [Obsolete("Obsolete")]
+    protected InvalidTransactionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+}
diff --git a/src/EventStore.Client.UserManagement/EventStore.Client.UserManagement.csproj b/src/EventStore.Client.UserManagement/EventStore.Client.UserManagement.csproj
@@ -3,26 +3,6 @@
 	<PropertyGroup>
 		<Description>The GRPC client API for managing users in Event Store. Get the open source or commercial versions of Event Store server from https://eventstore.com/</Description>
 	</PropertyGroup>
-	<ItemGroup>
-	  <Folder Include="Infrastructure\" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Update="..\EventStore.Client.Common\AsyncStreamReaderExtensions.cs">
-	    <Link>Infrastructure\AsyncStreamReaderExtensions.cs</Link>
-	  </Compile>
-	  <Compile Update="..\EventStore.Client.Common\Constants.cs">
-	    <Link>Infrastructure\Constants.cs</Link>
-	  </Compile>
-	  <Compile Update="..\EventStore.Client.Common\EpochExtensions.cs">
-	    <Link>Infrastructure\EpochExtensions.cs</Link>
-	  </Compile>
-	  <Compile Update="..\EventStore.Client.Common\EventStoreCallOptions.cs">
-	    <Link>Infrastructure\EventStoreCallOptions.cs</Link>
-	  </Compile>
-	  <Compile Update="..\EventStore.Client.Common\MetadataExtensions.cs">
-	    <Link>Infrastructure\MetadataExtensions.cs</Link>
-	  </Compile>
-	</ItemGroup>
 	<ItemGroup>
 	  <None Remove="EventStore.Client.UserManagement.csproj.DotSettings" />
 	</ItemGroup>