Merge pull request #93 from thefringeninja/net-flamework-4.8

Use Grpc.Core for netcoreapp3.1 and net48
EventStore · Jan 21, 2021 · 900719c · 900719c
2 parents 73949d1 + 22f4075
commit 900719c
Show file tree

Hide file tree

Showing 81 changed files with 1,360 additions and 999 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-retire": {
-      "version": "4.0.1",
+      "version": "5.0.0",
       "commands": [
         "dotnet-retire"
       ]
@@ -21,4 +21,4 @@
       ]
     }
   }
-}
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,13 +8,16 @@ on:
     tags:
     - v*
 
-env:
-  DOTNET_SDK_VERSION: 3.1.302
 jobs:
   vulnerability-scan:
+    timeout-minutes: 5
+    strategy:
+      fail-fast: false
+      matrix:
+        sdk: [5.0-focal, 3.1-bionic]
     runs-on: ubuntu-latest
-    name: ci/github/scan-vulnerabilities
-    container: mcr.microsoft.com/dotnet/core/sdk:3.1-bionic
+    name: scan-vulnerabilities/${{ matrix.sdk }}
+    container: mcr.microsoft.com/dotnet/sdk:${{ matrix.sdk }}
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -23,16 +26,18 @@ jobs:
         dotnet tool restore
         dotnet restore
         dotnet tool run dotnet-retire
-  build:
+  build-dotnet:
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
+        framework: [netcoreapp3.1, net5.0, net48]
         os: [ubuntu-18.04]
         test: ["", .Streams, .PersistentSubscriptions, .Operations, .UserManagement, .ProjectionManagement]
         configuration: [release]
         docker-tag: ['ci']
     runs-on: ${{ matrix.os }}
-    name: ci/github/build-${{ matrix.os }}/EventStore.Client${{ matrix.test }}
+    name: build-${{ matrix.os }}/${{ matrix.framework }}/EventStore.Client${{ matrix.test }}
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -49,24 +54,31 @@ jobs:
       shell: bash
       run: |
         docker pull docker.pkg.github.com/eventstore/eventstore/eventstore:${{ matrix.docker-tag }}
-    - name: Install Dotnet
+    - name: Install netcoreapp3.1
       uses: actions/setup-dotnet@v1
+      if: matrix.framework == 'netcoreapp3.1'
       with:
-        dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
+        dotnet-version: 3.1.x
+    - name: Install net5.0
+      uses: actions/setup-dotnet@v1
+      if: matrix.framework == 'net5.0'
+      with:
+        dotnet-version: 5.0.x
     - name: Compile
       shell: bash
       run: |
-        dotnet build --configuration ${{ matrix.configuration }} src/EventStore.Client${{ matrix.test }}
+        dotnet build --configuration ${{ matrix.configuration }} --framework ${{ matrix.framework }} src/EventStore.Client${{ matrix.test }}
     - name: Run Tests
       shell: bash
       env:
         ES_DOCKER_TAG: ${{ matrix.docker-tag }}
       run: |
         ./gencert.sh
         dotnet test --configuration ${{ matrix.configuration }} --blame \
-        --logger:html --logger:trx --logger:"console;verbosity=normal" \
-        --results-directory=$(pwd)/test-results/test/EventStore.Client${{ matrix.test }}.Tests \
-        test/EventStore.Client${{ matrix.test }}.Tests
+          --logger:html --logger:trx --logger:"console;verbosity=normal" \
+          --results-directory=$(pwd)/test-results/test/EventStore.Client${{ matrix.test }}.Tests \
+          --framework ${{ matrix.framework }} \
+          test/EventStore.Client${{ matrix.test }}.Tests
     - name: Collect Test Results
       shell: bash
       if: always()
@@ -77,17 +89,18 @@ jobs:
       if: always()
       with:
         path: test-results.html
-        name: test-results-${{ matrix.configuration }}-EventStore.Client${{ matrix.test }}.html
+        name: test-results-${{ matrix.configuration }}-${{ matrix.framework }}-EventStore.Client${{ matrix.test }}.html
     - name: Publish Test Results (All)
       uses: actions/upload-artifact@v1
       if: always()
       with:
-        name: test-results-${{ matrix.configuration }}-EventStore.Client${{ matrix.test }}
+        name: test-results-${{ matrix.configuration }}-${{ matrix.framework }}-EventStore.Client${{ matrix.test }}
         path: test-results
   publish:
-    needs: [vulnerability-scan, build]
+    timeout-minutes: 5
+    needs: [vulnerability-scan, build-dotnet]
     runs-on: ubuntu-latest
-    name: ci/github/publish
+    name: publish
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -102,10 +115,14 @@ jobs:
     - shell: bash
       run: |
         git fetch --prune --unshallow
-    - name: Setup Dotnet
+    - name: Install netcoreapp3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Install net5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
+        dotnet-version: 5.0.x
     - name: Dotnet Pack
       shell: bash
       run: |

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
 	<PropertyGroup>
+		<TargetFrameworks>net48;netcoreapp3.1;net5.0</TargetFrameworks>
 		<Platform>x64</Platform>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<Nullable>disable</Nullable>
@@ -13,8 +14,15 @@
 		<RootNamespace>EventStore.Client</RootNamespace>
 		<UseLinkBase>true</UseLinkBase>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'netcoreapp3.1'">
+		<DefineConstants>$(DefineConstants);GRPC_CORE</DefineConstants>
+	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="NETStandard.Library" Version="2.0.3"/>
 		<PackageReference Include="System.Net.Http" Version="4.3.4"/>
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+		<PackageReference Include="IndexRange" Version="1.0.0" />
+		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+	</ItemGroup>
 </Project>
diff --git a/gencert.sh b/gencert.sh
@@ -2,10 +2,12 @@
 
 mkdir -p certs
 
+chmod 0755 ./certs
+
 docker pull docker.pkg.github.com/eventstore/es-gencert-cli/es-gencert-cli:1.0.1
 
 docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) docker.pkg.github.com/eventstore/es-gencert-cli/es-gencert-cli:1.0.1 create-ca -out /tmp/ca
 
-docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) docker.pkg.github.com/eventstore/es-gencert-cli/es-gencert-cli:1.0.1 create-node -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/node -ip-addresses 127.0.0.1
+docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) docker.pkg.github.com/eventstore/es-gencert-cli/es-gencert-cli:1.0.1 create-node -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/node -ip-addresses 127.0.0.1 -dns-names localhost
 
 chmod 0755 -R ./certs
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,8 +1,5 @@
 <Project>
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
-	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
-	</PropertyGroup>
 	<PropertyGroup Condition="$(MSBuildProjectName) != 'EventStore.Client'">
 		<ESPackageIdSuffix>$(MSBuildProjectName.Remove(0,18))</ESPackageIdSuffix>
 		<ESProto>$(ESPackageIdSuffix.ToLower()).proto</ESProto>
@@ -28,6 +25,7 @@
 		<Copyright>Copyright 2012-2020 Event Store Ltd</Copyright>
 		<MinVerTagPrefix>v</MinVerTagPrefix>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<GrpcPackageVersion>2.33.1</GrpcPackageVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\"/>
@@ -38,11 +36,11 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Grpc.Tools" Version="2.30.0">
+		<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" />
+		<PackageReference Include="MinVer" Version="2.4.0" PrivateAssets="All" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Include="../EventStore.Client.Common/**/*.cs"/>

diff --git a/src/EventStore.Client.Common/AsyncStreamReaderExtensions.cs b/src/EventStore.Client.Common/AsyncStreamReaderExtensions.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+#if GRPC_CORE
+namespace Grpc.Core {
+	internal static class AsyncStreamReaderExtensions {
+		public static async IAsyncEnumerable<T> ReadAllAsync<T>(this IAsyncStreamReader<T> reader,
+			[EnumeratorCancellation] CancellationToken cancellationToken = default) {
+			while (await reader.MoveNext(cancellationToken).ConfigureAwait(false)) {
+				yield return reader.Current;
+			}
+		}
+	}
+}
+#endif
diff --git a/src/EventStore.Client.Common/DeconstructionExtensions.cs b/src/EventStore.Client.Common/DeconstructionExtensions.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+#nullable enable
+namespace EventStore.Client {
+#if NETFRAMEWORK
+	internal static class DeconstructionExtensions {
+		public static void Deconstruct<TKey, TValue>(this KeyValuePair<TKey, TValue> source, out TKey key,
+			out TValue value) {
+			key = source.Key;
+			value = source.Value;
+		}
+	}
+#endif
+}
diff --git a/src/EventStore.Client.Common/EpochExtensions.cs b/src/EventStore.Client.Common/EpochExtensions.cs
@@ -3,10 +3,18 @@
 #nullable enable
 namespace EventStore.Client {
 	internal static class EpochExtensions {
+		private static readonly DateTime UnixEpoch =
+#if NETFRAMEWORK
+				new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)
+#else
+				DateTime.UnixEpoch
+#endif
+			;
+
 		public static DateTime FromTicksSinceEpoch(this long value) =>
-			new DateTime(DateTime.UnixEpoch.Ticks + value, DateTimeKind.Utc);
+			new DateTime(UnixEpoch.Ticks + value, DateTimeKind.Utc);
 
 		public static long ToTicksSinceEpoch(this DateTime value) =>
-			(value - DateTime.UnixEpoch).Ticks;
+			(value - UnixEpoch).Ticks;
 	}
 }
diff --git a/...mon/EventStoreClientSettingsExtensions.cs → ...re.Client.Common/EventStoreCallOptions.cs b/...mon/EventStoreClientSettingsExtensions.cs → ...re.Client.Common/EventStoreCallOptions.cs
@@ -11,18 +11,16 @@ public static CallOptions Create(EventStoreClientSettings settings,
 			cancellationToken: cancellationToken,
 			deadline: DeadlineAfter(operationOptions.TimeoutAfter),
 			headers: new Metadata(),
-			credentials: CallCredentials.FromInterceptor(async (context, metadata) => {
-				var credentials = settings.DefaultCredentials ?? userCredentials;
+			credentials: (settings.DefaultCredentials ?? userCredentials) == null
+				? null
+				: CallCredentials.FromInterceptor(async (context, metadata) => {
+					var credentials = settings.DefaultCredentials ?? userCredentials;
 
-				if (credentials == null) {
-					return;
-				}
-
-				var authorizationHeader = await settings.OperationOptions
-					.GetAuthenticationHeaderValue(credentials, CancellationToken.None)
-					.ConfigureAwait(false);
-				metadata.Add(Constants.Headers.Authorization, authorizationHeader);
-			})
+					var authorizationHeader = await settings.OperationOptions
+						.GetAuthenticationHeaderValue(credentials!, CancellationToken.None)
+						.ConfigureAwait(false);
+					metadata.Add(Constants.Headers.Authorization, authorizationHeader);
+				})
 		);
 
 		private static DateTime? DeadlineAfter(TimeSpan? timeoutAfter) => !timeoutAfter.HasValue

diff --git a/src/EventStore.Client.Operations/EventStoreOperationsClient.Admin.cs b/src/EventStore.Client.Operations/EventStoreOperationsClient.Admin.cs
@@ -16,7 +16,8 @@ public partial class EventStoreOperationsClient {
 		public async Task ShutdownAsync(
 			UserCredentials? userCredentials = null,
 			CancellationToken cancellationToken = default) {
-			await _client.ShutdownAsync(EmptyResult,
+			await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).ShutdownAsync(EmptyResult,
 				EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials, cancellationToken));
 		}
 
@@ -29,7 +30,8 @@ await _client.ShutdownAsync(EmptyResult,
 		public async Task MergeIndexesAsync(
 			UserCredentials? userCredentials = null,
 			CancellationToken cancellationToken = default) {
-			await _client.MergeIndexesAsync(EmptyResult,
+			await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).MergeIndexesAsync(EmptyResult,
 				EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials, cancellationToken));
 		}
 
@@ -42,7 +44,8 @@ await _client.MergeIndexesAsync(EmptyResult,
 		public async Task ResignNodeAsync(
 			UserCredentials? userCredentials = null,
 			CancellationToken cancellationToken = default) {
-			await _client.ResignNodeAsync(EmptyResult,
+			await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).ResignNodeAsync(EmptyResult,
 				EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials, cancellationToken));
 		}
 
@@ -56,7 +59,9 @@ await _client.ResignNodeAsync(EmptyResult,
 		public async Task SetNodePriorityAsync(int nodePriority,
 			UserCredentials? userCredentials = null,
 			CancellationToken cancellationToken = default) {
-			await _client.SetNodePriorityAsync(new SetNodePriorityReq {Priority = nodePriority},
+			await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).SetNodePriorityAsync(
+				new SetNodePriorityReq {Priority = nodePriority},
 				EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials, cancellationToken));
 		}
 
@@ -68,7 +73,9 @@ await _client.SetNodePriorityAsync(new SetNodePriorityReq {Priority = nodePriori
 		/// <returns></returns>
 		public async Task RestartPersistentSubscriptions(UserCredentials? userCredentials = null,
 			CancellationToken cancellationToken = default) {
-			await _client.RestartPersistentSubscriptionsAsync(EmptyResult,
+			await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).RestartPersistentSubscriptionsAsync(
+				EmptyResult,
 				EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials, cancellationToken));
 		}
 	}

diff --git a/src/EventStore.Client.Operations/EventStoreOperationsClient.Scavenge.cs b/src/EventStore.Client.Operations/EventStoreOperationsClient.Scavenge.cs
@@ -28,12 +28,16 @@ public async Task<DatabaseScavengeResult> StartScavengeAsync(
 				throw new ArgumentOutOfRangeException(nameof(startFromChunk));
 			}
 
-			var result = await _client.StartScavengeAsync(new StartScavengeReq {
-				Options = new StartScavengeReq.Types.Options {
-					ThreadCount = threadCount,
-					StartFromChunk = startFromChunk
-				}
-			}, EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials, cancellationToken));
+			var result = await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).StartScavengeAsync(
+				new StartScavengeReq {
+					Options = new StartScavengeReq.Types.Options {
+						ThreadCount = threadCount,
+						StartFromChunk = startFromChunk
+					}
+				},
+				EventStoreCallOptions.Create(Settings, Settings.OperationOptions, userCredentials,
+					cancellationToken));
 
 			return result.ScavengeResult switch {
 				ScavengeResp.Types.ScavengeResult.Started => DatabaseScavengeResult.Started(result.ScavengeId),
@@ -54,7 +58,8 @@ public async Task<DatabaseScavengeResult> StopScavengeAsync(
 			string scavengeId,
 			UserCredentials? userCredentials = null,
 			CancellationToken cancellationToken = default) {
-			var result = await _client.StopScavengeAsync(new StopScavengeReq {
+			var result = await new Operations.Operations.OperationsClient(
+				await SelectCallInvoker(cancellationToken).ConfigureAwait(false)).StopScavengeAsync(new StopScavengeReq {
 				Options = new StopScavengeReq.Types.Options {
 					ScavengeId = scavengeId
 				}

diff --git a/src/EventStore.Client.Operations/EventStoreOperationsClient.cs b/src/EventStore.Client.Operations/EventStoreOperationsClient.cs
@@ -18,7 +18,6 @@ public partial class EventStoreOperationsClient : EventStoreClientBase {
 					.FirstOrDefault(x => x.Key == Constants.Exceptions.ScavengeId)?.Value)
 			};
 
-		private readonly Operations.Operations.OperationsClient _client;
 		private readonly ILogger _log;
 
 		/// <summary>
@@ -33,7 +32,6 @@ public EventStoreOperationsClient(IOptions<EventStoreClientSettings> options) :
 		/// </summary>
 		/// <param name="settings"></param>
 		public EventStoreOperationsClient(EventStoreClientSettings? settings = null) : base(settings, ExceptionMap) {
-			_client = new Operations.Operations.OperationsClient(CallInvoker);
 			_log = Settings.LoggerFactory?.CreateLogger<EventStoreOperationsClient>() ??
 			       new NullLogger<EventStoreOperationsClient>();
 		}